Project

General

Profile

« Previous | Next » 

Revision f10b2ba0

Added by Katja Luther about 5 years ago

ref #7856: in admin preference keep distribution editor prefs enabled if the activation is disabled

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 && !isEditorActivated && !overrideActivated){
80
        if(!isAdminPreference && !isEditorActivated && !isAllowOverride){
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

  
......
97 97
                    isEditorActivated = activateCheckButton.getSelection();
98 98
                    if(!isAdminPreference){
99 99
                        overrideActivated = true;
100
                        child.setEnabled(isEditorActivated);
101
                        PreferencesUtil.recursiveSetEnabled(child, isEditorActivated);
100 102
                    }
101
                    child.setEnabled(isEditorActivated);
102
                    PreferencesUtil.recursiveSetEnabled(child, isEditorActivated);
103

  
104

  
103 105

  
104 106

  
105 107
                }
......
128 130

  
129 131
            child  = createComposite(composite);
130 132

  
131
            child.setEnabled(isEditorActivated);
133
            if(!isAdminPreference){
134
               child.setEnabled(isEditorActivated);
135
            }
132 136
            separator= new Label(child, SWT.HORIZONTAL | SWT.SEPARATOR);
133 137
            sepGrid = createTextGridData();
134 138

  
......
393 397

  
394 398

  
395 399

  
396
            if(isEditorActivated){
397
                child.setEnabled(true);
398
            }else{
399
                child.setEnabled(false);
400
//            if(isEditorActivated){
401
//                child.setEnabled(true);
402
//            }else{
403
//                child.setEnabled(false);
404
//            }
405
            if (!isAdminPreference){
406
                PreferencesUtil.recursiveSetEnabled(child, isEditorActivated);
400 407
            }
401

  
402
            PreferencesUtil.recursiveSetEnabled(child, isEditorActivated);
403 408
            if (!isAdminPreference){
404 409
                if (!allowOverrideAreaVoc){
405 410
                    button_openSelectAreas.setButtonEnabled(false);

Also available in: Unified diff