From 3d1aa0c10141f800e2e3f7a96641ea9eb541e359 Mon Sep 17 00:00:00 2001
From: "Barbara B. Frosik" <bfrosik@aps.anl.gov>
Date: Thu, 12 Feb 2015 19:24:12 +0000
Subject: [PATCH] added policies
---
sbin/create_dm_db.sh | 2 ++
.../web/views/roleType/roleTypeCreatePanelGrid.xhtml | 5 ++---
.../web/views/roleType/roleTypeEditPanelGrid.xhtml | 3 +--
.../web/views/roleType/roleTypeViewPanelGrid.xhtml | 5 ++---
src/java/DmWebPortal/web/views/roleType/view.xhtml | 1 -
5 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/sbin/create_dm_db.sh b/sbin/create_dm_db.sh
index b1e8b74c..355d13a1 100755
--- a/sbin/create_dm_db.sh
+++ b/sbin/create_dm_db.sh
@@ -180,6 +180,8 @@ DM_DB_TABLES="\
user_info \
role_type \
user_system_role \
+ policy_type \
+ allowed_policy_type
"
for dbTable in $DM_DB_TABLES; do
dbFile=populate_$dbTable.sql
diff --git a/src/java/DmWebPortal/web/views/roleType/roleTypeCreatePanelGrid.xhtml b/src/java/DmWebPortal/web/views/roleType/roleTypeCreatePanelGrid.xhtml
index 2658debc..d7a33d08 100644
--- a/src/java/DmWebPortal/web/views/roleType/roleTypeCreatePanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/roleType/roleTypeCreatePanelGrid.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="roleTypeObject" value="#{roleTypeController.selected}"/>
+ <ui:param name="roleTypeObject" value="#{roleTypeController.selected}"/>
<p:panelGrid columns="2" styleClass="createEntityDetails">
diff --git a/src/java/DmWebPortal/web/views/roleType/roleTypeEditPanelGrid.xhtml b/src/java/DmWebPortal/web/views/roleType/roleTypeEditPanelGrid.xhtml
index 9bf39192..805a2b51 100644
--- a/src/java/DmWebPortal/web/views/roleType/roleTypeEditPanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/roleType/roleTypeEditPanelGrid.xhtml
@@ -6,8 +6,7 @@
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
- <c:set var="roleTypeObject" value="#{roleTypeController.selected}"/>
- <c:set var="isFieldWriteable" value="#{loginController.loggedIn}"/>
+ <ui:param name="roleTypeObject" value="#{roleTypeController.selected}"/>
<p:panelGrid columns="2" styleClass="editEntityDetails">
diff --git a/src/java/DmWebPortal/web/views/roleType/roleTypeViewPanelGrid.xhtml b/src/java/DmWebPortal/web/views/roleType/roleTypeViewPanelGrid.xhtml
index 9ded45b9..2e4932aa 100644
--- a/src/java/DmWebPortal/web/views/roleType/roleTypeViewPanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/roleType/roleTypeViewPanelGrid.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="roleTypeObject" value="#{roleTypeController.selected}"/>
+ <ui:param name="roleTypeObject" value="#{roleTypeController.selected}"/>
<p:panelGrid columns="2" styleClass="viewEntityDetails">
diff --git a/src/java/DmWebPortal/web/views/roleType/view.xhtml b/src/java/DmWebPortal/web/views/roleType/view.xhtml
index 3e9942d7..2c359f41 100644
--- a/src/java/DmWebPortal/web/views/roleType/view.xhtml
+++ b/src/java/DmWebPortal/web/views/roleType/view.xhtml
@@ -21,7 +21,6 @@
<p/>
<ui:param name="roleTypeObject" value="#{roleTypeController.selected}"/>
- <ui:param name="isEntityWriteable" value="#{loginController.loggedIn}"/>
<div class="actionButton">
<p:commandButton action="#{roleTypeController.prepareEdit(roleTypeObject)}" rendered="#{loginController.admin}" value="Edit" alt="Edit" icon="ui-icon-pencil"/>
<p:commandButton action="#{roleTypeController.prepareList()}" value="Return" alt="Return" icon="ui-icon-arrowreturnthick-1-w"/>
--
GitLab