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 5c478127599bb8fdbb0c662aba8a9237fddc6531..e88f98caad20da6e00de39f0703a3ce8b1802bbb 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,13 +217,6 @@ public class UserInfoController extends CrudEntityController<UserInfo, UserInfoF return super.getAvailableItems(); } - @Override - public String prepareCreate() { - current = createEntityInstance(); - current.setIsDmUser(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 bbad17b106e6d8cfbf717926390ebbdf1fd70338..67c9ad239e2774eba17a50842ac653df902b31ef 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 @@ -90,8 +90,8 @@ public class UserInfo extends CloneableEntity @Column(name = "password") private String password; @NotNull - @Column(name = "is_dm_user") - private boolean isDmUser; + @Column(name = "is_local_user") + private boolean isLocalUser; @ManyToMany(mappedBy = "userInfoList") private List<RoleType> roleTypeList; @OneToMany(cascade = CascadeType.ALL, mappedBy = "userInfo") @@ -193,12 +193,12 @@ public class UserInfo extends CloneableEntity this.password = password; } - public boolean isIsDmUser() { - return isDmUser; + public boolean isIsLocalUser() { + return isLocalUser; } - public void setIsDmUser(boolean isDmUser) { - this.isDmUser = isDmUser; + public void setIsLocalUser(boolean isLocalUser) { + this.isLocalUser = isLocalUser; } @XmlTransient diff --git a/src/java/DmWebPortal/web/views/userInfo/private/userInfoEditPanelGrid.xhtml b/src/java/DmWebPortal/web/views/userInfo/private/userInfoEditPanelGrid.xhtml index 63b750aec8c8a9ac17b2613d22f8b554356d3f47..8c79b4526fa4ade1f083b2d7ed4e37681dc4ac95 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.isDmUser}"/> - <p:password id="password" rendered="#{userInfoObject.isDmUser}" 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"/>