Project

General

Profile

« Previous | Next » 

Revision ee53ccf7

Added by Andreas Kohlbecker about 5 years ago

fix #8214 fixing required validation for WeaklyRelatedEntityCombobox and centralizing related messages

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TaxonNamePopupEditor.java
47 47 
import eu.etaxonomy.cdm.vaadin.model.name.TaxonNameDTO;
48 48 
import eu.etaxonomy.cdm.vaadin.permission.CdmEditDeletePermissionTester;
49 49 
import eu.etaxonomy.cdm.vaadin.ui.RegistrationUIDefaults;
50 
import eu.etaxonomy.cdm.vaadin.ui.UIMessages;
50 51 
import eu.etaxonomy.cdm.vaadin.util.TeamOrPersonBaseCaptionGenerator;
51 52 
import eu.etaxonomy.cdm.vaadin.util.converter.SetToListConverter;
52 53 
import eu.etaxonomy.vaadin.component.NameRelationField;
......
767 768 
                            );
768 769 
                        }
769 770 
                    });
771 
                    combobox.getSelect().setRequiredError(UIMessages.REQUIRED_SELECT_MISSING);
770 772 
                    genusOrUninomialField = replaceComponent("genusOrUninomial", genusOrUninomialField, combobox, 0, genusOrUninomialRow, 1, genusOrUninomialRow);
771 773 
                }
772 774 
            } else {
773 775 
                if(WeaklyRelatedEntityCombobox.class.isAssignableFrom(genusOrUninomialField.getClass())) {
774 776 
                    genusOrUninomialField = replaceComponent("genusOrUninomial", genusOrUninomialField, new TextFieldNFix(), 0, genusOrUninomialRow, 1, genusOrUninomialRow);
777 
                    genusOrUninomialField.setRequiredError(UIMessages.REQUIRED_TEXT_MISSING);
775 778 
                }
776 779 
            }
777 780 
        }
......
781 784 
                if(TextField.class.isAssignableFrom(specificEpithetField.getClass())) {
782 785 
                    WeaklyRelatedEntityCombobox<TaxonName> combobox = new WeaklyRelatedEntityCombobox<TaxonName>("-> this caption will be replaced <-", TaxonName.class);
783 786 
                    specificEpithetField = replaceComponent("specificEpithet", specificEpithetField, combobox, 0, specificEpithetFieldRow, 1, specificEpithetFieldRow);
787 
                    combobox.getSelect().setRequiredError(UIMessages.REQUIRED_SELECT_MISSING);
784 788 
                    combobox.addClickListenerAddEntity(e -> getViewEventBus().publish(
785 789 
                            this,
786 790 
                            new TaxonNameEditorActionStrRep(EditorActionType.ADD, e.getButton(), combobox, this)
......
801 805 
            } else {
802 806 
                if(WeaklyRelatedEntityCombobox.class.isAssignableFrom(specificEpithetField.getClass())) {
803 807 
                    specificEpithetField = replaceComponent("specificEpithet", specificEpithetField, new TextFieldNFix(), 0, specificEpithetFieldRow, 1, specificEpithetFieldRow);
808 
                    specificEpithetField.setRequiredError(UIMessages.REQUIRED_TEXT_MISSING);
804 809 
               }
805 810 
            }
806 811 
        }
......
820 825 
        specificEpithetField.setRequired(isSpeciesOrBelow);
821 826 
        infraSpecificEpithetField.setVisible(rank.isInfraSpecific());
822 827 
        infraSpecificEpithetField.setRequired(rank.isInfraSpecific());
828 
        infraSpecificEpithetField.setRequiredError(UIMessages.REQUIRED_TEXT_MISSING);
823 829 
        infraGenericEpithetField.setVisible(rank.isInfraGeneric());
824 830 
        infraGenericEpithetField.setRequired(rank.isInfraGeneric());
831 
        infraSpecificEpithetField.setRequiredError(UIMessages.REQUIRED_TEXT_MISSING);
825 832 

  		




  826
  833
  
    
        basionymsComboboxSelect.setVisible(withBasionymSection);


  		




  827
  834
  
    

  		












Also available in:  Unified diff