Project

General

Profile

« Previous | Next » 

Revision 42aae678

Added by Katja Luther about 5 years ago

ref #7849: fix problems in preferences

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java
77 77
        getValues();
78 78
        Composite composite = new Composite(parent, SWT.NULL);
79 79
        composite.setLayout(new GridLayout());
80
        if(!isAdminPreference && !Boolean.valueOf(distributionEditorPref.getValue()) && !distributionEditorPref.isAllowOverride()){
80
        if(!isAdminPreference && !isEditorActivated && !overrideActivated){
81 81
            Label label = new Label(composite, SWT.NONE);
82 82
            label.setText("The CDM settings don't allow to set the preferences for using the distribution editor locally. If you need to make local settings, please ask an administrator.");
83 83

  
......
398 398
            }else{
399 399
                child.setEnabled(false);
400 400
            }
401

  
402
            PreferencesUtil.recursiveSetEnabled(child, isEditorActivated);
401 403
            if (!isAdminPreference){
402
               if (!allowOverrideAreaVoc){
403
                   button_openSelectAreas.setButtonEnabled(false);
404
                if (!allowOverrideAreaVoc){
405
                    button_openSelectAreas.setButtonEnabled(false);
406
                 }
407
                if (!allowOverrideStatus){
408
                    button_openStatusWizard.setButtonEnabled(false);
404 409
                }
405
               if (!allowOverrideStatus){
406
                   button_openStatusWizard.setButtonEnabled(false);
407
               }
408
            }
409
            PreferencesUtil.recursiveSetEnabled(child, isEditorActivated);
410
             }
410 411
        }
411 412

  
412 413

  
......
587 588
            }
588 589
        }else{
589 590
            ownDescriptionForDistributionEditor = PreferencesUtil.isShowRankInChecklistEditor();
590
            ownDescriptionForDistributionEditor = true;
591
            allowOverrideOwnDescriptionForDistributionEditor = true;
591 592
            overrideOwnDescriptionForDistributionEditor = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.OwnDescriptionForDistributionEditor.getKey()));
592 593
        }
593 594

  

Also available in: Unified diff