Project

General

Profile

« Previous | Next » 

Revision 774459a9

Added by Katja Luther about 5 years ago

ref #8088: use existing taxon for new taxonnode or when editing node

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
111 111
    				.createTaxonNodeSelectionElement(getConversationHolder(), formElement, "Parent", parentTreeNode,
112 112
    						EntitySelectionElement.DELETABLE, style);
113 113

  
114
//    		selection_reuseExistingTaxon = formFactory
115
//    				.createSelectionElement(Taxon.class,//getConversationHolder(),
116
//    				        formElement,
117
//    						"Reuse existing taxon", null,
118
//    						EntitySelectionElement.DELETABLE, style);
114
    		selection_reuseExistingTaxon = formFactory
115
    				.createSelectionElement(Taxon.class,//getConversationHolder(),
116
    				        formElement,
117
    						"Reuse existing taxon", null,
118
    						EntitySelectionElement.DELETABLE, style);
119 119

  
120 120
    		selection_reuseExistingName = formFactory
121 121
    				.createSelectionElement(TaxonName.class,//getConversationHolder(),
......
144 144
	        selection_reuseExistingTaxon = formFactory
145 145
                  .createSelectionElement(Taxon.class,//getConversationHolder(),
146 146
                          formElement,
147
                          "Reuse existing taxon", taxon,
147
                          "Taxon", taxon,
148 148
                          EntitySelectionElement.DELETABLE, style);
149 149

  
150 150
	        textTaxonSec = formFactory.createTextWithLabelElement(formElement,"Secundum Reference", "", style);
......
266 266
		    if (selection_reuseExistingTaxon.getEntity() != null){
267 267
		        setTaxon(selection_reuseExistingTaxon.getEntity());
268 268
		        if (getTaxon().getSec()!= null){
269
		            textTaxonSec.setText((getTaxon().getSec().getTitleCache()));
269
		            if (isCreateNew()){
270
		               selection_SecRef.setEntity(getTaxon().getSec());
271
		            }else{
272
		                textTaxonSec.setText((getTaxon().getSec().getTitleCache()));
273
		            }
270 274
		        }else{
271
		            textTaxonSec.setText("");
275
		            if (isCreateNew()){
276
	                       selection_SecRef.setEntity(null);
277
	                    }else{
278
	                        textTaxonSec.setText("");
279
	                    }
272 280
		        }
273 281
		        checkbox_publish.setSelected(getTaxon().isPublish());
274 282
            }

Also available in: Unified diff