Skip to content

Riina Antikainen / Moya

Go to a project
Commit 172e4d00 by Petri Jarvisalo
Options

menu change

1 parent 9f725a38
Inline Side-by-side
Showing with 4 additions and 3 deletions
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/MenuBean.java
...@@ -161,9 +161,7 @@ public class MenuBean implements MenuBeanLocal { ...@@ -161,9 +161,7 @@ public class MenuBean implements MenuBeanLocal {
adminEventCards.addPage(menuitemfacade.findOrCreate("/useradmin/editCardTemplate"), null).setVisible(false); adminEventCards.addPage(menuitemfacade.findOrCreate("/useradmin/editCardTemplate"), null).setVisible(false);
adminEventCards.addPage(menuitemfacade.findOrCreate("/shop/shopToUser"), null).setVisible(false); adminEventCards.addPage(menuitemfacade.findOrCreate("/shop/shopToUser"), null).setVisible(false);
adminEventCards.addPage(menuitemfacade.findOrCreate("/shop/assocToUser"), null).setVisible(false); adminEventCards.addPage(menuitemfacade.findOrCreate("/shop/assocToUser"), null).setVisible(false);
adminuser.addPage(menuitemfacade.findOrCreate("/eventorg/list"), EventPermission.MANAGE_PROPERTIES);
// shop // shop
MenuNavigation adminshop = adminmenu.addPage(null, null); MenuNavigation adminshop = adminmenu.addPage(null, null);
adminshop.setKey("topnavi.adminshop"); adminshop.setKey("topnavi.adminshop");
...@@ -214,6 +212,7 @@ public class MenuBean implements MenuBeanLocal { ...@@ -214,6 +212,7 @@ public class MenuBean implements MenuBeanLocal {
lognavi.addPage(menuitemfacade.findOrCreate("/actionlog/messagelist"), UserPermission.VIEW_ALL); lognavi.addPage(menuitemfacade.findOrCreate("/actionlog/messagelist"), UserPermission.VIEW_ALL);
lognavi.addPage(menuitemfacade.findOrCreate("/actionlog/taskview"), UserPermission.VIEW_ALL).setVisible(false); lognavi.addPage(menuitemfacade.findOrCreate("/actionlog/taskview"), UserPermission.VIEW_ALL).setVisible(false);
adminevent.addPage(menuitemfacade.findOrCreate("/eventorg/list"), EventPermission.MANAGE_PROPERTIES);
navifacade.create(adminmenu); navifacade.create(adminmenu);
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties
...@@ -700,6 +700,7 @@ submenu.auth.sendResetMail = Password reset ...@@ -700,6 +700,7 @@ submenu.auth.sendResetMail = Password reset
submenu.bill.billSummary = Bill summary submenu.bill.billSummary = Bill summary
submenu.bill.list = My bills submenu.bill.list = My bills
submenu.bill.listAll = All bills submenu.bill.listAll = All bills
submenu.eventorg.list = Manage Event
submenu.feedback.index = Feedback submenu.feedback.index = Feedback
submenu.foodadmin.createTemplate = Create foodwave template submenu.foodadmin.createTemplate = Create foodwave template
submenu.foodadmin.listTemplates = List foodwave templates submenu.foodadmin.listTemplates = List foodwave templates
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties
...@@ -683,6 +683,7 @@ submenu.auth.sendResetMail = Salasanan palautus ...@@ -683,6 +683,7 @@ submenu.auth.sendResetMail = Salasanan palautus
submenu.bill.billSummary = Laskujen yhteenveto submenu.bill.billSummary = Laskujen yhteenveto
submenu.bill.list = N\u00E4yt\u00E4 omat laskut submenu.bill.list = N\u00E4yt\u00E4 omat laskut
submenu.bill.listAll = Kaikki laskut submenu.bill.listAll = Kaikki laskut
submenu.eventorg.list = Organisaation hallinta
submenu.feedback.index = Palaute submenu.feedback.index = Palaute
submenu.foodadmin.createTemplate = Luo tilauspohja submenu.foodadmin.createTemplate = Luo tilauspohja
submenu.foodadmin.listTemplates = Muokkaa tilauspohjia submenu.foodadmin.listTemplates = Muokkaa tilauspohjia
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!