From: Katja Luther <k.luther@bgbm.org>
Date: Fri, 3 May 2019 08:42:11 +0000 (+0200)
Subject: ref #7920: predicate for area specific status pref is the same as for the general... 
X-Git-Tag: 5.7.0^2~14
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/2c4c870ddec90a2de1fbc68ab0eef8d5ee97e291

ref #7920: predicate for area specific status pref is the same as for the general pref
---

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/StatusComboBoxDataProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/StatusComboBoxDataProvider.java
index 4fbd1c8b4..67ff2fa82 100755
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/StatusComboBoxDataProvider.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/StatusComboBoxDataProvider.java
@@ -49,10 +49,11 @@ public class StatusComboBoxDataProvider implements IComboBoxDataProvider {
     @Override
     public List<?> getValues(int columnIndex, int rowIndex) {
         NamedArea area = editor.getAreaToColumnIndexMap().get(columnIndex);
-        PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewInstance("/"+PreferenceSubject.DISTR_EDITOR+"/area/"+area.getUuid().toString()), PreferencePredicate.AvailableDistributionPerAreaStatus);
+        PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewInstance("/"+PreferenceSubject.DISTR_EDITOR+"/area/"+area.getUuid().toString()), PreferencePredicate.AvailableDistributionStatus);
         CdmPreference pref = CdmPreferenceCache.instance().findBestMatching(key);
         if (pref == null) {
-            pref = CdmPreferenceCache.instance().get(PreferencePredicate.AvailableDistributionStatus.getKey());
+            key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AvailableDistributionStatus);
+            pref = CdmPreferenceCache.instance().findBestMatching(key);
             if (pref == null){
                 pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AvailableDistributionStatus, PreferencesUtil.getStringValue(PreferencePredicate.AvailableDistributionStatus.getKey()));
             }