can haz

1 parent 42a59ade
......@@ -9,7 +9,7 @@
xmlns:c="http://java.sun.com/jsp/jstl/core">
<h:body>
<ui:composition template="/layout/insomnia1/sidebartemplate.xhtml">
<ui:param name="rendered" value="#{!sessionHandler.isLoggedIn()}" />
<ui:param name="rendered" value="#{!sessionHandler.loggedIn}" />
<ui:define name="sidebarcontent">
<ul>
<li><h:link outcome="/user/create.xhtml" value="#{i18n['sidebar.createuser']}"/></li>
......
......@@ -9,7 +9,7 @@
xmlns:c="http://java.sun.com/jsp/jstl/core">
<h:body>
<ui:composition template="sidebartemplate.xhtml">
<ui:param name="rendered" value="#{!sessionHandler.isLoggedIn()}" />
<ui:param name="rendered" value="#{!sessionHandler.loggedIn}" />
<ui:define name="sidebarcontent">
<ul>
<li><h:link outcome="/user/create.xhtml" value="#{i18n['sidebar.createuser']}"/></li>
......
......@@ -13,8 +13,8 @@
<ui:define name="content">
<h1>#{i18n['permissiondenied.header']}</h1>
<p>
<h:outputText rendered="#{!sessionHandler.isLoggedIn()}" value="#{i18n['permissiondenied.notLoggedIn']}" />
<h:outputText rendered="#{sessionHandler.isLoggedIn()}" value="#{i18n['permissiondenied.alreadyLoggedIn']}" />
<h:outputText rendered="#{!sessionHandler.loggedIn}" value="#{i18n['permissiondenied.notLoggedIn']}" />
<h:outputText rendered="#{sessionHandler.loggedIn}" value="#{i18n['permissiondenied.alreadyLoggedIn']}" />
</p>
</ui:define>
</ui:composition>
......
......@@ -19,7 +19,7 @@
<h:link rendered="#{billListView.canWriteBill()}" outcome="/useradmin/edit" value="#{bill.addr1}">
<f:param name="userid" value="#{bill.user.user.id}" />
</h:link>
<h:outputText rendered="#{!billListView.canWriteBill()}" value="#{bill.addr1}" />
<h:outputText rendered="#{!billListView.canWriteBill}" value="#{bill.addr1}" />
</h:column>
<h:column>
<f:facet name="header">
......
......@@ -27,7 +27,7 @@
<h2>
<h:outputText value="#{i18n['user.roles']}:" />
</h2>
<h:selectManyCheckbox converter="#{roleConverter}" disabled="#{!roleView.canWriteRoles()}" layout="pageDirection" id="roles" value="#{userView.usersRoles}">
<h:selectManyCheckbox converter="#{roleConverter}" disabled="#{!roleView.canWriteRoles}" layout="pageDirection" id="roles" value="#{userView.usersRoles}">
<f:selectItems var="roleitem" itemLabel="#{roleitem.name}" value="#{roleDataView.roles}" />
</h:selectManyCheckbox>
<div>
......
......@@ -59,11 +59,11 @@ public class RoleView extends GenericCDIView {
}
}
public boolean canReadRoles() {
public boolean isCanReadRoles() {
return permbean.hasPermission(UserPermission.READ_ROLES);
}
public boolean canWriteRoles() {
public boolean isCanWriteRoles() {
return permbean.hasPermission(UserPermission.WRITE_ROLES);
}
......@@ -117,7 +117,7 @@ public class RoleView extends GenericCDIView {
}
public String savePermissions() {
if (canWriteRoles()) {
if (isCanWriteRoles()) {
ArrayList<IAppPermission> newPerms = new ArrayList<IAppPermission>();
for (BortalApplicationWrapper appWrap : rolePermissions) {
for (IAppPermission apWrap : appWrap.getPermissions()) {
......
......@@ -101,10 +101,11 @@ public class UserView extends GenericCDIView {
return user;
}
public void saveRoles()
public String saveRoles()
{
rolebean.saveRoles(user, usersRoles);
usersRoles = null;
return null;
}
public List<Role> getUsersRoles() {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!