Project

General

Profile

« Previous | Next » 

Revision 9d8df0cf

Added by Katja Luther over 6 years ago

ref #5971: don't allow to edit local nomenclatural code if allowOverride is false

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/AdminNomenclaturalCode.java
86 86
           String value = getPreferenceStore().getString(IPreferenceKeys.CDM_NOMENCLATURAL_CODE_KEY);
87 87
           String allowOverride =  getPreferenceStore().getString(IPreferenceKeys.ALLOW_OVERRIDE_NOMENCLATURAL_CODE_KEY);
88 88
           CdmPreference pref = CdmPreference.NewDatabaseInstance( PreferencePredicate.NomenclaturalCode, value);
89
           pref.setAllowOverride(Boolean.getBoolean(allowOverride));
89
           pref.setAllowOverride(Boolean.parseBoolean(allowOverride));
90 90
           ICdmApplicationConfiguration controller = CdmStore.getCurrentApplicationConfiguration();
91 91
           if (controller == null){
92 92
               return false;
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NomenclaturalCodePreferences.java
41 41
	 */
42 42
	@Override
43 43
	protected void createFieldEditors() {
44
	    if (getPreferenceStore().getBoolean(IPreferenceKeys.OVERRIDE_NOMENCLATURAL_CODE_KEY)) {
44
	    if (getPreferenceStore().getBoolean(IPreferenceKeys.ALLOW_OVERRIDE_NOMENCLATURAL_CODE_KEY)) {
45 45
	        addField(new ComboFieldEditor(
46 46
				IPreferenceKeys.PREFERRED_NOMENCLATURAL_CODE_KEY,
47 47
				"Available Codes", getLabelAndValues(),
......
80 80
	 */
81 81
	@Override
82 82
    public void init(IWorkbench workbench) {
83
		setPreferenceStore(TaxeditorStorePlugin.getDefault()
83

  
84
	        setPreferenceStore(TaxeditorStorePlugin.getDefault()
84 85
				.getPreferenceStore());
85
		setDescription("Choose which nomenclatural code you would like to use in your local application for scientific names unless otherwise specified.");
86
		//PreferencesUtil.setPreferredNomenclaturalCode(null, true);
86

  
87
	    if (getPreferenceStore().getBoolean(IPreferenceKeys.ALLOW_OVERRIDE_NOMENCLATURAL_CODE_KEY)) {
88
	        setDescription("Choose which nomenclatural code you would like to use in your local application for scientific names unless otherwise specified.");
89
	    }else{
90
	        setDescription("The CDM settings don't allow to set the nomenclatural code locally. If you need to make local settings, please ask an administrator.");
91

  
92
	        //PreferencesUtil.setPreferredNomenclaturalCode(null, true);
93
	    }
87 94
	}
88 95

  
89 96
	@Override

Also available in: Unified diff