Project

General

Profile

« Previous | Next » 

Revision 9c128421

Added by Katja Luther over 4 years ago

ref #8385: adapt local and db preference pages

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NameDetailsViewConfiguration.java
103 103
                    @Override
104 104
                    public void widgetSelected(SelectionEvent e) {
105 105
                        setApply(true);
106
                        if (isAdminPreference){
107
                            isAllowOverride = allowLocalPreference.getSelection();
108
                        }else{
109
                            isOverride = allowLocalPreference.getSelection();
110
                        }
111

  
106
                        isAllowOverride = allowLocalPreference.getSelection();
112 107
                    }
113 108
                });
114 109

  
......
420 415

  
421 416
    @Override
422 417
    public boolean performOk() {
423
        if (nameDetailsConfig != null){
424
            PreferencesUtil.setStringValue(PreferencePredicate.NameDetailsView.getKey(), nameDetailsConfig.toString());
425
            if (nameDetailsPref == null || !nameDetailsConfig.toString().equals(nameDetailsPref.getValue())) {
426
                PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.NameDetailsView.getKey()), true);
418
        if (isApply()){
419
            if (isOverride){
420
                PreferencesUtil.setStringValue(PreferencePredicate.NameDetailsView.getKey(), nameDetailsConfig.toString());
421
                if (nameDetailsPref == null || !nameDetailsConfig.toString().equals(nameDetailsPref.getValue())) {
422
                    PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.NameDetailsView.getKey()), true);
423
                }
424
            }else {
425
                PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.NameDetailsView.getKey()), false);
427 426
            }
428
        }
429 427

  
428
        }
430 429
        return true;
431 430

  
432 431
    }
......
449 448
    protected void setButtonSelections(){
450 449

  
451 450
        int index = 0;
452
        if (isSimpleDetailsViewActivated != null){
451
        if (isSimpleDetailsViewActivated != null && isOverride){
453 452
            if (isSimpleDetailsViewActivated){
454 453
                index = 1;
455 454
            }else{
......
477 476
        showHybrid.setSelection(isShowHybrid);
478 477
        showNameApprobiation.setSelection(isShowNameApprobiation);
479 478
        secEnabled.setSelection(isSecEnabled);
480
        secEnabled.setEnabled(isShowTaxon);
479
        //secEnabled.setEnabled(isShowTaxon);
481 480
        showSecDetail.setSelection(isSecDetailsActivated);
482
        showSecDetail.setEnabled(isShowTaxon);
481
        //showSecDetail.setEnabled(isShowTaxon);
483 482

  
484 483
    }
485 484

  
......
523 522
                if (isAdminPreference){
524 523
                    nameDetailsPref.setAllowOverride(true);
525 524
                    allowLocalPreference.setSelection(true);
525
                }else{
526
                    isOverride = false;
526 527
                }
527 528
                return;
528 529
            }
530
            isOverride = true;
529 531
            if (text.equals(ENABLE)){
530 532
                isSimpleDetailsViewActivated = true;
531 533

  

Also available in: Unified diff