Project

General

Profile

« Previous | Next » 

Revision 92749440

Added by Katja Luther about 5 years ago

fix #8111: fix saving problem for members in group

View differences:

eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorE4.java
36 36 
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
37 37 
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
38 38 
import eu.etaxonomy.cdm.model.common.CdmBase;
39 
import eu.etaxonomy.cdm.model.common.Group;
40 
import eu.etaxonomy.cdm.model.common.User;
39 41 
import eu.etaxonomy.cdm.model.description.DescriptionBase;
40 42 
import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
41 43 
import eu.etaxonomy.cdm.model.description.TaxonDescription;
......
47 49 
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
48 50 
import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorQuery;
49 51 
import eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput;
52 
import eu.etaxonomy.taxeditor.bulkeditor.input.GroupEditorInput;
50 53 
import eu.etaxonomy.taxeditor.bulkeditor.input.TaxonEditorInput;
51 54 
import eu.etaxonomy.taxeditor.editor.ITaxonEditor;
52 55 
import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;
......
252 255 
                    getEditorInput().addSaveCandidate(changedTaxon);
253 256 
                    input.replaceInModel(changedTaxon);
254 257 
                }
258 
            }else if(element instanceof Group){
259 
                 Group oldGroup = ((GroupEditorInput)input).getEntityFromModel((Group)element);
260 
                 ((GroupEditorInput)input).getSaveUserCandidates().addAll(oldGroup.getMembers());
261 
                 getEditorInput().addSaveCandidate((Group)element);
262 
                 input.replaceInModel((CdmBase) element);
255 263 
            }else{
256 264 
                getEditorInput().addSaveCandidate((CdmBase)element);
257 265 
                input.replaceInModel((CdmBase) element);
......
324 332 
        }
325 333 
    }
326 334 

  		




  
  335
  
    
    @Inject


  		




  
  336
  
    
    @Optional


  		




  
  337
  
    
    private void updatefromDelete(@UIEventTopic(WorkbenchEventConstants.REMOVE_USER) User user) {


  		




  
  338
  
    
        if (input instanceof GroupEditorInput){


  		




  
  339
  
    
            ((GroupEditorInput)input).getSaveUserCandidates().add(user);


  		




  
  340
  
    
        }


  		




  
  341
  
    
    }


  		




  
  342
  
    

  		




  327
  343
  
    
}


  		












Also available in:  Unified diff