Project

General

Profile

« Previous | Next » 

Revision a0257f6e

Added by Katja Luther almost 4 years ago

fix #9066: visibility of specimen list editor configurable

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/SpecimenAdminPreferences.java
56 56 
                this.allowOverrideShowSpecimenRelatedIssues = true;
57 57 
            }
58 58 

  		




  
  59
  
    
            key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowSpecimenListEditor);


  		




  
  60
  
    
            CdmPreference isShowSpecimenListEditorPref = service.find(key);


  		




  
  61
  
    
            if (isShowSpecimenListEditorPref != null){


  		




  
  62
  
    
                this.isShowListEditor = isShowSpecimenListEditorPref.getValue() != null? Boolean.valueOf(isShowSpecimenListEditorPref.getValue()): null;


  		




  
  63
  
    
                this.allowOverrideShowListEditor = isShowSpecimenListEditorPref.isAllowOverride();


  		




  
  64
  
    
            }else{


  		




  
  65
  
    
//                this.isShowCollectingAreaInGeneralSection = (Boolean) PreferencePredicate.ShowCollectingAreasInGeneralSection.getDefaultValue();


  		




  
  66
  
    
                this.allowOverrideShowListEditor = true;


  		




  
  67
  
    
            }


  		




  
  68
  
    

  		




  
  69
  
    

  		




  59
  70
  
    
            key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowCollectingAreasInGeneralSection);


  		




  60
  71
  
    
            CdmPreference isShowCollectingAreaInGeneralSectionPref = service.find(key);


  		




  61
  72
  
    
            if (isShowCollectingAreaInGeneralSectionPref != null){


  		




  ......




  111
  122
  
    
                pref.setAllowOverride(allowOverrideShowCollectingAreaInGeneralSection);


  		




  112
  123
  
    
                service.set(pref);


  		




  113
  124
  
    
            }


  		




  
  125
  
    

  		




  
  126
  
    
            if (isShowListEditor == null && allowOverrideShowListEditor){


  		




  
  127
  
    
                service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowSpecimenListEditor));


  		




  
  128
  
    
            }else{


  		




  
  129
  
    
                pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowSpecimenListEditor, this.isShowListEditor != null? Boolean.toString(this.isShowListEditor): null);


  		




  
  130
  
    
                pref.setAllowOverride(allowOverrideShowListEditor);


  		




  
  131
  
    
                service.set(pref);


  		




  
  132
  
    
            }


  		




  
  133
  
    

  		




  114
  134
  
    
            if (isShowSpecimenRelatedIssues == null && allowOverrideShowSpecimenRelatedIssues){


  		




  115
  135
  
    
                service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowSpecimen));


  		




  116
  136
  
    
            }else{


  		












Also available in:  Unified diff