Revision 79bd864f
Added by Katja Luther over 4 years ago
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/PublishFlagPreference.java | ||
|---|---|---|
| 45 | 45 |
return false; |
| 46 | 46 |
} |
| 47 | 47 |
IPreferenceService service = controller.getPreferenceService(); |
| 48 |
String text = publishFlagBehaviour.getText(); |
|
| 48 |
String textCombo = publishFlagBehaviour.getText(); |
|
| 49 |
String text = null; |
|
| 49 | 50 |
// default -> delete preference |
| 50 |
if(text.startsWith(Messages.Preference_Use_Default)){
|
|
| 51 |
if(textCombo.startsWith(Messages.Preference_Use_Default) && allowOverride){
|
|
| 51 | 52 |
service.remove(pref.getKey()); |
| 52 | 53 |
PreferencesUtil.updateDBPreferences(); |
| 53 | 54 |
return true; |
| 54 |
} |
|
| 55 |
|
|
| 56 |
for (PublishEnum display: PublishEnum.values()){
|
|
| 57 |
if (display.getLabel().equals(text)){
|
|
| 58 |
text = display.getKey(); |
|
| 59 |
break; |
|
| 55 |
}else if (textCombo.startsWith(Messages.Preference_Use_Default)){
|
|
| 56 |
text = null; |
|
| 57 |
}else{
|
|
| 58 |
for (PublishEnum display: PublishEnum.values()){
|
|
| 59 |
if (display.getLabel().equals(text)){
|
|
| 60 |
text = display.getKey(); |
|
| 61 |
break; |
|
| 62 |
} |
|
| 60 | 63 |
} |
| 61 | 64 |
} |
| 62 | 65 |
CdmPreference pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.DefaultBehaviourForPublishFlag, text); |
| ... | ... | |
| 81 | 84 |
} |
| 82 | 85 |
else {
|
| 83 | 86 |
allowOverride = pref.isAllowOverride(); |
| 84 |
publishBehaviour = PublishEnum.valueOf(pref.getValue());
|
|
| 87 |
publishBehaviour = pref.getValue() != null? PublishEnum.valueOf(pref.getValue()): null;
|
|
| 85 | 88 |
} |
| 86 | 89 |
} |
| 87 | 90 |
|
Also available in: Unified diff
ref #8389: revert disabling of allowOverride for default selection