Project

General

Profile

« Previous | Next » 

Revision c53c60d7

Added by Katja Luther over 5 years ago

smaller changes in preferences continue

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
27 27
import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
28 28
import eu.etaxonomy.cdm.model.taxon.Taxon;
29 29
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
30
import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
31 30
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
31
import eu.etaxonomy.taxeditor.preference.PublishEnum;
32 32
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
33 33
import eu.etaxonomy.taxeditor.ui.element.CheckboxElement;
34 34
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
......
167 167
		}
168 168
		checkbox_publish.setEnabled(isCreateNew());
169 169
		if(isCreateNew()){
170
		    setParentTreeNode(entity);
170 171
	        CdmPreference defaultPublish = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DefaultBehaviourForPublishFlag);
171
	        if (defaultPublish != null && defaultPublish.getValue().equals(IPreferenceKeys.PUBLISH)){
172
	        if (defaultPublish != null && defaultPublish.getValue().equals(PublishEnum.Publish.getKey())){
172 173
	            checkbox_publish.setSelection(true);
173
	        } else if (defaultPublish != null && defaultPublish.getValue().equals(IPreferenceKeys.DO_NOT_PUBLISH)){
174
	        } else if (defaultPublish != null && defaultPublish.getValue().equals(PublishEnum.NotPublish.getKey())){
174 175
	            checkbox_publish.setSelection(false);
175 176
	        }else{
176 177
	            if(this.getParentTreeNode() != null &&  this.getParentTreeNode().isInstanceOf(TaxonNode.class)){
......
179 180
	                checkbox_publish.setSelection(true);
180 181
	            }
181 182
	        }
182
	        setParentTreeNode(entity);
183

  
183 184
	    } else{
184 185
            setTreeNode(entity);
185 186
            complete = true;
......
446 447
    public boolean is_publish() {
447 448
        boolean isPublishPreference = true;
448 449
        CdmPreference defaultPublish = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DefaultBehaviourForPublishFlag);
449
        if (defaultPublish != null && defaultPublish.getValue().equals(IPreferenceKeys.DO_NOT_PUBLISH)){
450
        if (defaultPublish != null && defaultPublish.getValue().equals(PublishEnum.NotPublish.getKey())){
450 451
            isPublishPreference = false;
451 452
        }
452 453
        return checkbox_publish!=null?checkbox_publish.getSelection():isPublishPreference;

Also available in: Unified diff