diff --git a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/UserInfoController.java b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/UserInfoController.java index e88f98caad20da6e00de39f0703a3ce8b1802bbb..3ae3d5c54d851f36ad0ba5a43bd802bf8fe3ea3a 100644 --- a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/UserInfoController.java +++ b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/UserInfoController.java @@ -217,6 +217,13 @@ public class UserInfoController extends CrudEntityController<UserInfo, UserInfoF return super.getAvailableItems(); } +// @Override +// public String prepareCreate() { +// current = createEntityInstance(); +// current.setIsLocalUser(true); +// return "create?faces-redirect=true"; +// } +// @Override public String prepareEdit(UserInfo user) { passwordEntry = null; diff --git a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/UserInfo.java b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/UserInfo.java index 67c9ad239e2774eba17a50842ac653df902b31ef..68d2e3dc730f751a4abe5d0e8e9041ac50e170ef 100644 --- a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/UserInfo.java +++ b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/UserInfo.java @@ -193,7 +193,7 @@ public class UserInfo extends CloneableEntity this.password = password; } - public boolean isIsLocalUser() { + public boolean isLocalUser() { return isLocalUser; } diff --git a/src/java/DmWebPortal/web/views/userInfo/private/userInfoEditPanelGrid.xhtml b/src/java/DmWebPortal/web/views/userInfo/private/userInfoEditPanelGrid.xhtml index 8c79b4526fa4ade1f083b2d7ed4e37681dc4ac95..5fa8e60f40bfee8d14b152819c58257e3e7391cb 100644 --- a/src/java/DmWebPortal/web/views/userInfo/private/userInfoEditPanelGrid.xhtml +++ b/src/java/DmWebPortal/web/views/userInfo/private/userInfoEditPanelGrid.xhtml @@ -33,8 +33,8 @@ <h:outputLabel for="email" value="Email" styleClass="entityDataLabel"/> <h:inputText id="email" value="#{userInfoObject.email}" title="Email" styleClass="entityDataInputText"/> - <h:outputLabel for="password" value="Password" styleClass="entityDataLabel" rendered="#{userInfoObject.isLocalUser}"/> - <p:password id="password" rendered="#{userInfoObject.isLocalUser}" value="#{userInfoController.passwordEntry}" title="Password" feedback="true" styleClass="entityDataInputText"/> + <h:outputLabel for="password" value="Password" styleClass="entityDataLabel" rendered="#{userInfoObject.isLocalUser()}"/> + <p:password id="password" rendered="#{userInfoObject.isLocalUser()}" value="#{userInfoController.passwordEntry}" title="Password" feedback="true" styleClass="entityDataInputText"/> <h:outputLabel for="globusUsername" value="Globus Username" styleClass="entityDataLabel"/> <h:inputText id="globusUsername" value="#{userInfoObject.globusUsername}" title="Globus Username" styleClass="entityDataInputText"/>