Project

General

Profile

Revision 3f7099d8

ID3f7099d85a13c42a56f0da4a7dfc258616d0b6f3
Parent ad2f71e9
Child 8ebb13a2

Added by Katja Luther over 1 year ago

fix merge conflict

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
167 167
            selection_Ref.setEntity(entity.getReference());
168 168
        }
169 169
        parentTreeNode = entity.getParent();
170
		if (entity instanceof TaxonNode && parentTreeNode.getTaxon() != null) {
170

  
171
		if (entity instanceof TaxonNode ) {
171 172
		    checkbox_publish = formFactory.createCheckbox(formElement,
172 173
		            "Taxon is published", entity.getTaxon().isPublish(), style);
173 174
		}else{

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)