Project

General

Profile

« Previous | Next » 

Revision 11847891

Added by Katja Luther almost 5 years ago

ref #8047: configurable display of status in drop down

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/ChecklistEditorGeneralAdminPreference.java
87 87
            service.set(pref);
88 88
        }
89 89

  
90
        if (ownDescriptionForDistributionEditor == null){
91
            service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.OwnDescriptionForDistributionEditor));
90
        if (displayStatusCombo == null){
91
            service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.DisplayOfStatusInCombo));
92 92
        }else{
93
            pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.OwnDescriptionForDistributionEditor, Boolean.toString(ownDescriptionForDistributionEditor));
94
            pref.setAllowOverride(prefOwnDescription.isAllowOverride());
93
            pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.DisplayOfStatusInCombo, displayStatusCombo);
94
            if (prefStatusDisplayInCombo == null){
95
                prefStatusDisplayInCombo = pref;
96
            }
97
            pref.setAllowOverride(prefStatusDisplayInCombo.isAllowOverride());
95 98
            service.set(pref);
96 99
        }
97 100
//        if (statusPref != null){
......
129 132
            this.displayStatus = Messages.Preference_Use_Default;
130 133
        }
131 134

  
135
        if (prefStatusDisplayInCombo != null){
136
            this.displayStatusCombo = prefStatusDisplayInCombo.getValue();
137
        }else{
138
            this.displayStatusCombo = Messages.Preference_Use_Default;
139
        }
140

  
141

  
132 142
        if (prefAreaSort != null){
133 143
            if (prefAreaSort.getValue() != null){
134 144
                this.orderAreas = prefAreaSort.getValue().toString();

Also available in: Unified diff