Skip to content

Max Mecklin / Moya

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

Fix orgrole creation

1 parent b10e766e
Inline Side-by-side
Showing with 4 additions and 3 deletions
code/moya-beans/ejbModule/fi/codecrew/moya/beans/MenuBean.java
...@@ -232,6 +232,7 @@ public class MenuBean implements MenuBeanLocal { ...@@ -232,6 +232,7 @@ public class MenuBean implements MenuBeanLocal {
adminroles.addPage(menuitemfacade.findOrCreate("/role/edit"), null).setVisible(false); adminroles.addPage(menuitemfacade.findOrCreate("/role/edit"), null).setVisible(false);
adminroles.addPage(menuitemfacade.findOrCreate("/orgrole/list"), UserPermission.READ_ORGROLES); adminroles.addPage(menuitemfacade.findOrCreate("/orgrole/list"), UserPermission.READ_ORGROLES);
adminroles.addPage(menuitemfacade.findOrCreate("/orgrole/create"), UserPermission.WRITE_ORGROLES); adminroles.addPage(menuitemfacade.findOrCreate("/orgrole/create"), UserPermission.WRITE_ORGROLES);
adminroles.addPage(menuitemfacade.findOrCreate("/orgrole/edit"), null).setVisible(false);
MenuNavigation adminEventCards = adminuser.addPage(null, null); MenuNavigation adminEventCards = adminuser.addPage(null, null);
adminEventCards.setKey("subnavi.cards"); adminEventCards.setKey("subnavi.cards");
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/OrgRoleView.java
...@@ -82,16 +82,16 @@ public class OrgRoleView extends GenericCDIView { ...@@ -82,16 +82,16 @@ public class OrgRoleView extends GenericCDIView {
} }
public void initForCreate() { public void initForCreate() {
if (requirePermissions(permbean.hasPermission(UserPermission.WRITE_ORGROLES))) { if (requirePermissions(permbean.hasPermission(UserPermission.WRITE_ORGROLES)) && orgRole == null) {
OrgRole role = new OrgRole(); OrgRole role = new OrgRole();
role.setEventOrganisation(eventBean.getCurrentEvent().getOrganiser()); role.setEventOrganisation(eventBean.getCurrentEvent().getOrganiser());
setOrgRole(role); orgRole = role;
super.beginConversation(); super.beginConversation();
} }
} }
public void initForEdit() { public void initForEdit() {
if (requirePermissions(permbean.hasPermission(UserPermission.WRITE_ORGROLES))) { if (requirePermissions(permbean.hasPermission(UserPermission.WRITE_ORGROLES)) && orgRole == null) {
orgRole = orgRoleBean.find(id); orgRole = orgRoleBean.find(id);
super.beginConversation(); super.beginConversation();
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!