From 5e92e161b29f5c4f85c09e85acd7796e52ad12f1 Mon Sep 17 00:00:00 2001 From: j2blake Date: Thu, 2 Jun 2011 20:08:38 +0000 Subject: [PATCH] NIHVIVO-2279 transitioning toward UserAccount --- .../controller/edit/UserRetryController.java | 25 ++++++------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/UserRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/UserRetryController.java index 221270593..a64ff5996 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/UserRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/UserRetryController.java @@ -119,30 +119,21 @@ public class UserRetryController extends BaseEditController { /* bdc34: Datastar needs non-backend-editing users for logging in non-Cornell people*/ /* SelfEditingPolicySetup.SELF_EDITING_POLICY_WAS_SETUP is set by the SelfEditingPolicySetup context listener */ - boolean selfEditing = (Boolean)getServletContext().getAttribute(SelfEditingPolicySetup.SELF_EDITING_POLICY_WAS_SETUP) == Boolean.TRUE; - Option nonEditor = new Option(ROLE_PROTOCOL+LoginStatusBean.NON_EDITOR, "self editor"); + Option nonEditor = new Option(ROLE_PROTOCOL+1, "self editor"); /* self editing should be displayed if we are editing a user account that is already * self-editing even if self editing is off. */ - if( selfEditing || - ( !"insert".equals(action) && userForEditing.getRoleURI().equals(nonEditor.getValue()) )){ - nonEditor.setSelected(userForEditing.getRoleURI().equals(nonEditor.getValue())); - if (nonEditor.getSelected() || loginBean.isLoggedInAtLeast(LoginStatusBean.NON_EDITOR)) - roleOptionList.add(nonEditor); - } + roleOptionList.add(nonEditor); - Option editor = new Option(ROLE_PROTOCOL+LoginStatusBean.EDITOR, "editor"); + Option editor = new Option(ROLE_PROTOCOL+4, "editor"); editor.setSelected(userForEditing.getRoleURI().equals(editor.getValue())); - Option curator = new Option(ROLE_PROTOCOL+LoginStatusBean.CURATOR, "curator"); + Option curator = new Option(ROLE_PROTOCOL+5, "curator"); curator.setSelected(userForEditing.getRoleURI().equals(curator.getValue())); - Option administrator = new Option (ROLE_PROTOCOL+LoginStatusBean.DBA, "system administrator"); + Option administrator = new Option (ROLE_PROTOCOL+50, "system administrator"); administrator.setSelected(userForEditing.getRoleURI().equals(administrator.getValue())); - if (editor.getSelected() || loginBean.isLoggedInAtLeast(LoginStatusBean.EDITOR)) - roleOptionList.add(editor); - if (curator.getSelected() || loginBean.isLoggedInAtLeast(LoginStatusBean.CURATOR)) - roleOptionList.add(curator); - if (administrator.getSelected() || loginBean.isLoggedInAtLeast(LoginStatusBean.DBA)) - roleOptionList.add(administrator); + roleOptionList.add(editor); + roleOptionList.add(curator); + roleOptionList.add(administrator); optionMap.put("Role", roleOptionList);