From 49af37aaf9473fa96cd5f8bdfe6f9c08dc83ce58 Mon Sep 17 00:00:00 2001
From: "Barbara B. Frosik" <bfrosik@aps.anl.gov>
Date: Mon, 15 Dec 2014 17:17:42 +0000
Subject: [PATCH] modified database, scripts, and web pages
---
sbin/create_dm_db.sh | 2 +-
.../aps/dm/portal/controllers/ExperimentController.java | 3 ++-
.../dm/portal/controllers/ExperimentTypeController.java | 4 ++--
.../aps/dm/portal/controllers/RoleTypeController.java | 3 ++-
.../aps/dm/portal/controllers/UserInfoController.java | 3 ++-
.../dm/portal/controllers/UserSystemRoleController.java | 7 ++-----
.../gov/anl/aps/dm/portal/model/entities/UserInfo.java | 2 +-
.../web/views/common/commonListActionButtons.xhtml | 5 ++---
.../web/views/experiment/experimentCreatePanelGrid.xhtml | 5 ++---
.../web/views/experiment/experimentEditPanelGrid.xhtml | 5 ++---
.../web/views/experiment/experimentListDataTable.xhtml | 3 +--
.../web/views/experiment/experimentViewPanelGrid.xhtml | 3 +--
src/java/DmWebPortal/web/views/experiment/list.xhtml | 2 +-
.../experimentType/experimentTypeEditPanelGrid.xhtml | 6 ++----
.../experimentType/experimentTypeListDataTable.xhtml | 3 +--
.../experimentType/experimentTypeViewPanelGrid.xhtml | 5 ++---
src/java/DmWebPortal/web/views/experimentType/list.xhtml | 2 +-
src/java/DmWebPortal/web/views/experimentType/view.xhtml | 9 ++++-----
src/java/DmWebPortal/web/views/roleType/list.xhtml | 2 +-
src/java/DmWebPortal/web/views/userInfo/edit.xhtml | 6 ------
src/java/DmWebPortal/web/views/userInfo/list.xhtml | 2 +-
.../web/views/userInfo/userInfoCreatePanelGrid.xhtml | 7 +++----
.../web/views/userInfo/userInfoEditPanelGrid.xhtml | 7 +++----
.../web/views/userInfo/userInfoListDataTable.xhtml | 3 +--
.../web/views/userInfo/userInfoViewPanelGrid.xhtml | 5 ++---
src/java/DmWebPortal/web/views/userInfo/view.xhtml | 9 ++++-----
.../views/userSystemRole/systemRoleRemoveDialog.xhtml | 3 +--
27 files changed, 47 insertions(+), 69 deletions(-)
diff --git a/sbin/create_dm_db.sh b/sbin/create_dm_db.sh
index ffbba5e9..b1e8b74c 100755
--- a/sbin/create_dm_db.sh
+++ b/sbin/create_dm_db.sh
@@ -179,7 +179,7 @@ DM_DB_TABLES="\
experiment_type \
user_info \
role_type \
- user_role \
+ user_system_role \
"
for dbTable in $DM_DB_TABLES; do
dbFile=populate_$dbTable.sql
diff --git a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/ExperimentController.java b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/ExperimentController.java
index 9e5f03be..74ff2d30 100644
--- a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/ExperimentController.java
+++ b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/ExperimentController.java
@@ -82,8 +82,9 @@ public class ExperimentController extends CrudEntityController<Experiment, Exper
@Override
protected String getObjectAlreadyExistMessage(Experiment experiment) {
- if (experiment == null)
+ if (experiment == null) {
return null;
+ }
return "Experiment " + experiment.getName() + " already exists.";
}
diff --git a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/ExperimentTypeController.java b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/ExperimentTypeController.java
index e8545915..2489e355 100644
--- a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/ExperimentTypeController.java
+++ b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/ExperimentTypeController.java
@@ -76,8 +76,9 @@ public class ExperimentTypeController extends CrudEntityController<ExperimentTyp
@Override
protected String getObjectAlreadyExistMessage(ExperimentType experimentType) {
- if (experimentType == null)
+ if (experimentType == null) {
return null;
+ }
return "Experiment Type " + experimentType.getName() + " already exists.";
}
@@ -120,7 +121,6 @@ public class ExperimentTypeController extends CrudEntityController<ExperimentTyp
throw new IllegalArgumentException("object " + object + " is of type " + object.getClass().getName() + "; expected type: " + ExperimentType.class.getName());
}
}
-
}
}
\ No newline at end of file
diff --git a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/RoleTypeController.java b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/RoleTypeController.java
index 8e444f69..d398dee3 100644
--- a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/RoleTypeController.java
+++ b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/RoleTypeController.java
@@ -80,8 +80,9 @@ public class RoleTypeController extends CrudEntityController<RoleType, RoleTypeF
@Override
protected String getObjectAlreadyExistMessage(RoleType roleType) {
- if (roleType == null)
+ if (roleType == null) {
return null;
+ }
return "Role Type " + roleType.getName() + " already exists.";
}
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 1e6b0f00..a898dfea 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
@@ -84,8 +84,9 @@ public class UserInfoController extends CrudEntityController<UserInfo, UserInfoF
@Override
protected String getObjectAlreadyExistMessage(UserInfo user) {
- if (user == null)
+ if (user == null) {
return null;
+ }
return "User " + user.getUsername() + " already exists.";
}
diff --git a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/UserSystemRoleController.java b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/UserSystemRoleController.java
index 1f965aa8..27316911 100644
--- a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/UserSystemRoleController.java
+++ b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/UserSystemRoleController.java
@@ -75,8 +75,7 @@ public class UserSystemRoleController implements Serializable
private String systemRoleId;
- private static final Logger logger = Logger.getLogger(UserSystemRoleController.class.getName());
-
+ private static final Logger logger = Logger.getLogger(UserSystemRoleController.class.getName());
public SystemRoleTypeTable getSystemRoleTable() {
return systemRoleTable;
@@ -116,7 +115,6 @@ public class UserSystemRoleController implements Serializable
public void resetNoSystemRoleUserList() {
logger.debug("Resetting System Role Add User list");
noSystemRoleTable.resetList();
-// return "/views/userSystemRole/list?faces-redirect=true";
}
public boolean hasSystemRole(String user) {
@@ -189,8 +187,7 @@ public class UserSystemRoleController implements Serializable
catch (RuntimeException ex) {
SessionUtility.addErrorMessage("Error", "Could not update RoleType" + ": " + ex.getMessage());
return 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 ddf7eb8c..426e705b 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
@@ -53,7 +53,7 @@ public class UserInfo extends CloneableEntity
private Integer id;
@Basic(optional = false)
@NotNull
- @Size(min = 1, max = 2147483647)
+ @Size(max = 64)
@Column(name = "username")
private String username;
@Basic(optional = false)
diff --git a/src/java/DmWebPortal/web/views/common/commonListActionButtons.xhtml b/src/java/DmWebPortal/web/views/common/commonListActionButtons.xhtml
index e7f81547..d0e66f9b 100644
--- a/src/java/DmWebPortal/web/views/common/commonListActionButtons.xhtml
+++ b/src/java/DmWebPortal/web/views/common/commonListActionButtons.xhtml
@@ -7,11 +7,10 @@
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
- <c:set var="entityTypeName" value="#{entityController.entityTypeName}"/>
- <c:set var="displayAddButton" value="#{loginController.loggedIn}"/>
+ <ui:param name="entityTypeName" value="#{entityController.entityTypeName}"/>
<div class="actionButton">
- <p:commandButton id="#{entityTypeName}AddButton" action="#{entityController.prepareCreate()}" rendered="#{displayAddButton}" value="Add" alt="Add new #{entityTypeName}" icon="ui-icon-plus">
+ <p:commandButton id="#{entityTypeName}AddButton" action="#{entityController.prepareCreate()}" rendered="#{loginController.loggedIn}" value="Add" alt="Add new #{entityTypeName}" icon="ui-icon-plus">
<p:tooltip for="#{entityTypeName}AddButton" value="Create new #{entityController.displayEntityTypeName}."/>
</p:commandButton>
diff --git a/src/java/DmWebPortal/web/views/experiment/experimentCreatePanelGrid.xhtml b/src/java/DmWebPortal/web/views/experiment/experimentCreatePanelGrid.xhtml
index 06aa0dac..5c1eb593 100644
--- a/src/java/DmWebPortal/web/views/experiment/experimentCreatePanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/experiment/experimentCreatePanelGrid.xhtml
@@ -4,10 +4,9 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:p="http://primefaces.org/ui"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
- <c:set var="experimentObject" value="#{experimentController.selected}"/>
+ <ui:param name="experimentObject" value="#{experimentController.selected}"/>
<p:panelGrid columns="2" styleClass="createEntityDetails">
diff --git a/src/java/DmWebPortal/web/views/experiment/experimentEditPanelGrid.xhtml b/src/java/DmWebPortal/web/views/experiment/experimentEditPanelGrid.xhtml
index 24ec5340..646c858c 100644
--- a/src/java/DmWebPortal/web/views/experiment/experimentEditPanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/experiment/experimentEditPanelGrid.xhtml
@@ -4,11 +4,10 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:p="http://primefaces.org/ui"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
xmlns:f="http://xmlns.jcp.org/jsf/core">
- <c:set var="experimentObject" value="#{experimentController.selected}"/>
- <c:set var="isFieldWriteable" value="#{loginController.loggedIn}"/>
+ <ui:param name="experimentObject" value="#{experimentController.selected}"/>
+ <ui:param name="isFieldWriteable" value="#{loginController.loggedIn}"/>
<p:panelGrid columns="2" styleClass="editEntityDetails">
diff --git a/src/java/DmWebPortal/web/views/experiment/experimentListDataTable.xhtml b/src/java/DmWebPortal/web/views/experiment/experimentListDataTable.xhtml
index 0e3880e3..c981bb61 100644
--- a/src/java/DmWebPortal/web/views/experiment/experimentListDataTable.xhtml
+++ b/src/java/DmWebPortal/web/views/experiment/experimentListDataTable.xhtml
@@ -53,13 +53,12 @@
</h:outputText>
</p:column>
- <c:set var="isEntityWriteable" value="#{loginController.loggedIn}"/>
<p:column headerText="Actions" width="70">
<div class="actionLink">
<p:commandLink action="#{experimentController.prepareView(experimentObject)}" styleClass="ui-icon ui-icon-info" title="View">
<f:setPropertyActionListener value="#{experimentObject}" target="#{experimentUsersController.experiment}"/>
</p:commandLink>
- <p:commandLink action="#{experimentController.prepareEdit(experimentObject)}" rendered="#{isEntityWriteable}" styleClass="ui-icon ui-icon-pencil" title="Edit"/>
+ <p:commandLink action="#{experimentController.prepareEdit(experimentObject)}" rendered="#{loginController.loggedIn}" styleClass="ui-icon ui-icon-pencil" title="Edit"/>
<p:commandLink oncomplete="PF('experimentDestroyDialogWidget').show()" rendered="#{loginController.loggedIn}" styleClass="ui-icon ui-icon-trash" title="Delete" update="@form">
<f:setPropertyActionListener value="#{experimentObject}" target="#{experimentController.current}"/>
</p:commandLink>
diff --git a/src/java/DmWebPortal/web/views/experiment/experimentViewPanelGrid.xhtml b/src/java/DmWebPortal/web/views/experiment/experimentViewPanelGrid.xhtml
index a8561042..1a7b8ccc 100644
--- a/src/java/DmWebPortal/web/views/experiment/experimentViewPanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/experiment/experimentViewPanelGrid.xhtml
@@ -4,10 +4,9 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:p="http://primefaces.org/ui"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
xmlns:f="http://xmlns.jcp.org/jsf/core">
- <c:set var="experimentObject" value="#{experimentController.selected}"/>
+ <ui:param name="experimentObject" value="#{experimentController.selected}"/>
<p:panelGrid columns="2" styleClass="viewEntityDetails">
diff --git a/src/java/DmWebPortal/web/views/experiment/list.xhtml b/src/java/DmWebPortal/web/views/experiment/list.xhtml
index 21d4a729..e894f0b4 100644
--- a/src/java/DmWebPortal/web/views/experiment/list.xhtml
+++ b/src/java/DmWebPortal/web/views/experiment/list.xhtml
@@ -14,7 +14,7 @@
</div>
<h:form id="viewExperimentListForm">
- <c:set var="entityController" value="#{experimentController}"/>
+ <ui:param name="entityController" value="#{experimentController}"/>
<ui:include src="../common/commonListActionButtons.xhtml"/>
<h:panelGroup>
diff --git a/src/java/DmWebPortal/web/views/experimentType/experimentTypeEditPanelGrid.xhtml b/src/java/DmWebPortal/web/views/experimentType/experimentTypeEditPanelGrid.xhtml
index d7a00dc0..2ee3811f 100644
--- a/src/java/DmWebPortal/web/views/experimentType/experimentTypeEditPanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/experimentType/experimentTypeEditPanelGrid.xhtml
@@ -3,11 +3,9 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:p="http://primefaces.org/ui"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
- <c:set var="experimentTypeObject" value="#{experimentTypeController.selected}"/>
- <c:set var="isFieldWriteable" value="#{loginController.loggedIn}"/>
+ <ui:param name="experimentTypeObject" value="#{experimentTypeController.selected}"/>
<p:panelGrid columns="2" styleClass="editEntityDetails">
diff --git a/src/java/DmWebPortal/web/views/experimentType/experimentTypeListDataTable.xhtml b/src/java/DmWebPortal/web/views/experimentType/experimentTypeListDataTable.xhtml
index e2f20076..fd698f12 100644
--- a/src/java/DmWebPortal/web/views/experimentType/experimentTypeListDataTable.xhtml
+++ b/src/java/DmWebPortal/web/views/experimentType/experimentTypeListDataTable.xhtml
@@ -37,11 +37,10 @@
<h:outputText value="#{experimentTypeObject.rootDataPath}"/>
</p:column>
- <c:set var="isEntityWriteable" value="#{loginController.loggedIn}"/>
<p:column headerText="Actions" width="50">
<div class="actionLink">
<p:commandLink action="#{experimentTypeController.prepareView(experimentTypeObject)}" styleClass="ui-icon ui-icon-info" title="View"/>
- <p:commandLink action="#{experimentTypeController.prepareEdit(experimentTypeObject)}" rendered="#{isEntityWriteable}" styleClass="ui-icon ui-icon-pencil" title="Edit"/>
+ <p:commandLink action="#{experimentTypeController.prepareEdit(experimentTypeObject)}" rendered="#{loginController.loggedIn}" styleClass="ui-icon ui-icon-pencil" title="Edit"/>
<p:commandLink oncomplete="PF('experimentTypeDestroyDialogWidget').show()" rendered="#{loginController.loggedIn}" styleClass="ui-icon ui-icon-trash" title="Delete" update="@form">
<f:setPropertyActionListener value="#{experimentTypeObject}" target="#{experimentTypeController.current}"/>
</p:commandLink>
diff --git a/src/java/DmWebPortal/web/views/experimentType/experimentTypeViewPanelGrid.xhtml b/src/java/DmWebPortal/web/views/experimentType/experimentTypeViewPanelGrid.xhtml
index e1d669bf..80cf297c 100644
--- a/src/java/DmWebPortal/web/views/experimentType/experimentTypeViewPanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/experimentType/experimentTypeViewPanelGrid.xhtml
@@ -3,10 +3,9 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:p="http://primefaces.org/ui"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
- <c:set var="experimentTypeObject" value="#{experimentTypeController.selected}"/>
+ <ui:param name="experimentTypeObject" value="#{experimentTypeController.selected}"/>
<p:panelGrid columns="2" styleClass="viewEntityDetails">
diff --git a/src/java/DmWebPortal/web/views/experimentType/list.xhtml b/src/java/DmWebPortal/web/views/experimentType/list.xhtml
index 11ab5db3..2ecc56bd 100644
--- a/src/java/DmWebPortal/web/views/experimentType/list.xhtml
+++ b/src/java/DmWebPortal/web/views/experimentType/list.xhtml
@@ -14,7 +14,7 @@
</div>
<h:form id="viewExperimentTypeListForm">
- <c:set var="entityController" value="#{experimentTypeController}"/>
+ <ui:param name="entityController" value="#{experimentTypeController}"/>
<ui:include src="../common/commonListActionButtons.xhtml"/>
<h:panelGroup>
diff --git a/src/java/DmWebPortal/web/views/experimentType/view.xhtml b/src/java/DmWebPortal/web/views/experimentType/view.xhtml
index 1ab0e8e5..53947786 100644
--- a/src/java/DmWebPortal/web/views/experimentType/view.xhtml
+++ b/src/java/DmWebPortal/web/views/experimentType/view.xhtml
@@ -17,12 +17,11 @@
</div>
<ui:include src="experimentTypeViewPanelGrid.xhtml"/>
-
+
<p/>
- <c:set var="experimentTypeObject" value="#{experimentTypeController.selected}"/>
- <c:set var="isEntityWriteable" value="#{loginController.loggedIn}"/>
+ <ui:param name="experimentTypeObject" value="#{experimentTypeController.selected}"/>
<div class="actionButton">
- <p:commandButton action="#{experimentTypeController.prepareEdit(experimentTypeObject)}" rendered="#{isEntityWriteable}" value="Edit" alt="Edit" icon="ui-icon-pencil"/>
+ <p:commandButton action="#{experimentTypeController.prepareEdit(experimentTypeObject)}" rendered="#{loginController.loggedIn}" value="Edit" alt="Edit" icon="ui-icon-pencil"/>
<p:commandButton onclick="PF('experimentTypeDestroyDialogWidget').show();" rendered="#{loginController.loggedIn}" value="Delete" alt="Delete" icon="ui-icon-trash">
<f:setPropertyActionListener value="#{experimentTypeObject}" target="#{experimentTypeController.current}"/>
</p:commandButton>
@@ -30,7 +29,7 @@
</div>
<ui:include src="experimentTypeDestroyDialog.xhtml"/>
-
+
</div>
</h:form>
diff --git a/src/java/DmWebPortal/web/views/roleType/list.xhtml b/src/java/DmWebPortal/web/views/roleType/list.xhtml
index d0badb83..21e32813 100644
--- a/src/java/DmWebPortal/web/views/roleType/list.xhtml
+++ b/src/java/DmWebPortal/web/views/roleType/list.xhtml
@@ -14,7 +14,7 @@
</div>
<h:form id="viewRoleTypeListForm">
- <c:set var="entityController" value="#{roleTypeController}"/>
+ <ui:param name="entityController" value="#{roleTypeController}"/>
<ui:include src="../common/commonListActionButtons.xhtml"/>
<h:panelGroup>
diff --git a/src/java/DmWebPortal/web/views/userInfo/edit.xhtml b/src/java/DmWebPortal/web/views/userInfo/edit.xhtml
index d600e219..21822848 100644
--- a/src/java/DmWebPortal/web/views/userInfo/edit.xhtml
+++ b/src/java/DmWebPortal/web/views/userInfo/edit.xhtml
@@ -24,13 +24,7 @@
</div>
</div>
<div class="middleCenterRightContent">
-<!-- <p:accordionPanel multiple="true">
- <p:tab title="Settings">
- <ui:include src="../userSetting/edit.xhtml"/>
-
- </p:tab>
- </p:accordionPanel>-->
</div>
</h:form>
diff --git a/src/java/DmWebPortal/web/views/userInfo/list.xhtml b/src/java/DmWebPortal/web/views/userInfo/list.xhtml
index 833bd481..62cf4f84 100644
--- a/src/java/DmWebPortal/web/views/userInfo/list.xhtml
+++ b/src/java/DmWebPortal/web/views/userInfo/list.xhtml
@@ -14,7 +14,7 @@
</div>
<h:form id="viewUserInfoListForm">
- <c:set var="entityController" value="#{userInfoController}"/>
+ <ui:param name="entityController" value="#{userInfoController}"/>
<ui:include src="../common/commonListActionButtons.xhtml"/>
<h:panelGroup>
diff --git a/src/java/DmWebPortal/web/views/userInfo/userInfoCreatePanelGrid.xhtml b/src/java/DmWebPortal/web/views/userInfo/userInfoCreatePanelGrid.xhtml
index afc4fc59..c60402e5 100644
--- a/src/java/DmWebPortal/web/views/userInfo/userInfoCreatePanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/userInfo/userInfoCreatePanelGrid.xhtml
@@ -3,15 +3,14 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:p="http://primefaces.org/ui"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
- <c:set var="userInfoObject" value="#{userInfoController.selected}"/>
+ <ui:param name="userInfoObject" value="#{userInfoController.selected}"/>
<p:panelGrid columns="2" styleClass="createEntityDetails">
<h:outputLabel for="username" value="Username" styleClass="entityDataEmphasizedLabel"/>
- <h:inputText id="username" value="#{userInfoObject.username}" title="Username" required="true" styleClass="entityDataEmphasizedText"/>
+ <h:inputText id="username" value="#{userInfoObject.username}" title="Username" styleClass="entityDataEmphasizedText"/>
<h:outputLabel for="lastName" value="Last Name" styleClass="entityDataLabel"/>
<h:inputText id="lastName" value="#{userInfoObject.lastName}" title="Last Name" required="true" styleClass="entityDataText"/>
diff --git a/src/java/DmWebPortal/web/views/userInfo/userInfoEditPanelGrid.xhtml b/src/java/DmWebPortal/web/views/userInfo/userInfoEditPanelGrid.xhtml
index ffc6dabe..a1b9077e 100644
--- a/src/java/DmWebPortal/web/views/userInfo/userInfoEditPanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/userInfo/userInfoEditPanelGrid.xhtml
@@ -3,11 +3,10 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:p="http://primefaces.org/ui"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
- <c:set var="userInfoObject" value="#{userInfoController.selected}"/>
- <c:set var="isFieldWriteable" value="#{loginController.loggedIn}"/>
+ <ui:param name="userInfoObject" value="#{userInfoController.selected}"/>
+ <ui:param name="isFieldWriteable" value="#{loginController.loggedIn}"/>
<p:panelGrid columns="2" styleClass="editEntityDetails">
diff --git a/src/java/DmWebPortal/web/views/userInfo/userInfoListDataTable.xhtml b/src/java/DmWebPortal/web/views/userInfo/userInfoListDataTable.xhtml
index 3b480c93..2ee986b8 100644
--- a/src/java/DmWebPortal/web/views/userInfo/userInfoListDataTable.xhtml
+++ b/src/java/DmWebPortal/web/views/userInfo/userInfoListDataTable.xhtml
@@ -52,11 +52,10 @@
<h:outputText value="#{userInfoObject.description}"/>
</p:column>
- <c:set var="isEntityWriteable" value="#{loginController.isUserWriteable(userInfoObject)}"/>
<p:column headerText="Actions" width="70">
<div class="actionLink">
<p:commandLink action="#{userInfoController.prepareView(userInfoObject)}" styleClass="ui-icon ui-icon-info" title="View"/>
- <p:commandLink action="#{userInfoController.prepareEdit(userInfoObject)}" rendered="#{isEntityWriteable}" styleClass="ui-icon ui-icon-pencil" title="Edit"/>
+ <p:commandLink action="#{userInfoController.prepareEdit(userInfoObject)}" rendered="#{loginController.isUserWriteable(userInfoObject)}" styleClass="ui-icon ui-icon-pencil" title="Edit"/>
<p:commandLink oncomplete="PF('userInfoDestroyDialogWidget').show()" rendered="#{loginController.loggedIn}" styleClass="ui-icon ui-icon-trash" title="Delete" update="@form">
<f:setPropertyActionListener value="#{userInfoObject}" target="#{userInfoController.current}"/>
</p:commandLink>
diff --git a/src/java/DmWebPortal/web/views/userInfo/userInfoViewPanelGrid.xhtml b/src/java/DmWebPortal/web/views/userInfo/userInfoViewPanelGrid.xhtml
index 46dda170..b9e3a59a 100644
--- a/src/java/DmWebPortal/web/views/userInfo/userInfoViewPanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/userInfo/userInfoViewPanelGrid.xhtml
@@ -3,10 +3,9 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:p="http://primefaces.org/ui"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
- <c:set var="userInfoObject" value="#{userInfoController.selected}"/>
+ <ui:param name="userInfoObject" value="#{userInfoController.selected}"/>
<p:panelGrid columns="2" styleClass="viewEntityDetails">
diff --git a/src/java/DmWebPortal/web/views/userInfo/view.xhtml b/src/java/DmWebPortal/web/views/userInfo/view.xhtml
index a3b76198..1a537cf3 100644
--- a/src/java/DmWebPortal/web/views/userInfo/view.xhtml
+++ b/src/java/DmWebPortal/web/views/userInfo/view.xhtml
@@ -17,12 +17,11 @@
</div>
<ui:include src="userInfoViewPanelGrid.xhtml"/>
-
+
<p/>
- <c:set var="userInfoObject" value="#{userInfoController.selected}"/>
- <c:set var="isEntityWriteable" value="#{loginController.isUserWriteable(userInfoObject)}"/>
+ <ui:param name="userInfoObject" value="#{userInfoController.selected}"/>
<div class="actionButton">
- <p:commandButton action="#{userInfoController.prepareEdit(userInfoObject)}" rendered="#{isEntityWriteable}" value="Edit" alt="Edit" icon="ui-icon-pencil"/>
+ <p:commandButton action="#{userInfoController.prepareEdit(userInfoObject)}" rendered="#{loginController.isUserWriteable(userInfoObject)}" value="Edit" alt="Edit" icon="ui-icon-pencil"/>
<p:commandButton onclick="PF('userInfoDestroyDialogWidget').show();" rendered="#{loginController.loggedIn}" value="Delete" alt="Delete" icon="ui-icon-trash">
<f:setPropertyActionListener value="#{userInfoObject}" target="#{userInfoController.current}"/>
</p:commandButton>
@@ -30,7 +29,7 @@
</div>
<ui:include src="userInfoDestroyDialog.xhtml"/>
-
+
</div>
</h:form>
diff --git a/src/java/DmWebPortal/web/views/userSystemRole/systemRoleRemoveDialog.xhtml b/src/java/DmWebPortal/web/views/userSystemRole/systemRoleRemoveDialog.xhtml
index 53d57921..7ea624e1 100644
--- a/src/java/DmWebPortal/web/views/userSystemRole/systemRoleRemoveDialog.xhtml
+++ b/src/java/DmWebPortal/web/views/userSystemRole/systemRoleRemoveDialog.xhtml
@@ -2,8 +2,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:p="http://primefaces.org/ui"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
<p:confirmDialog id="systemRoleRemoveDialog" message="Remove #{userSystemRoleController.getSystemRoleName()} Role for user #{userSystemRoleController.systemRoleTable.current.username}?"
--
GitLab