Project

General

Profile

« Previous | Next » 

Revision f54da8eb

Added by Katja Luther about 5 years ago

ref #7849: minor

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java
84 84

  
85 85
    protected CdmPreference areaVocPref = null;
86 86
    protected CdmPreference statusPref = null;
87
    private CommandHandlerButton button_openSelectAreas;
88
    private CommandHandlerButton button_openStatusWizard;
87 89

  
88 90
    @Override
89 91
    protected Control createContents(Composite parent) {
......
413 415
            labelStatus.setText(Messages.DistributionAdminPreferences_SELECT_STATUS);
414 416
            labelStatus.setLayoutData(textGrid);
415 417

  
416
            final CommandHandlerButton button_openStatusWizard = new CommandHandlerButton(child, SWT.PUSH,
418
            button_openStatusWizard = new CommandHandlerButton(child, SWT.PUSH,
417 419
                    commandHandlerStringStatus);
418 420

  
419 421
            button_openStatusWizard.setText(Messages.Distribution_status_selection);
......
433 435
            label.setText(Messages.ChecklistEditorGeneralPreference_open_wizard);
434 436
            label.setLayoutData(textGrid);
435 437

  
436
            final CommandHandlerButton button_openSelectAreas = new CommandHandlerButton(child, SWT.PUSH,
438
            button_openSelectAreas = new CommandHandlerButton(child, SWT.PUSH,
437 439
                      commandHandlerString);
438 440
            button_openSelectAreas.setText(Messages.ChecklistEditorGeneralPreference_open_distribution_selection);
439 441

  
......
447 449
//            }
448 450
            if (!isAdminPreference){
449 451
                PreferencesUtil.recursiveSetEnabled(child, isEditorActivated);
450
            }
451
            if (!isAdminPreference){
452

  
452 453
                if (!allowOverrideAreaVoc){
453 454
                    button_openSelectAreas.setButtonEnabled(false);
454 455
                 }
......
780 781

  
781 782
        this.statusPref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AvailableDistributionStatus, null);
782 783
        this.areaVocPref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AvailableDistributionAreaVocabularies, null);
784
        if (!isAdminPreference){
785
            PreferencesUtil.recursiveSetEnabled(child, isEditorActivated);
786

  
787
            if (!allowOverrideAreaVoc){
788
                button_openSelectAreas.setButtonEnabled(false);
789
             }
790
            if (!allowOverrideStatus){
791
                button_openStatusWizard.setButtonEnabled(false);
792
            }
793
            if (!allowOverrideRank){
794
                activateRankButton.setEnabled(false);
795
                allowOverrideRankButton.setEnabled(false);
796
            }
797
            if (!allowOverrideOrderAreas){
798
                areaOrderSelectionCombo.setEnabled(false);
799
                allowOverrideOrderAreasButton.setEnabled(false);
800
            }
801
            if (!allowOverrideAreaDisplay){
802

  
803
                allowOverrideAreaDisplayButton.setEnabled(false);
804
            }
805
            if (!allowOverrideStatusDisplay){
806

  
807
                allowOverrideStatusDisplayButton.setEnabled(false);
808
            }
809
         }
783 810
        super.performDefaults();
784 811
    }
785 812

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionStatusAdminWizard.java
87 87
    @Override
88 88
    public boolean performFinish() {
89 89
        Object[] checkedElements = aPage.getViewer().getCheckedElements();
90

  
90 91
        pref = aPage.getPreference();
91 92

  
92 93
        List<UUID> listUIIDChecked = new ArrayList<>();
......
105 106
        CdmPreference savePref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AvailableDistributionStatus, saveCheckedElements);
106 107
        savePref.setAllowOverride(pref.isAllowOverride());
107 108
        PreferencesUtil.setPreferenceToDB(savePref);
108

  
109

  
110
//      aPage.getVocabularies().get(0).getTerms()
111
//      .forEach(dto -> terms.add(CdmStore.getService(ITermService.class).load(dto.getUuid())));
112

  
113 109
        PreferencesUtil.firePreferencesChanged(this.getClass());
114 110
        return true;
115 111
    }

Also available in: Unified diff