Project

General

Profile

« Previous | Next » 

Revision 79bd864f

Added by Katja Luther over 4 years ago

ref #8389: revert disabling of allowOverride for default selection

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NameDetailsViewConfiguration.java
458 458
        activateCheckButton.select(index);
459 459
        if (isAdminPreference){
460 460
            allowLocalPreference.setSelection(isAllowOverride);
461
            allowLocalPreference.setEnabled(isSimpleDetailsViewActivated != null);
461
//            allowLocalPreference.setEnabled(isSimpleDetailsViewActivated != null);
462 462
        }
463 463
        showTaxon.setSelection(isShowTaxon);
464 464
        showLsid.setSelection(isShowLSID);
......
521 521
            String text = activateCheckButton.getText();
522 522
            if(text.startsWith(Messages.Preference_Use_Default)){
523 523
                isSimpleDetailsViewActivated = null;
524
                if (isAdminPreference){
525
                    if (nameDetailsPref != null){
526
                        nameDetailsPref.setAllowOverride(true);
527
                    }
528
                    allowLocalPreference.setSelection(true);
529
                }else{
524
                if (!isAdminPreference){
530 525
                    isOverride = false;
531 526
                }
532 527
                PreferencesUtil.recursiveSetEnabled(dbSettings, isSimpleDetailsViewActivated!= null? (isSimpleDetailsViewActivated && isOverride):false);

Also available in: Unified diff