modified database, scripts, and web pages

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

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."; 
     }
 

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

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."; 
     }
 

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."; 
     }
 

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;
-        }
-        
+        }        
      }
 
 }

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)

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>
         

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">
 

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"> 
 

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>

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">
 

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>  

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"> 
 

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>

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">
 

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>  

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>

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>  

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>