Project

General

Profile

« Previous | Next » 

Revision 62306db3

Added by Katja Luther over 5 years ago

ref #7793: fix named area and commonNameArea selection filter

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
1704 1704 
    //Distribution Editor
1705 1705 
    preference = getPreferenceFromDB(PreferencePredicate.AvailableDistributionAreaVocabularies);
1706 1706 
    if (preference != null){
1707 
        if (!prefStore.getBoolean(DISTRIBUTION_AREA_PREFRENCES_ACTIVE_OVERRIDE) ||  !preference.isAllowOverride()){
1707 
        if (!prefStore.getBoolean(DISTRIBUTION_VOCABULARIES_OVERRIDE) ||  !preference.isAllowOverride()){
1708 1708 
            prefStore.setValue(DISTRIBUTION_VOCABULARIES, preference.getValue());
1709 
            prefStore.setValue(DISTRIBUTION_VOCABULARIES_ALLOW_OVERRIDE, preference.getValue());
1709 1710 
        }
1711 
    }else{
1712 
        prefStore.setValue(DISTRIBUTION_VOCABULARIES_ALLOW_OVERRIDE,true);
1713 
        prefStore.setToDefault(DISTRIBUTION_VOCABULARIES);
1710 1714 
    }
1711 1715 

  		




  1712
  1716
  
    
    preference = getPreferenceFromDB(PreferencePredicate.DistributionEditorActivated);


  		




  ......




  1734
  1738
  
    

  		




  1735
  1739
  
    
    preference = getPreferenceFromDB(PreferencePredicate.CommonNameAreaVocabularies);


  		




  1736
  1740
  
    
    if (preference != null){


  		




  1737
  
  
    
        if (!prefStore.getBoolean(COMMON_NAME_AREA_VOCABULARIES_OVERRIDE) ||  !preference.isAllowOverride()){


  		




  
  1741
  
    
        if (!prefStore.getBoolean(COMMON_NAME_AREA_VOCABULARIES) ||  !preference.isAllowOverride()){


  		




  1738
  1742
  
    
            prefStore.setValue(COMMON_NAME_AREA_VOCABULARIES, preference.getValue());


  		




  
  1743
  
    
            prefStore.setValue(COMMON_NAME_AREA_VOCABULARIES_ALLOW_OVERRIDE, preference.isAllowOverride());


  		




  1739
  1744
  
    
        }


  		




  
  1745
  
    
    }else{


  		




  
  1746
  
    
        prefStore.setToDefault(COMMON_NAME_AREA_VOCABULARIES);


  		




  
  1747
  
    
        prefStore.setValue(COMMON_NAME_AREA_VOCABULARIES_ALLOW_OVERRIDE, true);


  		




  1740
  1748
  
    
    }


  		




  1741
  1749
  
    

  		




  1742
  1750
  
    
    preference = getPreferenceFromDB(PreferencePredicate.CommonNameReferencesWithMarker);


  		












Also available in:  Unified diff