Revision 01bb5e1e
Added by Andreas Müller about 2 years ago
| src/main/java/eu/etaxonomy/cdm/vaadin/view/name/NameTypeDesignationPopupEditor.java | ||
|---|---|---|
| 19 | 19 |
import com.vaadin.ui.NativeSelect; |
| 20 | 20 |
import com.vaadin.ui.TextField; |
| 21 | 21 |
|
| 22 |
import eu.etaxonomy.cdm.api.utility.RoleProber; |
|
| 22 |
import eu.etaxonomy.cdm.api.utility.RoleProberImpl;
|
|
| 23 | 23 |
import eu.etaxonomy.cdm.model.common.AnnotationType; |
| 24 | 24 |
import eu.etaxonomy.cdm.model.name.NameTypeDesignation; |
| 25 | 25 |
import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus; |
| ... | ... | |
| 217 | 217 |
row++; |
| 218 | 218 |
annotationsListField = new FilterableAnnotationsField("Editorial notes");
|
| 219 | 219 |
annotationsListField.setWidth(100, Unit.PERCENTAGE); |
| 220 |
boolean isCurator = UserHelperAccess.userHelper().userIs(new RoleProber(RolesAndPermissions.ROLE_CURATION)); |
|
| 220 |
boolean isCurator = UserHelperAccess.userHelper().userIs(new RoleProberImpl(RolesAndPermissions.ROLE_CURATION));
|
|
| 221 | 221 |
boolean isAdmin = UserHelperAccess.userHelper().userIsAdmin(); |
| 222 | 222 |
if(isCurator || isAdmin){
|
| 223 | 223 |
annotationsListField.withNewButton(true); |
| src/main/java/eu/etaxonomy/cdm/vaadin/view/name/SpecimenTypeDesignationWorkingsetPopupEditor.java | ||
|---|---|---|
| 27 | 27 |
import com.vaadin.ui.Panel; |
| 28 | 28 |
import com.vaadin.ui.TextArea; |
| 29 | 29 |
|
| 30 |
import eu.etaxonomy.cdm.api.utility.RoleProber; |
|
| 30 |
import eu.etaxonomy.cdm.api.utility.RoleProberImpl;
|
|
| 31 | 31 |
import eu.etaxonomy.cdm.model.common.AnnotationType; |
| 32 | 32 |
import eu.etaxonomy.cdm.model.permission.CRUD; |
| 33 | 33 |
import eu.etaxonomy.cdm.service.UserHelperAccess; |
| ... | ... | |
| 239 | 239 |
row++; |
| 240 | 240 |
annotationsListField = new FilterableAnnotationsField("Editorial notes");
|
| 241 | 241 |
annotationsListField.setWidth(100, Unit.PERCENTAGE); |
| 242 |
boolean isCurator = UserHelperAccess.userHelper().userIs(new RoleProber(RolesAndPermissions.ROLE_CURATION)); |
|
| 242 |
boolean isCurator = UserHelperAccess.userHelper().userIs(new RoleProberImpl(RolesAndPermissions.ROLE_CURATION));
|
|
| 243 | 243 |
boolean isAdmin = UserHelperAccess.userHelper().userIsAdmin(); |
| 244 | 244 |
if(isCurator || isAdmin){
|
| 245 | 245 |
annotationsListField.withNewButton(true); |
| src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TaxonNamePopupEditor.java | ||
|---|---|---|
| 34 | 34 |
import com.vaadin.ui.Panel; |
| 35 | 35 |
import com.vaadin.ui.TextField; |
| 36 | 36 |
|
| 37 |
import eu.etaxonomy.cdm.api.utility.RoleProber; |
|
| 37 |
import eu.etaxonomy.cdm.api.utility.RoleProberImpl;
|
|
| 38 | 38 |
import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase; |
| 39 | 39 |
import eu.etaxonomy.cdm.model.common.AnnotationType; |
| 40 | 40 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
| ... | ... | |
| 549 | 549 |
row++; |
| 550 | 550 |
annotationsListField = new FilterableAnnotationsField("Editorial notes");
|
| 551 | 551 |
annotationsListField.setWidth(100, Unit.PERCENTAGE); |
| 552 |
boolean isCurator = UserHelperAccess.userHelper().userIs(new RoleProber(RolesAndPermissions.ROLE_CURATION)); |
|
| 552 |
boolean isCurator = UserHelperAccess.userHelper().userIs(new RoleProberImpl(RolesAndPermissions.ROLE_CURATION));
|
|
| 553 | 553 |
boolean isAdmin = UserHelperAccess.userHelper().userIsAdmin(); |
| 554 | 554 |
if(isCurator || isAdmin){
|
| 555 | 555 |
annotationsListField.withNewButton(true); |
| src/main/java/eu/etaxonomy/cdm/vaadin/view/occurrence/CollectionPopupEditor.java | ||
|---|---|---|
| 14 | 14 |
import com.vaadin.ui.GridLayout; |
| 15 | 15 |
import com.vaadin.ui.TextField; |
| 16 | 16 |
|
| 17 |
import eu.etaxonomy.cdm.api.utility.RoleProber; |
|
| 17 |
import eu.etaxonomy.cdm.api.utility.RoleProberImpl;
|
|
| 18 | 18 |
import eu.etaxonomy.cdm.api.utility.UserHelper; |
| 19 | 19 |
import eu.etaxonomy.cdm.model.agent.Institution; |
| 20 | 20 |
import eu.etaxonomy.cdm.model.occurrence.Collection; |
| ... | ... | |
| 161 | 161 |
}); |
| 162 | 162 |
|
| 163 | 163 |
UserHelper userHelper = UserHelperAccess.userHelper(); |
| 164 |
superCollectionCombobox.setVisible(RegistrationUIDefaults.COLLECTION_EDITOR_SUB_COLLECTION_VISIBILITY_RESTRICTION.stream().anyMatch( role -> userHelper.userIs(new RoleProber(role)))); |
|
| 164 |
superCollectionCombobox.setVisible(RegistrationUIDefaults.COLLECTION_EDITOR_SUB_COLLECTION_VISIBILITY_RESTRICTION.stream().anyMatch( role -> userHelper.userIs(new RoleProberImpl(role))));
|
|
| 165 | 165 |
|
| 166 | 166 |
row++; |
| 167 | 167 |
institutionCombobox = new ToOneRelatedEntityCombobox<Institution>("Institute", Institution.class);
|
| src/main/java/eu/etaxonomy/cdm/vaadin/view/reference/ReferencePopupEditor.java | ||
|---|---|---|
| 28 | 28 |
import com.vaadin.ui.NativeSelect; |
| 29 | 29 |
import com.vaadin.ui.TextField; |
| 30 | 30 |
|
| 31 |
import eu.etaxonomy.cdm.api.utility.RoleProber; |
|
| 31 |
import eu.etaxonomy.cdm.api.utility.RoleProberImpl;
|
|
| 32 | 32 |
import eu.etaxonomy.cdm.model.agent.Institution; |
| 33 | 33 |
import eu.etaxonomy.cdm.model.common.AnnotationType; |
| 34 | 34 |
import eu.etaxonomy.cdm.model.reference.Reference; |
| ... | ... | |
| 286 | 286 |
row++; |
| 287 | 287 |
annotationsListField = new FilterableAnnotationsField("Editorial notes");
|
| 288 | 288 |
annotationsListField.setWidth(100, Unit.PERCENTAGE); |
| 289 |
boolean isCurator = UserHelperAccess.userHelper().userIs(new RoleProber(RolesAndPermissions.ROLE_CURATION)); |
|
| 289 |
boolean isCurator = UserHelperAccess.userHelper().userIs(new RoleProberImpl(RolesAndPermissions.ROLE_CURATION));
|
|
| 290 | 290 |
boolean isAdmin = UserHelperAccess.userHelper().userIsAdmin(); |
| 291 | 291 |
if(isCurator || isAdmin){
|
| 292 | 292 |
annotationsListField.withNewButton(true); |
| ... | ... | |
| 438 | 438 |
|
| 439 | 439 |
@Override |
| 440 | 440 |
public void setAdvancedMode(boolean isAdvancedMode) {
|
| 441 |
boolean isCurator = UserHelperAccess.userHelper().userIs(new RoleProber(RolesAndPermissions.ROLE_CURATION)); |
|
| 441 |
boolean isCurator = UserHelperAccess.userHelper().userIs(new RoleProberImpl(RolesAndPermissions.ROLE_CURATION));
|
|
| 442 | 442 |
boolean isAdmin = UserHelperAccess.userHelper().userIsAdmin(); |
| 443 | 443 |
|
| 444 | 444 |
boolean canEditAllCaches = isAdmin || isCurator; |
| src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/ListViewBean.java | ||
|---|---|---|
| 39 | 39 |
|
| 40 | 40 |
import eu.etaxonomy.cdm.api.service.dto.RegistrationDTO; |
| 41 | 41 |
import eu.etaxonomy.cdm.api.service.pager.Pager; |
| 42 |
import eu.etaxonomy.cdm.api.utility.RoleProber; |
|
| 42 |
import eu.etaxonomy.cdm.api.utility.RoleProberImpl;
|
|
| 43 | 43 |
import eu.etaxonomy.cdm.model.name.Registration; |
| 44 | 44 |
import eu.etaxonomy.cdm.model.name.RegistrationStatus; |
| 45 | 45 |
import eu.etaxonomy.cdm.service.UserHelperAccess; |
| ... | ... | |
| 102 | 102 |
|
| 103 | 103 |
toolBar.addComponent(filterInstructionLabel); |
| 104 | 104 |
|
| 105 |
boolean userIsCurator = UserHelperAccess.userHelper().userIs(new RoleProber(RolesAndPermissions.ROLE_CURATION)); |
|
| 105 |
boolean userIsCurator = UserHelperAccess.userHelper().userIs(new RoleProberImpl(RolesAndPermissions.ROLE_CURATION));
|
|
| 106 | 106 |
boolean userIsAdmin = UserHelperAccess.userHelper().userIsAdmin(); |
| 107 | 107 |
if(userIsCurator || userIsAdmin){
|
| 108 | 108 |
submitterFilter = new NativeSelect("Submitter");
|
| ... | ... | |
| 193 | 193 |
public void populateList(Collection<RegistrationDTO> registrations) {
|
| 194 | 194 |
|
| 195 | 195 |
listContainer.removeAllComponents(); |
| 196 |
boolean isCurator = UserHelperAccess.userHelper().userIs(new RoleProber(RolesAndPermissions.ROLE_CURATION)) || UserHelperAccess.userHelper().userIsAdmin(); |
|
| 196 |
boolean isCurator = UserHelperAccess.userHelper().userIs(new RoleProberImpl(RolesAndPermissions.ROLE_CURATION)) || UserHelperAccess.userHelper().userIsAdmin();
|
|
| 197 | 197 |
for(RegistrationDTO regDto : registrations) {
|
| 198 | 198 |
RegistrationItem item = new RegistrationItem(regDto, this, null); |
| 199 | 199 |
item.getSubmitterLabel().setVisible(isCurator); |
| src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorksetViewBean.java | ||
|---|---|---|
| 49 | 49 |
import eu.etaxonomy.cdm.api.service.dto.RegistrationType; |
| 50 | 50 |
import eu.etaxonomy.cdm.api.service.dto.RegistrationWorkingSet; |
| 51 | 51 |
import eu.etaxonomy.cdm.api.service.name.TypeDesignationWorkingSet.TypeDesignationWorkingSetType; |
| 52 |
import eu.etaxonomy.cdm.api.utility.RoleProber; |
|
| 52 |
import eu.etaxonomy.cdm.api.utility.RoleProberImpl;
|
|
| 53 | 53 |
import eu.etaxonomy.cdm.model.name.Registration; |
| 54 | 54 |
import eu.etaxonomy.cdm.model.name.RegistrationStatus; |
| 55 | 55 |
import eu.etaxonomy.cdm.model.name.TaxonName; |
| ... | ... | |
| 469 | 469 |
CssLayout stateAndSubmitter = new CssLayout(statusComponent, submitterLabel); |
| 470 | 470 |
|
| 471 | 471 |
|
| 472 |
if(UserHelperAccess.userHelper().userIs(new RoleProber(RolesAndPermissions.ROLE_CURATION)) || UserHelperAccess.userHelper().userIsAdmin()) {
|
|
| 472 |
if(UserHelperAccess.userHelper().userIs(new RoleProberImpl(RolesAndPermissions.ROLE_CURATION)) || UserHelperAccess.userHelper().userIsAdmin()) {
|
|
| 473 | 473 |
|
| 474 | 474 |
Button editRegistrationButton = new Button(FontAwesome.COG); |
| 475 | 475 |
editRegistrationButton.setStyleName(ValoTheme.BUTTON_TINY); |
Also available in: Unified diff
rename RoleProbe(r) in vaadin