Allow roles to be listed if VIEW_ALL

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/RoleBean.java

@@ -19,12 +19,10 @@ import javax.ejb.Stateless;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import fi.codecrew.moya.facade.RoleFacade;
-import fi.codecrew.moya.facade.UserFacade;
-import fi.codecrew.moya.beans.EventBeanLocal;
-import fi.codecrew.moya.beans.RoleBeanLocal;
 import fi.codecrew.moya.enums.apps.IAppPermission;
 import fi.codecrew.moya.enums.apps.UserPermission;
+import fi.codecrew.moya.facade.RoleFacade;
+import fi.codecrew.moya.facade.UserFacade;
 import fi.codecrew.moya.model.ApplicationPermission;
 import fi.codecrew.moya.model.EventUser;
 import fi.codecrew.moya.model.Role;
@@ -53,8 +51,9 @@ public class RoleBean implements RoleBeanLocal {
 	@EJB
 	private UserFacade userFacade;
 
+	// VIEW_ALL pitää olla että voidaan hakea roolien perusteella.
 	@Override
-	@RolesAllowed(UserPermission.S_READ_ROLES)
+	@RolesAllowed({ UserPermission.S_READ_ROLES, UserPermission.S_VIEW_ALL })
 	public List<Role> listRoles() {
 		return roleFacade.findAll();
 	}

code/MoyaWeb/src/fi/codecrew/moya/web/helper/LayoutView.java

@@ -75,9 +75,9 @@ public class LayoutView {
 		{
 			selectedSet = new HashSet<>();
 			selectedTop = menubean.findNavigation(getPagepath());
-			while (selectedTop != null && selectedTop.getParent() != null) {
-				selectedTop = selectedTop.getParent();
+			while (selectedTop != null) {
 				selectedSet.add(selectedTop);
+				selectedTop = selectedTop.getParent();
 			}
 
 			List<MenuNavigation> tops = menubean.getTopmenus();