From 48624b8770a02a0b76ebe54ddeeb28144f351f74 Mon Sep 17 00:00:00 2001
From: "Barbara B. Frosik" <bfrosik@aps.anl.gov>
Date: Tue, 7 Jul 2015 18:34:24 +0000
Subject: [PATCH] minor changes to rename method
---
.../anl/aps/dm/portal/controllers/UserInfoController.java | 7 +++++++
.../gov/anl/aps/dm/portal/model/entities/UserInfo.java | 2 +-
.../web/views/userInfo/private/userInfoEditPanelGrid.xhtml | 4 ++--
3 files changed, 10 insertions(+), 3 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 e88f98ca..3ae3d5c5 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 67c9ad23..68d2e3dc 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 8c79b452..5fa8e60f 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"/>
--
GitLab