Project

General

Profile

« Previous | Next » 

Revision b892b762

Added by Andreas Kohlbecker almost 3 years ago

fix #8522 type status mandatory in Name type designation editor

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/view/name/NameTypeDesignationPopupEditor.java
135 135 

  		




  136
  136
  
    
        if(showTypeFlags){


  		




  137
  137
  
    
            conservedTypeField = addCheckBox("Conserved type", "conservedType", 0, row);


  		




  
  138
  
    
            conservedTypeField.addValueChangeListener(e -> updateDesignationReferenceFields());


  		




  138
  139
  
    
            rejectedTypeField = addCheckBox("Rejected type", "rejectedType", 1, row);


  		




  
  140
  
    
            rejectedTypeField.addValueChangeListener(e -> updateDesignationReferenceFields());


  		




  139
  141
  
    
            notDesignatedField = addCheckBox("Not designated", "notDesignated", 2, row);


  		




  
  142
  
    
            notDesignatedField.addValueChangeListener(e -> updateDesignationReferenceFields());


  		




  140
  143
  
    
            row++;


  		




  141
  144
  
    
        }


  		




  142
  145
  
    

  		




  143
  146
  
    
        typeStatusSelect = new NativeSelect("Type status");


  		




  144
  147
  
    
        typeStatusSelect.setNullSelectionAllowed(false);


  		




  145
  148
  
    
        typeStatusSelect.setWidth(100, Unit.PERCENTAGE);


  		




  
  149
  
    
        typeStatusSelect.setRequired(true);


  		




  
  150
  
    
        typeStatusSelect.setRequiredError("Either \"Type status\" must be set or any of the \"Conserved type\", \"Rejected type\" or \"Not designated\" flags must be set.");


  		




  146
  151
  
    
        addField(typeStatusSelect, "typeStatus", 0, row, 1, row);


  		




  147
  152
  
    
        grid.setComponentAlignment(typeStatusSelect, Alignment.TOP_RIGHT);


  		




  148
  153
  
    
        typeStatusSelect.addValueChangeListener(e -> {


  		




  ......




  212
  217
  
    
        designationReferenceCombobox.setVisible(hasDesignationSource);


  		




  213
  218
  
    
        // NOTE: For better usability we only hide these fields here,


  		




  214
  219
  
    
        // NameTypeDesignationPresenter.preSaveBean(NameTypeDesignation bean) will empty them in needed


  		




  
  220
  
    

  		




  
  221
  
    
        boolean typeStatusRequired = !(conservedTypeField.getValue().booleanValue() || rejectedTypeField.getValue().booleanValue() || notDesignatedField.getValue().booleanValue());


  		




  
  222
  
    
        typeStatusSelect.setRequired(typeStatusRequired);


  		




  
  223
  
    

  		




  215
  224
  
    
    }


  		




  216
  225
  
    

  		




  217
  226
  
    
    /**


  		












Also available in:  Unified diff