ref #8088: fix publish flag in edit wizard

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
index d5c09d18edf8d4cc3c2505b4cf2e828473c706b5..26a8440c342974761f24ac57d9ed63b85f2f5f54 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
@@ -168,6 +168,7 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<TaxonNode>
         }
         parentTreeNode = entity.getParent();
 
+<<<<<<< HEAD
                if (entity instanceof TaxonNode ) {
                    checkbox_publish = formFactory.createCheckbox(formElement,
                            "Taxon is published", entity.getTaxon().isPublish(), style);
@@ -175,6 +176,7 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<TaxonNode>
                    checkbox_publish = formFactory.createCheckbox(formElement,
                     "Taxon is published", true, style);
                }
+
                checkbox_publish.setEnabled(isCreateNew());
                if(isCreateNew()){
                   setParentTreeNode(entity.getParent());
@@ -194,7 +196,7 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<TaxonNode>
 
            } else{
             setTreeNode(entity);
-
+            checkbox_publish.setSelection(entity.getTaxon().isPublish());
             complete = true;
         }
                if (entity instanceof TaxonNode) {