Skip to content

Linnea Samila / Moya

Go to a project
Commit 957e503e by Tuomas Riihimäki
Options

Fix users accountevent listing permission.

1 parent aa1d190a
Inline Side-by-side
Showing with 4 additions and 1 deletions
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/MenuBean.java
...@@ -108,7 +108,7 @@ public class MenuBean implements MenuBeanLocal { ...@@ -108,7 +108,7 @@ public class MenuBean implements MenuBeanLocal {
userkauppa.addPage(menuitemfacade.findOrCreate("/bill/list"), BillPermission.VIEW_OWN); userkauppa.addPage(menuitemfacade.findOrCreate("/bill/list"), BillPermission.VIEW_OWN);
userkauppa.addPage(menuitemfacade.findOrCreate("/bill/edit"), BillPermission.VIEW_OWN).setVisible(false); userkauppa.addPage(menuitemfacade.findOrCreate("/bill/edit"), BillPermission.VIEW_OWN).setVisible(false);
userkauppa.addPage(menuitemfacade.findOrCreate("/bill/showBill"), BillPermission.VIEW_OWN).setVisible(false); userkauppa.addPage(menuitemfacade.findOrCreate("/bill/showBill"), BillPermission.VIEW_OWN).setVisible(false);
userkauppa.addPage(menuitemfacade.findOrCreate("/user/accountEvents"), UserPermission.VIEW_ACCOUNTEVENTS); userkauppa.addPage(menuitemfacade.findOrCreate("/user/accountEvents"), UserPermission.VIEW_OWN_ACCOUNTEVENTS);
MenuNavigation userPlaces = usermenu.addPage(null, null); MenuNavigation userPlaces = usermenu.addPage(null, null);
userPlaces.setKey("topnavi.userplaces"); userPlaces.setKey("topnavi.userplaces");
......
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/PermissionBean.java
...@@ -38,6 +38,7 @@ import fi.codecrew.moya.model.User; ...@@ -38,6 +38,7 @@ import fi.codecrew.moya.model.User;
UserPermission.S_MODIFY, UserPermission.S_MODIFY,
UserPermission.S_MODIFY_ACCOUNTEVENTS, UserPermission.S_MODIFY_ACCOUNTEVENTS,
UserPermission.S_VIEW_ACCOUNTEVENTS, UserPermission.S_VIEW_ACCOUNTEVENTS,
UserPermission.S_VIEW_OWN_ACCOUNTEVENTS,
UserPermission.S_VIEW_ALL, UserPermission.S_VIEW_ALL,
UserPermission.S_VIEW_SELF, UserPermission.S_VIEW_SELF,
UserPermission.S_WRITE_ROLES, UserPermission.S_WRITE_ROLES,
......
code/MoyaUtilities/src/main/java/fi/codecrew/moya/enums/apps/UserPermission.java
...@@ -12,6 +12,7 @@ public enum UserPermission implements IAppPermission { ...@@ -12,6 +12,7 @@ public enum UserPermission implements IAppPermission {
READ_ROLES, // ("View all roles."), READ_ROLES, // ("View all roles."),
WRITE_ROLES, // ("Modify roles"), WRITE_ROLES, // ("Modify roles"),
VIEW_ACCOUNTEVENTS, // ("Show other users account events"), VIEW_ACCOUNTEVENTS, // ("Show other users account events"),
VIEW_OWN_ACCOUNTEVENTS, // ("Show other users account events"),
MODIFY_ACCOUNTEVENTS, // ("Modify Account events"), MODIFY_ACCOUNTEVENTS, // ("Modify Account events"),
ANYUSER, // ("All users have this anyways"), ANYUSER, // ("All users have this anyways"),
MANAGE_HTTP_SESSION, // ("Manage http sessions"), MANAGE_HTTP_SESSION, // ("Manage http sessions"),
...@@ -32,6 +33,7 @@ public enum UserPermission implements IAppPermission { ...@@ -32,6 +33,7 @@ public enum UserPermission implements IAppPermission {
public static final String S_READ_ROLES = "USER/READ_ROLES"; public static final String S_READ_ROLES = "USER/READ_ROLES";
public static final String S_WRITE_ROLES = "USER/WRITE_ROLES"; public static final String S_WRITE_ROLES = "USER/WRITE_ROLES";
public static final String S_VIEW_ACCOUNTEVENTS = "USER/VIEW_ACCOUNTEVENTS"; public static final String S_VIEW_ACCOUNTEVENTS = "USER/VIEW_ACCOUNTEVENTS";
public static final String S_VIEW_ACCOUNTEVENTS = "USER/VIEW_OWN_ACCOUNTEVENTS";
public static final String S_MODIFY_ACCOUNTEVENTS = "USER/MODIFY_ACCOUNTEVENTS"; public static final String S_MODIFY_ACCOUNTEVENTS = "USER/MODIFY_ACCOUNTEVENTS";
public static final String S_ANYUSER = "USER/ANYUSER"; public static final String S_ANYUSER = "USER/ANYUSER";
public static final String S_MANAGE_HTTP_SESSION = "USER/MANAGE_HTTP_SESSION"; public static final String S_MANAGE_HTTP_SESSION = "USER/MANAGE_HTTP_SESSION";
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!