Revision 79bd864f
Added by Katja Luther over 4 years ago
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/GeneralAdminPreferencePage.java | ||
---|---|---|
41 | 41 |
if (controller != null){ |
42 | 42 |
IPreferenceService service = controller.getPreferenceService(); |
43 | 43 |
CdmPreference pref; |
44 |
if (isShowIOMenu == null){ |
|
44 |
if (isShowIOMenu == null && isAllowOverrideShowIOMenu){
|
|
45 | 45 |
service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowImportExportMenu)); |
46 | 46 |
}else{ |
47 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowImportExportMenu, Boolean.toString(this.isShowIOMenu));
|
|
47 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowImportExportMenu, isShowIOMenu!= null? Boolean.toString(this.isShowIOMenu):null);
|
|
48 | 48 |
pref.setAllowOverride(isAllowOverrideShowIOMenu); |
49 | 49 |
service.set(pref); |
50 | 50 |
} |
51 | 51 |
|
52 |
if(isShowCheckListPerspective == null){ |
|
52 |
if(isShowCheckListPerspective == null && isAllowOverrideShowCheckListPerspective){
|
|
53 | 53 |
service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowChecklistPerspective)); |
54 | 54 |
}else{ |
55 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowChecklistPerspective, Boolean.toString(this.isShowCheckListPerspective));
|
|
55 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowChecklistPerspective, isShowCheckListPerspective != null?Boolean.toString(this.isShowCheckListPerspective): null);
|
|
56 | 56 |
pref.setAllowOverride(isAllowOverrideShowCheckListPerspective); |
57 | 57 |
service.set(pref); |
58 | 58 |
} |
59 | 59 |
|
60 |
if(isShowTaxonNodeWizard == null){ |
|
60 |
if(isShowTaxonNodeWizard == null && isAllowOverrideShowTaxonNodeWizard){
|
|
61 | 61 |
service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowTaxonNodeWizard)); |
62 | 62 |
}else{ |
63 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowTaxonNodeWizard, Boolean.toString(this.isShowTaxonNodeWizard));
|
|
63 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowTaxonNodeWizard, isShowTaxonNodeWizard != null? Boolean.toString(this.isShowTaxonNodeWizard): null);
|
|
64 | 64 |
pref.setAllowOverride(isAllowOverrideShowTaxonNodeWizard); |
65 | 65 |
service.set(pref); |
66 | 66 |
} |
... | ... | |
80 | 80 |
PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowImportExportMenu); |
81 | 81 |
CdmPreference pref = service.find(key); |
82 | 82 |
if (pref != null){ |
83 |
isShowIOMenu = Boolean.valueOf(pref.getValue());
|
|
83 |
isShowIOMenu = pref.getValue()!= null?Boolean.valueOf(pref.getValue()): null;
|
|
84 | 84 |
isAllowOverrideShowIOMenu = pref.isAllowOverride(); |
85 | 85 |
}else{ |
86 | 86 |
isShowIOMenu = null; |
... | ... | |
100 | 100 |
key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowChecklistPerspective); |
101 | 101 |
pref = service.find(key); |
102 | 102 |
if (pref != null){ |
103 |
isShowCheckListPerspective = Boolean.valueOf(pref.getValue());
|
|
103 |
isShowCheckListPerspective = pref.getValue()!= null?Boolean.valueOf(pref.getValue()): null;
|
|
104 | 104 |
isAllowOverrideShowCheckListPerspective = pref.isAllowOverride(); |
105 | 105 |
}else{ |
106 | 106 |
isShowCheckListPerspective = null; |
... | ... | |
110 | 110 |
key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowTaxonNodeWizard); |
111 | 111 |
pref = service.find(key); |
112 | 112 |
if (pref != null){ |
113 |
isShowTaxonNodeWizard = Boolean.valueOf(pref.getValue());
|
|
113 |
isShowTaxonNodeWizard = pref.getValue() != null?Boolean.valueOf(pref.getValue()): null;
|
|
114 | 114 |
isAllowOverrideShowTaxonNodeWizard = pref.isAllowOverride(); |
115 | 115 |
}else{ |
116 | 116 |
isShowTaxonNodeWizard = null; |
Also available in: Unified diff
ref #8389: revert disabling of allowOverride for default selection