permfixei

code/moya-beans/ejbModule/fi/codecrew/moya/beans/EventBean.java

@@ -369,11 +369,8 @@ public class EventBean implements EventBeanLocal {
 	}
 	}
 
 
 	@Override
 	@Override
+	@RolesAllowed(SpecialPermission.S_SUPERADMIN)
 	public List<LanEvent> findFutureEvents() {
 	public List<LanEvent> findFutureEvents() {
-		if(!permbean.getCurrentUser().isSuperadmin()) {
-			throw new EJBAccessException("Must be superadmin to see all events, sorry");
-		}
-
 		return eventFacade.findFutureEvents();
 		return eventFacade.findFutureEvents();
 	}
 	}
 
 

code/moya-beans/ejbModule/fi/codecrew/moya/beans/UserBean.java

@@ -95,6 +95,7 @@ import fi.codecrew.moya.utilities.PasswordFunctions;
 import fi.codecrew.moya.utilities.SearchQuery;
 import fi.codecrew.moya.utilities.SearchQuery;
 import fi.codecrew.moya.utilities.SearchResult;
 import fi.codecrew.moya.utilities.SearchResult;
 import fi.codecrew.moya.utilities.moyamessage.MoyaEventType;
 import fi.codecrew.moya.utilities.moyamessage.MoyaEventType;
+import scala.tools.cmd.Spec;
 
 
 @LocalBean
 @LocalBean
 @Stateless
 @Stateless
@@ -1129,11 +1130,8 @@ public class UserBean implements UserBeanLocal {
     }
     }
 
 
 	@Override
 	@Override
+	@RolesAllowed(SpecialPermission.S_SUPERADMIN)
 	public List<User> findSuperusers() {
 	public List<User> findSuperusers() {
-
-		if(!permbean.getCurrentUser().isSuperadmin())
-			throw new EJBException("Only superadmin can see other superadmins, sorry!");
-
 		return userFacade.findSuperusers();
 		return userFacade.findSuperusers();
 	}
 	}
 
 

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/organisation/EventOrgView.java

@@ -312,6 +312,10 @@ public class EventOrgView extends GenericCDIView {
 	}
 	}
 
 
 	public List<User> getSuperUsers() {
 	public List<User> getSuperUsers() {
+
+		if(!permbean.getCurrentUser().isSuperadmin())
+			return new ArrayList<User>();
+
 		return userBean.findSuperusers();
 		return userBean.findSuperusers();
 	}
 	}