Project

General

Profile

« Previous | Next » 

Revision 320ad9d6

Added by Andreas Kohlbecker almost 6 years ago

ref #7550 replacing the selfregisration of the VaadinUserHelper to the vaadin session by a UserHelperAccess bean

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorksetViewBean.java
57 57 
import eu.etaxonomy.cdm.persistence.hibernate.permission.CRUD;
58 58 
import eu.etaxonomy.cdm.ref.EntityReference;
59 59 
import eu.etaxonomy.cdm.ref.TypedEntityReference;
60 
import eu.etaxonomy.cdm.service.UserHelperAccess;
60 61 
import eu.etaxonomy.cdm.vaadin.component.registration.RegistrationItem;
61 62 
import eu.etaxonomy.cdm.vaadin.component.registration.RegistrationItemButtons;
62 63 
import eu.etaxonomy.cdm.vaadin.component.registration.RegistrationItemNameAndTypeButtons;
......
73 74 
import eu.etaxonomy.cdm.vaadin.event.registration.RegistrationWorkingsetAction;
74 75 
import eu.etaxonomy.cdm.vaadin.permission.AccessRestrictedView;
75 76 
import eu.etaxonomy.cdm.vaadin.permission.PermissionDebugUtils;
76 
import eu.etaxonomy.cdm.vaadin.permission.VaadinUserHelper;
77 
import eu.etaxonomy.cdm.vaadin.permission.RegistrationCuratorRoleProbe;
77 78 
import eu.etaxonomy.cdm.vaadin.theme.EditValoTheme;
78 79 
import eu.etaxonomy.cdm.vaadin.view.AbstractPageView;
79 80 
import eu.etaxonomy.vaadin.event.EditorActionType;
......
452 453 
        CssLayout stateAndSubmitter = new CssLayout(statusComponent, submitterLabel);
453 454 

  		




  454
  455
  
    

  		




  455
  
  
    
        if(VaadinUserHelper.fromSession().userIsRegistrationCurator() || VaadinUserHelper.fromSession().userIsAdmin()) {


  		




  
  456
  
    
        if(UserHelperAccess.userHelper().userIs(new RegistrationCuratorRoleProbe()) || UserHelperAccess.userHelper().userIsAdmin()) {


  		




  456
  457
  
    
            Button editRegistrationButton = new Button(FontAwesome.COG);


  		




  457
  458
  
    
            editRegistrationButton.setStyleName(ValoTheme.BUTTON_TINY);


  		




  458
  459
  
    
            editRegistrationButton.setDescription("Edit registration");


  		












Also available in:  Unified diff