From 498297ae1121d1b2f875ae1c82a4a145857bbd57 Mon Sep 17 00:00:00 2001
From: "Barbara B. Frosik" <bfrosik@aps.anl.gov>
Date: Tue, 7 Jul 2015 15:43:54 +0000
Subject: [PATCH] changed default of is_local_user to true in user_info table
and related files
---
.../dm/portal/controllers/UserInfoController.java | 7 -------
.../anl/aps/dm/portal/model/entities/UserInfo.java | 12 ++++++------
.../userInfo/private/userInfoEditPanelGrid.xhtml | 4 ++--
3 files changed, 8 insertions(+), 15 deletions(-)
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 5c478127..e88f98ca 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 bbad17b1..67c9ad23 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 63b750ae..8c79b452 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"/>
--
GitLab