From: Katja Luther <k.luther@bgbm.org>
Date: Tue, 1 Nov 2016 11:41:18 +0000 (+0100)
Subject: ref #5971: minor
X-Git-Tag: 4.4.0^2~74
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/b7bfcde74b204668fbe1c7e9f527460d488a7c87?hp=be140ab305a6b7e7ba3e06cc810c1e10d232ae5a

ref #5971: minor
---

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/AdminNomenclaturalCode.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/AdminNomenclaturalCode.java
index d87a9d84b..4c8b0d1f2 100755
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/AdminNomenclaturalCode.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/AdminNomenclaturalCode.java
@@ -84,7 +84,9 @@ public class AdminNomenclaturalCode extends FieldEditorPreferencePage implements
        boolean result = super.performOk();
        if (result){
            String value = getPreferenceStore().getString(IPreferenceKeys.CDM_NOMENCLATURAL_CODE_KEY);
+           String allowOverride =  getPreferenceStore().getString(IPreferenceKeys.ALLOW_OVERRIDE_NOMENCLATURAL_CODE_KEY);
            CdmPreference pref = CdmPreference.NewDatabaseInstance( PreferencePredicate.NomenclaturalCode, value);
+           pref.setAllowOverride(Boolean.getBoolean(allowOverride));
            ICdmApplicationConfiguration controller = CdmStore.getCurrentApplicationConfiguration();
            if (controller == null){
                return false;
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NomenclaturalCodePreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NomenclaturalCodePreferences.java
index 126909a5b..657a40dc4 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NomenclaturalCodePreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NomenclaturalCodePreferences.java
@@ -41,15 +41,19 @@ public class NomenclaturalCodePreferences extends FieldEditorPreferencePage
 	 */
 	@Override
 	protected void createFieldEditors() {
-
-		addField(new ComboFieldEditor(
+	    if (getPreferenceStore().getBoolean(IPreferenceKeys.OVERRIDE_NOMENCLATURAL_CODE_KEY)) {
+	        addField(new ComboFieldEditor(
 				IPreferenceKeys.PREFERRED_NOMENCLATURAL_CODE_KEY,
 				"Available Codes", getLabelAndValues(),
 				getFieldEditorParent()));
-		addField(new BooleanFieldEditor(
-                IPreferenceKeys.OVERRIDE_NOMENCLATURAL_CODE_KEY,
-                "Use local nomenclatural code",
-                getFieldEditorParent()));
+
+            addField(new BooleanFieldEditor(
+                    IPreferenceKeys.OVERRIDE_NOMENCLATURAL_CODE_KEY,
+                    "Use local nomenclatural code",
+                    getFieldEditorParent()));
+        } else {
+            setDescription("The CDM settings don't allow to set the nomenclatural code locally. If you need to make local settings, please ask an administrator.");
+        }
 
 	}
 
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
index f4f32c9b2..44662fe16 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
@@ -175,6 +175,7 @@ public class PreferencesUtil implements IPreferenceKeys {
 	    if(pref == null){
 	    	preferredCode = getPreferenceStore().getString(
 					PREFERRED_NOMENCLATURAL_CODE_KEY);
+
 	    }else{
 	    	preferredCode = pref.getValue();
 	    }