Revision eade8b7d
Added by Katja Luther over 5 years ago
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java | ||
|---|---|---|
| 1822 | 1822 |
boolean local) {
|
| 1823 | 1823 |
if (local){
|
| 1824 | 1824 |
setStringValue(PreferencePredicate.AvailableDistributionAreaVocabularies.getKey(), saveCheckedElements); |
| 1825 |
setBooleanValue(prefOverrideKey(PreferencePredicate.AvailableDistributionAreaVocabularies.getKey()), true); |
|
| 1825 | 1826 |
} |
| 1826 | 1827 |
else{
|
| 1827 | 1828 |
ICdmRepository controller; |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionPage.java | ||
|---|---|---|
| 40 | 40 |
super(pageName, TermType.NamedArea); |
| 41 | 41 |
this.localPref = true; |
| 42 | 42 |
|
| 43 |
|
|
| 43 | 44 |
} |
| 44 | 45 |
|
| 45 | 46 |
@Override |
| ... | ... | |
| 109 | 110 |
} |
| 110 | 111 |
return vocs; |
| 111 | 112 |
} |
| 113 |
@Override |
|
| 114 |
protected void initialiseVocabularies() {
|
|
| 115 |
if (getVocabularies() != null) {
|
|
| 116 |
getVocabularies().clear(); |
|
| 117 |
} |
|
| 118 |
List<TermVocabularyDto> vocs = new ArrayList<>(); |
|
| 119 |
vocs = getVocabulariesFromPreference(); |
|
| 120 |
|
|
| 121 |
setVocabularies(vocs); |
|
| 122 |
} |
|
| 112 | 123 |
|
| 113 | 124 |
} |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableVocabularyWizard.java | ||
|---|---|---|
| 18 | 18 |
import eu.etaxonomy.cdm.api.conversation.ConversationHolder; |
| 19 | 19 |
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled; |
| 20 | 20 |
import eu.etaxonomy.cdm.model.metadata.CdmPreference; |
| 21 |
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate; |
|
| 22 |
import eu.etaxonomy.cdm.model.metadata.PreferenceSubject; |
|
| 23 | 21 |
import eu.etaxonomy.cdm.persistence.dto.TermVocabularyDto; |
| 24 | 22 |
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap; |
| 25 | 23 |
import eu.etaxonomy.taxeditor.l10n.Messages; |
| ... | ... | |
| 96 | 94 |
if (pref != null){
|
| 97 | 95 |
predicate = pref.getPredicate(); |
| 98 | 96 |
} |
| 99 |
if (!localPref){
|
|
| 100 |
CdmPreference savePref = CdmPreference.NewInstance(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.getByKey(predicate), saveCheckedElements); |
|
| 101 |
savePref.setAllowOverride(pref.isAllowOverride()); |
|
| 102 |
PreferencesUtil.setPreferenceToDB(savePref); |
|
| 103 |
|
|
| 104 |
PreferencesUtil.updateDBPreferences(); |
|
| 105 |
}else{
|
|
| 106 |
PreferencesUtil.setStringValue(PreferencePredicate.AvailableDistributionAreaVocabularies.getKey(), saveCheckedElements); |
|
| 107 |
} |
|
| 97 |
// if (!localPref){
|
|
| 98 |
// CdmPreference savePref = CdmPreference.NewInstance(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.getByKey(predicate), saveCheckedElements); |
|
| 99 |
// savePref.setAllowOverride(pref.isAllowOverride()); |
|
| 100 |
// PreferencesUtil.setPreferenceToDB(savePref); |
|
| 101 |
// |
|
| 102 |
// PreferencesUtil.updateDBPreferences(); |
|
| 103 |
// }else{
|
|
| 104 |
PreferencesUtil.setPreferredVocabulariesForDistributionEditor(saveCheckedElements,localPref); |
|
| 105 |
|
|
| 106 |
// } |
|
| 108 | 107 |
return true; |
| 109 | 108 |
} |
| 110 | 109 |
|
Also available in: Unified diff
ref #7856: fix allow override for namedArea vocabulary selection for distributions