Project

General

Profile

« Previous | Next » 

Revision 6f5b48f3

Added by Katja Luther over 4 years ago

ref #8385: setToDefault needs to setApply = true

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralTermPreference.java
154 154
    public String getCheckedValuesFromPreferences(){
155 155
        String values;
156 156
        if (localPref){
157
            values = PreferencesUtil.getStringValue(predicate.getKey(), this.localPref);
157
            values = PreferencesUtil.getStringValue(predicate.getKey(), isOverride);
158 158
        }else{
159 159
            values = pref != null ?pref.getValue(): null;
160 160
        }
......
165 165
        initialiseVocabularies();
166 166

  
167 167
        treeComposite.getViewer().setInput(getVocabularies());
168

  
168
        treeComposite.getViewer().getTree().deselectAll();
169 169
        if (checkedValues != null && checkedValues != "") { //$NON-NLS-1$
170 170
            String[] listChecked = checkedValues.split(";"); //$NON-NLS-1$
171 171
            String[] listCheckedComma = checkedValues.split(","); //$NON-NLS-1$
......
182 182
        }else{
183 183
            List<AbstractTermDto> termsFromStringValues = getTermsFromStringValues(new ArrayList<String>());
184 184
            treeComposite.setCheckedElements(termsFromStringValues.toArray());
185
           // pref = null;
185

  
186 186
        }
187 187
    }
188 188

  
......
264 264

  
265 265
    @Override
266 266
    protected void performDefaults(){
267
       rememberCheckedValues("");
267
        if (isAdminPreference){
268
            rememberCheckedValues("");
269
        }else{
270
            isOverride = false;
271
            rememberCheckedValues(getCheckedValuesFromPreferences());
272
        }
268 273
       pref = null;
269 274
       useLocalOrAdmin.select(0);
270 275
       setApply(true);
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NameDetailsViewConfiguration.java
509 509
        this.setButtonSelections();
510 510
        PreferencesUtil.recursiveSetEnabled(dbSettings, isSimpleDetailsViewActivated!= null? isSimpleDetailsViewActivated:false);
511 511
       // activateCheckButton.select(0);
512
        setApply(true);
512 513
        super.performDefaults();
513 514
    }
514 515

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PublishFlagLocalPreference.java
190 190
            index++;
191 191
        }
192 192
        allowOverrideButton.setSelection(allowOverride);
193
        setApply(true);
193 194
        super.performDefaults();
194 195
    }
195 196

  
196 197

  
198

  
197 199
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SpecimenOrObservationPreferences.java
557 557
            allowOverrideShowLifeForm = true;
558 558
            allowOverrideShowLifeFormButton.setSelection(allowOverrideShowSpecimenRelatedIssues);
559 559
        }
560

  
560
        setApply(true);
561 561

  
562 562
        super.performDefaults();
563 563
    }

Also available in: Unified diff