Project

General

Profile

« Previous | Next » 

Revision ff20525a

Added by Andreas Kohlbecker over 6 years ago

fix #7170 hiding CombinationAuthorship & BasionymAuthorship if empty

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TaxonNamePopupEditor.java
9 9
package eu.etaxonomy.cdm.vaadin.view.name;
10 10

  
11 11
import java.util.Collection;
12
import java.util.EnumSet;
12 13

  
13 14
import org.springframework.security.core.GrantedAuthority;
14 15

  
......
76 77

  
77 78
    private TeamOrPersonField exCombinationAuthorshipField;
78 79

  
80
    private EnumSet<TaxonNamePopupEditorMode> modesActive = EnumSet.noneOf(TaxonNamePopupEditorMode.class);
79 81

  
80 82
    /**
81 83
     * @param layout
......
306 308
        basionymAuthorshipField.setVisible(enable);
307 309
        exBasionymAuthorshipField.setVisible(enable);
308 310
        basionymCombobox.setVisible(enable);
311
        if(modesActive.contains(TaxonNamePopupEditorMode.suppressReplacementAuthorshipData)){
312
            TaxonName taxonName = getBean();
313
            basionymAuthorshipField.setVisible(taxonName.getBasionymAuthorship() != null);
314
        }
309 315
    }
310 316

  
311 317
    /**
......
329 335
                || taxonName.getExBasionymAuthorship() != null;
330 336
        basionymToggle.setValue(showBasionymSection);
331 337

  
338
        if(modesActive.contains(TaxonNamePopupEditorMode.suppressReplacementAuthorshipData)){
339
            combinationAuthorshipField.setVisible(taxonName.getCombinationAuthorship() != null);
340
        }
341

  
332 342
    }
333 343

  
334 344
    /**
......
403 413
        return exCombinationAuthorshipField;
404 414
    }
405 415

  
416
    @Override
417
    public void enableMode(TaxonNamePopupEditorMode mode){
418
        modesActive.add(mode);
419
    }
406 420

  
421
    @Override
422
    public void disableMode(TaxonNamePopupEditorMode mode){
423
        modesActive.remove(mode);
424
    }
407 425

  
408 426

  
409 427
}

Also available in: Unified diff