Project

General

Profile

« Previous | Next » 

Revision 8db3ccd6

Added by Katja Luther about 5 years ago

ref #7849: correct enabling of local prefs with no allowOverride and sortOrder for areas in distr. editor

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistLabelProvider.java
46 46
import eu.etaxonomy.taxeditor.editor.view.checklist.e4.ChecklistEditorE4;
47 47
import eu.etaxonomy.taxeditor.preference.EditorPreferencePredicate;
48 48
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
49
import eu.etaxonomy.taxeditor.preference.TermOrder;
49 50
import eu.etaxonomy.taxeditor.store.CdmStore;
50 51

  
51 52
/**
......
190 191

  
191 192
            }
192 193

  
193
            if (PreferencesUtil.isSortNamedAreaByOrderInVocabulary()){
194
            String sortOrder = PreferencesUtil.getSortNamedAreasInDistributionEditor();
195
            if (sortOrder.equals(TermOrder.Natural.getKey())){
194 196
                return getTermsOrderedByVocabularyOrder(filteredList);
195
            } else if (PreferencesUtil.isShowIdInVocabularyInChecklistEditor()){
197
            }  else if (sortOrder.equals(TermOrder.IdInVoc.getKey())){
196 198
                return getTermsOrderedByIdInVocabulary(filteredList);
197 199
            }else{
198 200
                return getTermsOrderedByLabels(filteredList, CdmStore.getDefaultLanguage());

Also available in: Unified diff