Project

General

Profile

« Previous | Next » 

Revision 3f7099d8

Added by Katja Luther about 5 years 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