diff --git a/sbin/create_dm_db.sh b/sbin/create_dm_db.sh
index ffbba5e9cf92e8e9a0381509f6c2afbfab4f2ea6..b1e8b74c76c7d50f4ac38c54a4b1a2c1f5a22131 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 9e5f03beaddd08a8326ebfb52c8eb826f2310d09..74ff2d30d3d14b907afc0f29bc319973b413ac02 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 e8545915caca1bd67212bbd9103aeee903c32023..2489e355ceb1e08eebf6252f5f732a9fc0d8577a 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 8e444f69118c5355984a26986a970fd0837fc3b1..d398dee30a1f827968f135b9451920f58ad79ef3 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 1e6b0f00c70f13c74c98b06614524a35666e8bf8..a898dfea79231cce95dcb4794cea9a3605b70b25 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 1f965aa8ed4606f804bd8f622d18740ac8cc6bbd..27316911fd2a8ced6090c3a7886b9c35b4ed24f3 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 ddf7eb8c7b969c619fab08fc75be7b5d79e520f6..426e705bed05a68ab00aae481f94c50ce7866e6c 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 e7f81547d1f22b22fa7dace76b51f59d3ef54d2d..d0e66f9b68b635e380256534b105e73b73c684b2 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 06aa0dacfe227e041776b798df1cdb60306b6e79..5c1eb5932f87795155afb826bf67ad0bf71c29f6 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 24ec5340af08281e8d4780d445e3b3616b72713d..646c858c144587fd35bed32892078967140a6f60 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 0e3880e3bc06db5931f369087904a1064572793d..c981bb6141c1f42baa12aabd97753dad592461aa 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 a8561042d5266ba4250fd7cd3b8eeb3d8c554216..1a7b8ccc8cfd88abda3f6d2f68d14527293eaa7b 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 21d4a7290e85473dbc624e58be830ff9b7680d21..e894f0b43e6751789b651cd078ed1c095bd90c19 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 d7a00dc095aec0c2fb8097cf102d3abf05d2ea34..2ee3811fd2cae4d9448154a73a1b30dda157a3aa 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 e2f200765d21a1a2bed1c21044484704c6817658..fd698f121a3286fa0a8266339ffa33763ab44d8f 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 e1d669bf2eeb73ad46b0c933ec9fed2e48272613..80cf297c6a572e8a22f8de2c034533a44a541d7d 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 11ab5db38a4efb52ec83f5b2c52902479cd058d1..2ecc56bd4d1c0e2a61cbef51b6f4819e7f5bed40 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 1ab0e8e52c0e48ca1b19786b5bb601032cc9af55..539477865a9511a9aef2bbfd80ea549b8e43c554 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 d0badb8312175885b7068f646d0fbbea251005ae..21e3281319429bb82baacd43360bb56d9c41b3b4 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 d600e219dda09a7795d85ce4c09cf0826d8e91f0..21822848ea416a548141ce33b43b1687c07893ca 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 833bd48109880279cbacb1ace8d5d1340ff6a4d0..62cf4f84dc7ba11b756ebd3829a8cf3a58ff9c55 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 afc4fc5972f092aa9759819e49e1ffc78c538aa7..c60402e56309d56f5e5ed00f1038d420a2aed4a0 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 ffc6dabe7c4d54cdecb5d5dca54badd15ca8941e..a1b9077ec930f701a80727342cd677cc3fb66ae8 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 3b480c930a0220ebcfa39d7b3b00f5db62f7afba..2ee986b8a929f9ef9c6c50b9c6779d242d8339fa 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 46dda1700ed4c897eb6d1293b5b5772c26af5edf..b9e3a59a8fa09ba0b79d5576e7fd54543851487e 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 a3b761984562590add3e647ab2f16a68c3bd3905..1a537cf356f7b359a9bfe54c1880f4317baf9c75 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 53d57921453611028e2a0c3eea7ea9b1112d8734..7ea624e101b78820cd34d39c40dccc740fc223e4 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}?"