Project

General

Profile

« Previous | Next » 

Revision 41b6cbb7

Added by Katja Luther over 4 years ago

ref #8489: disable combo for local taxonnode sort preference if not allowed

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/TaxonNodeOrderAdminPreference.java
41 41
        orderPref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.TaxonNodeOrder);
42 42
        allowOverride = orderPref != null? orderPref.isAllowOverride():true;
43 43
        if (orderPref == null){
44
            orderPref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.TaxonNodeOrder, PreferencePredicate.TaxonNodeOrder.getDefaultValue().toString());
44
            orderPref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.TaxonNodeOrder, null);
45 45
        }
46 46
        orderActivated = orderPref.getValue() != null?NavigatorOrderEnum.valueOf(orderPref.getValue()): null;
47 47
    }
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
674 674
    public static String AbcdImportProvider_description_not_available;
675 675

  
676 676

  
677
    public static String OrderPreferencePage_NotAllowed;
678

  
679

  
677 680

  
678 681

  
679 682

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
513 513
Preference_Use_Default= Use Default
514 514
SupplementalDataSourcePreferences_SHOW_ID=Show ID in Source
515 515
SupplementalDataSourcePreferences_SHOW_NAMESPACE=Show ID Namespace
516

  
517
OrderPreferencePage_NotAllowed=The DB preference does not allow to edit this preference locally
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
513 513
Preference_Use_Default= Standardwert benutzen
514 514
SupplementalDataSourcePreferences_SHOW_ID=ID in Quelle anzeigen
515 515
SupplementalDataSourcePreferences_SHOW_NAMESPACE=ID-Namensraum anzeigen
516

  
517
OrderPreferencePage_NotAllowed=Die Datenbank Pr?ferenz erlaub kein Editieren
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/OrderPreferences.java
2 2

  
3 3
import org.eclipse.jface.dialogs.MessageDialog;
4 4
import org.eclipse.swt.SWT;
5
import org.eclipse.swt.custom.CLabel;
5 6
import org.eclipse.swt.events.SelectionAdapter;
6 7
import org.eclipse.swt.events.SelectionEvent;
7 8
import org.eclipse.swt.events.SelectionListener;
9
import org.eclipse.swt.layout.GridData;
8 10
import org.eclipse.swt.widgets.Button;
9 11
import org.eclipse.swt.widgets.Combo;
10 12
import org.eclipse.swt.widgets.Composite;
......
69 71

  
70 72
            int index = 0;
71 73

  
72
            for (String itemLabel : orderSelectionCombo.getItems()){
73
                if (itemLabel.equalsIgnoreCase(orderActivated.getLabel())){
74
                    orderSelectionCombo.select(index);
75
                    break;
74
            if (orderActivated == null){
75
                orderSelectionCombo.select(index);
76
            }else{
77
                for (String itemLabel : orderSelectionCombo.getItems()){
78
                    if (itemLabel.equalsIgnoreCase(orderActivated.getLabel())){
79
                        orderSelectionCombo.select(index);
80
                        break;
81
                    }
82
                    index++;
76 83
                }
77
                index++;
78 84
            }
79 85

  
80 86

  
......
91 97
                });
92 98
            }
93 99

  
100
            if (orderPref != null && !isAdminPreference){
101
                if (!orderPref.isAllowOverride()){
102
                    orderSelectionCombo.setEnabled(false);
103
                    final CLabel description = new CLabel(secondComposite, SWT.NULL);
104
                  description.setText(Messages.OrderPreferencePage_NotAllowed);
105
                  GridData textGrid = createTextGridData();
106
                  textGrid.verticalSpan = 2;
107
                  description.setLayoutData(textGrid);
108
                }
109
            }
110

  
94 111
//            final CLabel description = new CLabel(secondComposite, SWT.NULL);
95 112
//            description.setText(Messages.OrderPreferencePage_NewNavigatorWindowRequired);
96 113
//            GridData textGrid = createTextGridData();

Also available in: Unified diff