No commit message

No commit message

src/java/DmWebPortal/web/views/login.xhtml

@@ -39,11 +39,12 @@
                             <p:inputText id="username" value="#{loginController.username}" title="Username"/>
                             <p:watermark for="username" value="Username"/>
                         </div>
+                        <p/>
                         <div>
                             <p:password id="password" value="#{loginController.password}" title="Password"/>
                             <p:watermark for="password" value="Password"/>
                         </div>
-
+                        <p/>
                         <div>
                             <p:commandButton value="Login" action="#{loginController.login()}" />
                         </div>

src/java/DmWebPortal/web/views/roleType/view.xhtml

@@ -19,8 +19,8 @@
                 <ui:include src="roleTypeViewPanelGrid.xhtml"/>
                 
                 <p/>
-                    <c:set var="roleTypeObject" value="#{roleTypeController.selected}"/>
-                <c:set var="isEntityWriteable" value="#{loginController.loggedIn}"/>
+                <ui:param name="roleTypeObject" value="#{roleTypeController.selected}"/>
+                <ui:param name="isEntityWriteable" value="#{loginController.loggedIn}"/>
                 <div class="actionButton">
                     <p:commandButton action="#{roleTypeController.prepareEdit(roleTypeObject)}" rendered="#{isEntityWriteable}" value="Edit" alt="Edit" icon="ui-icon-pencil"/>
                     <p:commandButton onclick="PF('roleTypeDestroyDialogWidget').show();" rendered="#{loginController.loggedIn}" value="Delete" alt="Delete" icon="ui-icon-trash">

src/java/DmWebPortal/web/views/userSystemRole/systemRoleListDataTable.xhtml

@@ -47,7 +47,7 @@
         <p:column headerText="Actions" >
             <div class="actionLink" >
             <p:commandLink oncomplete="PF('systemRoleRemoveDialogWidget').show()" rendered="#{userSystemRoleController.hasSystemRole(loginController.username) and (loginController.username != systemUserObject.username)}" styleClass="ui-icon ui-icon-trash" title="Remove" update="@form" >
-                    <f:setPropertyActionListener value="#{systemUserObject}" target="#{userSystemRoleController.systemRoleTable.current}" />
+                    <f:setPropertyActionListener value="#{systemUserObject}" target="#{userSystemRoleController.systemRoleTable.currentObject}" />
             </p:commandLink>
             </div>
         </p:column>

src/java/DmWebPortal/web/views/userSystemRole/systemRoleRemoveDialog.xhtml

@@ -5,7 +5,7 @@
                 xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 
-        <p:confirmDialog id="systemRoleRemoveDialog" message="Remove #{userSystemRoleController.getSystemRoleName()} Role for user #{userSystemRoleController.systemRoleTable.current.username}?"
+        <p:confirmDialog id="systemRoleRemoveDialog" message="Remove #{userSystemRoleController.getSystemRoleName()} Role for user #{userSystemRoleController.systemRoleTable.currentObject.username}?"
                      header="Remove System Role" severity="alert" widgetVar="systemRoleRemoveDialogWidget"
                      styleClass="dialog">
         <p:commandButton value="Yes" oncomplete="systemRoleRemoveDialogWidget.hide()"  action="#{userSystemRoleController.removeSystemRole()}"/>