Project

General

Profile

« Previous | Next » 

Revision 25a150bd

Added by Andreas Kohlbecker over 6 years ago

renaming event to action and solving refresh problem in workingset editor

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorkingsetPresenter.java
28 28 
import eu.etaxonomy.cdm.model.common.User;
29 29 
import eu.etaxonomy.cdm.model.name.Rank;
30 30 
import eu.etaxonomy.cdm.model.name.Registration;
31 
import eu.etaxonomy.cdm.model.name.RegistrationStatus;
31 32 
import eu.etaxonomy.cdm.model.name.TaxonName;
32 33 
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
33 34 
import eu.etaxonomy.cdm.model.name.TypeDesignationBase;
34 35 
import eu.etaxonomy.cdm.model.reference.Reference;
35 36 
import eu.etaxonomy.cdm.persistence.hibernate.permission.CRUD;
37 
import eu.etaxonomy.cdm.persistence.hibernate.permission.Operation;
36 38 
import eu.etaxonomy.cdm.service.CdmFilterablePagingProvider;
37 39 
import eu.etaxonomy.cdm.service.CdmStore;
38 40 
import eu.etaxonomy.cdm.service.IRegistrationWorkingSetService;
......
42 44 
import eu.etaxonomy.cdm.vaadin.event.ShowDetailsEvent;
43 45 
import eu.etaxonomy.cdm.vaadin.event.TaxonNameEditorAction;
44 46 
import eu.etaxonomy.cdm.vaadin.event.TypeDesignationWorkingsetEditorAction;
45 
import eu.etaxonomy.cdm.vaadin.event.registration.RegistrationWorkflowEvent;
47 
import eu.etaxonomy.cdm.vaadin.event.registration.RegistrationWorkingsetAction;
46 48 
import eu.etaxonomy.cdm.vaadin.model.EntityReference;
47 49 
import eu.etaxonomy.cdm.vaadin.model.registration.RegistrationWorkingSet;
48 50 
import eu.etaxonomy.cdm.vaadin.security.UserHelper;
......
127 129 
        Authentication authentication = currentSecurityContext().getAuthentication();
128 130 
        reg.setSubmitter((User)authentication.getPrincipal());
129 131 
        EntityChangeEvent event = getRegistrationStore().saveBean(reg);
132 
        UserHelper.fromSession().createAuthorityForCurrentUser(Registration.class, event.getEntityId(), Operation.UPDATE, RegistrationStatus.PREPARATION.name());
130 133 
        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
131 134 
        return getRepo().getRegistrationService().find(event.getEntityId());
132 135 
    }
......
247 250 
            if(event.getReason().equals(Reason.SAVE)){
248 251 
                if(newTaxonNameForRegistration != null){
249 252 
                    int taxonNameId = newTaxonNameForRegistration.getId();
253 
                    getRepo().getSession().refresh(newTaxonNameForRegistration);
250 254 
                    Registration reg = createNewRegistrationForName(taxonNameId);
251 255 
                    workingset.add(reg);
252 256 
                }
......
266 270 
     * @param event
267 271 
     * @throws RegistrationValidationException
268 272 
     */
269 
    @EventListener(condition = "#event.action == T(eu.etaxonomy.cdm.vaadin.event.registration.RegistrationWorkflowEvent.Action).start")
270 
    public void onRegistrationWorkflowEventActionStart(RegistrationWorkflowEvent event) throws RegistrationValidationException {
273 
    @EventListener(condition = "#event.action == T(eu.etaxonomy.cdm.vaadin.event.registration.RegistrationWorkingsetAction.Action).start")
274 
    public void onRegistrationWorkflowEventActionStart(RegistrationWorkingsetAction event) throws RegistrationValidationException {
271 275 

  		




  272
  276
  
    
        getView().getAddExistingNameCombobox().commit();


  		




  273
  277
  
    
        TaxonName typifiedName = getView().getAddExistingNameCombobox().getValue();


  		












Also available in:  Unified diff