Skip to content

Max Mecklin / Moya

Go to a project
Commit f45cf0d0 by Tuomas Riihimäki
Options

Beanien jaottelua fiksummin, metodien pilkkomista, jne

1 parent 75972bd0
Inline Side-by-side
Showing with 102 additions and 106 deletions
code/LanBortalBeans/as3/fi/insomnia/bortal/beans/EventBeanBase.as
...@@ -9,7 +9,6 @@ package fi.insomnia.bortal.beans { ...@@ -9,7 +9,6 @@ package fi.insomnia.bortal.beans {
import fi.insomnia.bortal.facade.EventFacade; import fi.insomnia.bortal.facade.EventFacade;
import fi.insomnia.bortal.facade.EventOrganiserFacade; import fi.insomnia.bortal.facade.EventOrganiserFacade;
import fi.insomnia.bortal.facade.UserFacade;
import flash.utils.IDataInput; import flash.utils.IDataInput;
import flash.utils.IDataOutput; import flash.utils.IDataOutput;
import flash.utils.IExternalizable; import flash.utils.IExternalizable;
...@@ -22,14 +21,14 @@ package fi.insomnia.bortal.beans { ...@@ -22,14 +21,14 @@ package fi.insomnia.bortal.beans {
private var _eventFacade:EventFacade; private var _eventFacade:EventFacade;
private var _eventOrganiserFacade:EventOrganiserFacade; private var _eventOrganiserFacade:EventOrganiserFacade;
private var _eventStatusBean:EventStatusBeanLocal; private var _eventStatusBean:EventStatusBeanLocal;
private var _userFacade:UserFacade; private var _userBean:UserBeanLocal;
public function readExternal(input:IDataInput):void { public function readExternal(input:IDataInput):void {
_em = input.readObject() as EntityManager; _em = input.readObject() as EntityManager;
_eventFacade = input.readObject() as EventFacade; _eventFacade = input.readObject() as EventFacade;
_eventOrganiserFacade = input.readObject() as EventOrganiserFacade; _eventOrganiserFacade = input.readObject() as EventOrganiserFacade;
_eventStatusBean = input.readObject() as EventStatusBeanLocal; _eventStatusBean = input.readObject() as EventStatusBeanLocal;
_userFacade = input.readObject() as UserFacade; _userBean = input.readObject() as UserBeanLocal;
} }
public function writeExternal(output:IDataOutput):void { public function writeExternal(output:IDataOutput):void {
...@@ -37,7 +36,7 @@ package fi.insomnia.bortal.beans { ...@@ -37,7 +36,7 @@ package fi.insomnia.bortal.beans {
output.writeObject(_eventFacade); output.writeObject(_eventFacade);
output.writeObject(_eventOrganiserFacade); output.writeObject(_eventOrganiserFacade);
output.writeObject(_eventStatusBean); output.writeObject(_eventStatusBean);
output.writeObject(_userFacade); output.writeObject(_userBean);
} }
} }
} }
\ No newline at end of file
code/LanBortalBeans/as3/fi/insomnia/bortal/beans/RoleBeanBase.as
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
package fi.insomnia.bortal.beans { package fi.insomnia.bortal.beans {
import fi.insomnia.bortal.facade.AccessRightFacade;
import fi.insomnia.bortal.facade.RoleFacade; import fi.insomnia.bortal.facade.RoleFacade;
import fi.insomnia.bortal.facade.RoleRightFacade; import fi.insomnia.bortal.facade.RoleRightFacade;
import flash.utils.IDataInput; import flash.utils.IDataInput;
...@@ -17,21 +16,21 @@ package fi.insomnia.bortal.beans { ...@@ -17,21 +16,21 @@ package fi.insomnia.bortal.beans {
[Bindable] [Bindable]
public class RoleBeanBase implements IExternalizable { public class RoleBeanBase implements IExternalizable {
private var _accessrightFacade:AccessRightFacade; private var _accessRightBean:AccessRightBean;
private var _arf:AccessRightFacade; private var _eventBean:EventBean;
private var _roleFacade:RoleFacade; private var _roleFacade:RoleFacade;
private var _rrfacade:RoleRightFacade; private var _rrfacade:RoleRightFacade;
public function readExternal(input:IDataInput):void { public function readExternal(input:IDataInput):void {
_accessrightFacade = input.readObject() as AccessRightFacade; _accessRightBean = input.readObject() as AccessRightBean;
_arf = input.readObject() as AccessRightFacade; _eventBean = input.readObject() as EventBean;
_roleFacade = input.readObject() as RoleFacade; _roleFacade = input.readObject() as RoleFacade;
_rrfacade = input.readObject() as RoleRightFacade; _rrfacade = input.readObject() as RoleRightFacade;
} }
public function writeExternal(output:IDataOutput):void { public function writeExternal(output:IDataOutput):void {
output.writeObject(_accessrightFacade); output.writeObject(_accessRightBean);
output.writeObject(_arf); output.writeObject(_eventBean);
output.writeObject(_roleFacade); output.writeObject(_roleFacade);
output.writeObject(_rrfacade); output.writeObject(_rrfacade);
} }
......
code/LanBortalBeans/as3/fi/insomnia/bortal/beans/UserBeanBase.as
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
package fi.insomnia.bortal.beans { package fi.insomnia.bortal.beans {
import fi.insomnia.bortal.facade.RoleFacade;
import fi.insomnia.bortal.facade.UserFacade; import fi.insomnia.bortal.facade.UserFacade;
import flash.utils.IDataInput; import flash.utils.IDataInput;
import flash.utils.IDataOutput; import flash.utils.IDataOutput;
...@@ -20,7 +19,7 @@ package fi.insomnia.bortal.beans { ...@@ -20,7 +19,7 @@ package fi.insomnia.bortal.beans {
private var _accessRightBeanLocal:AccessRightBeanLocal; private var _accessRightBeanLocal:AccessRightBeanLocal;
private var _context:SessionContext; private var _context:SessionContext;
private var _eventBean:EventBeanLocal; private var _eventBean:EventBeanLocal;
private var _roleFacade:RoleFacade; private var _rolebean:RoleBean;
private var _secubean:SecurityBeanLocal; private var _secubean:SecurityBeanLocal;
private var _userFacade:UserFacade; private var _userFacade:UserFacade;
...@@ -28,7 +27,7 @@ package fi.insomnia.bortal.beans { ...@@ -28,7 +27,7 @@ package fi.insomnia.bortal.beans {
_accessRightBeanLocal = input.readObject() as AccessRightBeanLocal; _accessRightBeanLocal = input.readObject() as AccessRightBeanLocal;
_context = input.readObject() as SessionContext; _context = input.readObject() as SessionContext;
_eventBean = input.readObject() as EventBeanLocal; _eventBean = input.readObject() as EventBeanLocal;
_roleFacade = input.readObject() as RoleFacade; _rolebean = input.readObject() as RoleBean;
_secubean = input.readObject() as SecurityBeanLocal; _secubean = input.readObject() as SecurityBeanLocal;
_userFacade = input.readObject() as UserFacade; _userFacade = input.readObject() as UserFacade;
} }
...@@ -37,7 +36,7 @@ package fi.insomnia.bortal.beans { ...@@ -37,7 +36,7 @@ package fi.insomnia.bortal.beans {
output.writeObject(_accessRightBeanLocal); output.writeObject(_accessRightBeanLocal);
output.writeObject(_context); output.writeObject(_context);
output.writeObject(_eventBean); output.writeObject(_eventBean);
output.writeObject(_roleFacade); output.writeObject(_rolebean);
output.writeObject(_secubean); output.writeObject(_secubean);
output.writeObject(_userFacade); output.writeObject(_userFacade);
} }
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/AccessRightBean.java
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
package fi.insomnia.bortal.beans; package fi.insomnia.bortal.beans;
import java.util.List;
import fi.insomnia.bortal.enums.Permission; import fi.insomnia.bortal.enums.Permission;
import fi.insomnia.bortal.facade.AccessRightFacade; import fi.insomnia.bortal.facade.AccessRightFacade;
import fi.insomnia.bortal.model.AccessRight; import fi.insomnia.bortal.model.AccessRight;
...@@ -39,4 +41,8 @@ public class AccessRightBean implements AccessRightBeanLocal { ...@@ -39,4 +41,8 @@ public class AccessRightBean implements AccessRightBeanLocal {
return right; return right;
} }
public List<AccessRight> findAll() {
return accessRightFacade.findAll();
}
} }
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/EventBean.java
...@@ -32,7 +32,7 @@ public class EventBean implements EventBeanLocal { ...@@ -32,7 +32,7 @@ public class EventBean implements EventBeanLocal {
private EventOrganiserFacade eventOrganiserFacade; private EventOrganiserFacade eventOrganiserFacade;
@EJB @EJB
private UserFacade userFacade; private UserBeanLocal userBean;
@EJB @EJB
private EventStatusBeanLocal eventStatusBean; private EventStatusBeanLocal eventStatusBean;
...@@ -72,7 +72,8 @@ public class EventBean implements EventBeanLocal { ...@@ -72,7 +72,8 @@ public class EventBean implements EventBeanLocal {
if (settings == null) { if (settings == null) {
settings = new EventOrganiser(); settings = new EventOrganiser();
settings.setOrganisation(DEFAULT_ORGANISATION_NAME); settings.setOrganisation(DEFAULT_ORGANISATION_NAME);
User defaultUser = userFacade.getOrCreateDefaultUser();
User defaultUser = userBean.getAnonUser();
settings.setAdmin(defaultUser); settings.setAdmin(defaultUser);
eventOrganiserFacade.create(settings); eventOrganiserFacade.create(settings);
} }
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/RoleBean.java
...@@ -15,11 +15,11 @@ import javax.ejb.Stateless; ...@@ -15,11 +15,11 @@ import javax.ejb.Stateless;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.facade.AccessRightFacade; import fi.insomnia.bortal.enums.BeanRole;
import fi.insomnia.bortal.enums.Permission;
import fi.insomnia.bortal.facade.RoleFacade; import fi.insomnia.bortal.facade.RoleFacade;
import fi.insomnia.bortal.facade.RoleRightFacade; import fi.insomnia.bortal.facade.RoleRightFacade;
import fi.insomnia.bortal.model.AccessRight; import fi.insomnia.bortal.model.AccessRight;
import fi.insomnia.bortal.model.LanEvent;
import fi.insomnia.bortal.model.Role; import fi.insomnia.bortal.model.Role;
import fi.insomnia.bortal.model.RoleRight; import fi.insomnia.bortal.model.RoleRight;
...@@ -30,14 +30,17 @@ import fi.insomnia.bortal.model.RoleRight; ...@@ -30,14 +30,17 @@ import fi.insomnia.bortal.model.RoleRight;
@Stateless @Stateless
public class RoleBean implements RoleBeanLocal { public class RoleBean implements RoleBeanLocal {
private static final String PUBLIC_ROLE_NAME = BeanRole.ANONYMOUS.toString();
@EJB
private EventBean eventBean;
@EJB @EJB
private RoleFacade roleFacade; private RoleFacade roleFacade;
@EJB @EJB
private AccessRightFacade arf;
@EJB
private RoleRightFacade rrfacade; private RoleRightFacade rrfacade;
@EJB @EJB
private AccessRightFacade accessrightFacade; private AccessRightBean accessRightBean;
private static final Logger logger = LoggerFactory.getLogger(RoleBean.class); private static final Logger logger = LoggerFactory.getLogger(RoleBean.class);
public List<Role> listRoles() { public List<Role> listRoles() {
...@@ -89,22 +92,12 @@ public class RoleBean implements RoleBeanLocal { ...@@ -89,22 +92,12 @@ public class RoleBean implements RoleBeanLocal {
return returnList; return returnList;
} }
public List<RoleRight> getEventRoleRights(LanEvent e, Role r) { public List<RoleRight> getRoleRights(Role r) {
List<AccessRight> rights = arf.findAll(); List<AccessRight> rights = accessRightBean.findAll();
List<RoleRight> ret = new ArrayList<RoleRight>(); List<RoleRight> ret = new ArrayList<RoleRight>();
for(AccessRight ar : rights) for (AccessRight ar : rights) {
{ ret.add(findRoleRight(r, ar));
RoleRight roleright = rrfacade.find(e, ar, r);
if(roleright == null)
{
roleright = new RoleRight(e);
roleright.setAccessRight(ar);
roleright.setRole(r);
rrfacade.create(roleright);
}
ret.add(roleright);
} }
return ret; return ret;
} }
...@@ -114,6 +107,32 @@ public class RoleBean implements RoleBeanLocal { ...@@ -114,6 +107,32 @@ public class RoleBean implements RoleBeanLocal {
return rrfacade.merge(row); return rrfacade.merge(row);
} }
// Add business logic below. (Right-click in editor and choose public Role getOrCreatePublicRole() {
// "Insert Code > Add Business Method")
Role ret = roleFacade.findByName(PUBLIC_ROLE_NAME);
if (ret == null) {
ret = new Role(eventBean.getCurrentEvent());
roleFacade.create(ret);
RoleRight rr = findRoleRight(ret, Permission.LOGIN);
rr.setRead(true);
}
return ret;
}
public RoleRight findRoleRight(Role role, Permission perm) {
AccessRight acr = accessRightBean.findOrCreate(perm);
return findRoleRight(role, acr);
}
public RoleRight findRoleRight(Role role, AccessRight acr) {
RoleRight rr = rrfacade.find(eventBean.getCurrentEvent(), acr, role);
if (rr == null) {
rr = new RoleRight(eventBean.getCurrentEvent(), role, acr, false, false, false);
rrfacade.create(rr);
}
return rr;
}
} }
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/UserBean.java
...@@ -34,6 +34,8 @@ import fi.insomnia.bortal.model.User; ...@@ -34,6 +34,8 @@ import fi.insomnia.bortal.model.User;
public class UserBean implements UserBeanLocal { public class UserBean implements UserBeanLocal {
private static final Logger logger = LoggerFactory.getLogger(UserBean.class); private static final Logger logger = LoggerFactory.getLogger(UserBean.class);
public static final String DEFAULT_USER_LOGIN = "ANONYMOUS";
/** /**
* Java EE container injektoi tämän luokkamuuttujan luokan luonnin * Java EE container injektoi tämän luokkamuuttujan luokan luonnin
* yhteydessä. * yhteydessä.
...@@ -44,7 +46,7 @@ public class UserBean implements UserBeanLocal { ...@@ -44,7 +46,7 @@ public class UserBean implements UserBeanLocal {
private SessionContext context; private SessionContext context;
@EJB @EJB
private RoleFacade roleFacade; private RoleBean rolebean;
@EJB @EJB
private AccessRightBeanLocal accessRightBeanLocal; private AccessRightBeanLocal accessRightBeanLocal;
...@@ -99,13 +101,17 @@ public class UserBean implements UserBeanLocal { ...@@ -99,13 +101,17 @@ public class UserBean implements UserBeanLocal {
return (context.getCallerPrincipal() == null || user == null) ? false : context.getCallerPrincipal().getName().equals(user.getNick()); return (context.getCallerPrincipal() == null || user == null) ? false : context.getCallerPrincipal().getName().equals(user.getNick());
} }
public boolean isLoggedIn()
{
return !isCurrentUser(getAnonUser());
}
@Override @Override
public User getCurrentUser() { public User getCurrentUser() {
Principal principal = context.getCallerPrincipal(); Principal principal = context.getCallerPrincipal();
User ret = userFacade.findByLogin(principal.getName()); User ret = userFacade.findByLogin(principal.getName());
if (ret == null) { if (ret == null) {
ret = getDefaultUser(); ret = getAnonUser();
} }
return ret; return ret;
} }
...@@ -114,12 +120,16 @@ public class UserBean implements UserBeanLocal { ...@@ -114,12 +120,16 @@ public class UserBean implements UserBeanLocal {
* Makes sure default user and public role exist and the user is member of * Makes sure default user and public role exist and the user is member of
* the role. * the role.
*/ */
public User getDefaultUser() { public User getAnonUser() {
Role publicRole = roleFacade.getOrCreatePublicRole(eventBean.getCurrentEvent()); User defaultUser = userFacade.findByLogin(DEFAULT_USER_LOGIN);
User defaultUser = userFacade.getOrCreateDefaultUser(); if (defaultUser == null) {
if (!defaultUser.getRoles().contains(publicRole)) { defaultUser = new User();
defaultUser.setLogin(DEFAULT_USER_LOGIN);
userFacade.create(defaultUser);
ArrayList<Role> userRoles = new ArrayList<Role>(); ArrayList<Role> userRoles = new ArrayList<Role>();
userRoles.add(publicRole); userRoles.add(rolebean.getOrCreatePublicRole());
defaultUser.setRoles(userRoles); defaultUser.setRoles(userRoles);
} }
return defaultUser; return defaultUser;
...@@ -131,8 +141,6 @@ public class UserBean implements UserBeanLocal { ...@@ -131,8 +141,6 @@ public class UserBean implements UserBeanLocal {
return false; return false;
} }
// TODO: FIX THIS!! really bad idea....
AccessRight expectedRight = accessRightBeanLocal.findOrCreate(target); AccessRight expectedRight = accessRightBeanLocal.findOrCreate(target);
User dbusr = userFacade.find(user.getId()); User dbusr = userFacade.find(user.getId());
...@@ -144,6 +152,8 @@ public class UserBean implements UserBeanLocal { ...@@ -144,6 +152,8 @@ public class UserBean implements UserBeanLocal {
} }
} }
} }
// TODO: FIX THIS!! really bad idea....
if (user.isSuperadmin()) { if (user.isSuperadmin()) {
logger.debug("Returning true for superadmin for {} perm {}", target.name(), permission); logger.debug("Returning true for superadmin for {} perm {}", target.name(), permission);
return true; return true;
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/RoleFacade.java
...@@ -6,15 +6,13 @@ import javax.persistence.EntityManager; ...@@ -6,15 +6,13 @@ import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext; import javax.persistence.PersistenceContext;
import javax.persistence.TypedQuery; import javax.persistence.TypedQuery;
import fi.insomnia.bortal.enums.BeanRole;
import fi.insomnia.bortal.model.LanEvent;
import fi.insomnia.bortal.model.Role; import fi.insomnia.bortal.model.Role;
@Stateless @Stateless
@LocalBean @LocalBean
public class RoleFacade extends EventChildGenericFacade<Role> { public class RoleFacade extends EventChildGenericFacade<Role> {
private static final String PUBLIC_ROLE_NAME = BeanRole.ANONYMOUS.toString();
@PersistenceContext @PersistenceContext
private EntityManager em; private EntityManager em;
...@@ -32,20 +30,5 @@ public class RoleFacade extends EventChildGenericFacade<Role> { ...@@ -32,20 +30,5 @@ public class RoleFacade extends EventChildGenericFacade<Role> {
return this.getSingleNullableResult(q); return this.getSingleNullableResult(q);
} }
public Role getOrCreatePublicRole(LanEvent event) {
Role publicRole = findByName(PUBLIC_ROLE_NAME);
if (publicRole == null) {
publicRole = createPublicRole(event);
}
return publicRole;
}
private Role createPublicRole(LanEvent event) {
Role publicRole = new Role(event);
publicRole.setName(PUBLIC_ROLE_NAME);
em.persist(publicRole);
return publicRole;
}
} }
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/UserFacade.java
...@@ -10,9 +10,7 @@ import fi.insomnia.bortal.model.User; ...@@ -10,9 +10,7 @@ import fi.insomnia.bortal.model.User;
@Stateless @Stateless
@LocalBean @LocalBean
public class UserFacade extends GenericFacade<Integer, User>{ public class UserFacade extends GenericFacade<Integer, User> {
public static final String DEFAULT_USER_LOGIN = "ANONYMOUS";
@PersistenceContext @PersistenceContext
private EntityManager em; private EntityManager em;
...@@ -26,32 +24,9 @@ public class UserFacade extends GenericFacade<Integer, User>{ ...@@ -26,32 +24,9 @@ public class UserFacade extends GenericFacade<Integer, User>{
} }
public User findByLogin(String login) { public User findByLogin(String login) {
// TODO: Bug in glassfish.... change when fixed... TypedQuery<User> q = em.createNamedQuery("User.findByLogin", User.class);
TypedQuery<User> q = em.createNamedQuery("User.findByLogin", q.setParameter("login", login);
User.class); return getSingleNullableResult(q);
q.setParameter("login", login);
return getSingleNullableResult(q);
// TypedQuery<User> q = em.createQuery("SELECT u FROM User u WHERE u.login = :login", User.class);
// q.setParameter("login", login);
// return getSingleNullableResult(q);
}
public User getOrCreateDefaultUser() {
User defaultUser = findByLogin(DEFAULT_USER_LOGIN);
// Create if doesn't exist yet
if (defaultUser == null)
defaultUser = createDefaultUser();
return defaultUser;
}
private User createDefaultUser() {
User user = new User();
user.setLogin(DEFAULT_USER_LOGIN);
em.persist(user);
return user;
} }
} }
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/RoleBeanLocal.java
...@@ -9,8 +9,6 @@ import java.util.List; ...@@ -9,8 +9,6 @@ import java.util.List;
import javax.ejb.Local; import javax.ejb.Local;
import fi.insomnia.bortal.model.AccessRight;
import fi.insomnia.bortal.model.LanEvent;
import fi.insomnia.bortal.model.Role; import fi.insomnia.bortal.model.Role;
import fi.insomnia.bortal.model.RoleRight; import fi.insomnia.bortal.model.RoleRight;
...@@ -29,7 +27,7 @@ public interface RoleBeanLocal { ...@@ -29,7 +27,7 @@ public interface RoleBeanLocal {
public List<Role> getPossibleParents(Role role); public List<Role> getPossibleParents(Role role);
public List<RoleRight> getEventRoleRights(LanEvent e, Role r); public List<RoleRight> getRoleRights(Role r);
public RoleRight mergeChanges(RoleRight row); public RoleRight mergeChanges(RoleRight row);
......
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/UserBeanLocal.java
...@@ -23,7 +23,7 @@ public interface UserBeanLocal { ...@@ -23,7 +23,7 @@ public interface UserBeanLocal {
User getCurrentUser(); User getCurrentUser();
User getDefaultUser(); User getAnonUser();
boolean hasPermission(Permission target, User user, RolePermission permission); boolean hasPermission(Permission target, User user, RolePermission permission);
...@@ -31,6 +31,8 @@ public interface UserBeanLocal { ...@@ -31,6 +31,8 @@ public interface UserBeanLocal {
boolean hasCurrentUserPermission(Permission userManagement, RolePermission execute); boolean hasCurrentUserPermission(Permission userManagement, RolePermission execute);
boolean isLoggedIn();
......
code/LanBortalWeb/WebContent/layout/insomnia1/template.xhtml
...@@ -30,8 +30,6 @@ ...@@ -30,8 +30,6 @@
<div id="cwrap"> <div id="cwrap">
<!-- <ui:include src="/insomnia1/#{i18n[concat['#thispage,.pagegroup'] ] }.xhtml" /> <!-- <ui:include src="/insomnia1/#{i18n[concat['#thispage,.pagegroup'] ] }.xhtml" />
--> -->
#{thispage}
COnc: #{i18n[util.concat(thispage,'.pagegroup')] }
<h:messages globalOnly="true" /> <h:messages globalOnly="true" />
<h:messages /> <h:messages />
<ui:insert name="content" /> <ui:insert name="content" />
......
code/LanBortalWeb/WebContent/resources/style/insomnia1/style.css
...@@ -37,6 +37,10 @@ body { ...@@ -37,6 +37,10 @@ body {
margin: 15px 30px 5px 30px; margin: 15px 30px 5px 30px;
color: #FFFFFF; color: #FFFFFF;
} }
#headerbox:a {
text-decoration: none;
}
.linka { .linka {
background-image:url('img/linka2.gif'); background-image:url('img/linka2.gif');
width: 117px; width: 117px;
......
code/LanBortalWeb/WebContent/resources/tools/loginLogout.xhtml
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
<composite:implementation> <composite:implementation>
<tools:canRead target="LOGIN"> <tools:canRead target="LOGIN">
<f:facet name="errorMessage"> <f:facet name="errorMessage">
<login:login isOneliner="true" />
</f:facet>
<login:logout /> <login:logout />
</f:facet>
<login:login isOneliner="true" />
</tools:canRead> </tools:canRead>
</composite:implementation> </composite:implementation>
......
code/LanBortalWeb/WebContent/resources/tools/role/list.xhtml
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<h:outputText value="#{role.name}" /> <h:outputText value="#{role.name}" />
</h:column> </h:column>
<h:column rendered="#{sessionHandler.canWrite('ROLE_MANAGEMENT') }"> <h:column rendered="#{sessionHandler.canWrite('ROLE_MANAGEMENT') }">
<h:commandButton action="#{roleView.edit()}" value="#{i18n['role.edit']}"" /> <h:commandButton action="#{roleView.edit()}" value="#{i18n['role.edit']}" />
</h:column> </h:column>
</h:dataTable> </h:dataTable>
</tools:canRead> </tools:canRead>
......
code/LanBortalWeb/src/fi/insomnia/bortal/handler/SessionHandler.java
...@@ -110,6 +110,7 @@ public class SessionHandler { ...@@ -110,6 +110,7 @@ public class SessionHandler {
private boolean impersonating = false; private boolean impersonating = false;
public void impersonateUser(User user) { public void impersonateUser(User user) {
if (user == null) { if (user == null) {
this.thisuser = getUser(); this.thisuser = getUser();
......
code/LanBortalWeb/src/fi/insomnia/bortal/view/RoleView.java
...@@ -58,7 +58,7 @@ public class RoleView { ...@@ -58,7 +58,7 @@ public class RoleView {
public DataModel<RoleRight> getRoleRights() { public DataModel<RoleRight> getRoleRights() {
if (rolerights == null) { if (rolerights == null) {
logger.info("Fetching new rolerights from database"); logger.info("Fetching new rolerights from database");
rolerights = new ListDataModel<RoleRight>(roleBean.getEventRoleRights(eventbean.getCurrentEvent(), role)); rolerights = new ListDataModel<RoleRight>(roleBean.getRoleRights(role));
} }
return rolerights; return rolerights;
} }
......
code/LanBortalWeb/src/resources/i18n.properties
global.copyright=Insomnia Ry, Stream Ry
global.productname=Omnia global.productname=Omnia
navi.auth.login=frontpage navi.auth.login=frontpage
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!