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 26a8440c342974761f24ac57d9ed63b85f2f5f54..38ce05dfccc0bea59a2550efc619060d2c27dd78 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,7 +168,6 @@ 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);
@@ -196,7 +195,7 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<TaxonNode>
 
            } else{
             setTreeNode(entity);
-            checkbox_publish.setSelection(entity.getTaxon().isPublish());
+
             complete = true;
         }
                if (entity instanceof TaxonNode) {