Skip to content

Max Mecklin / Moya

Go to a project
Commit a1b2cbb0 by Tuukka Kivilahti
Options

menu changes, anyuser is from my...

1 parent a4ddde17
Inline Side-by-side
Showing with 12 additions and 6 deletions
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/MenuBean.java
...@@ -75,7 +75,7 @@ public class MenuBean implements MenuBeanLocal { ...@@ -75,7 +75,7 @@ public class MenuBean implements MenuBeanLocal {
MenuNavigation usermenu = new MenuNavigation(ev, "topnavi.usernavi", menusort = +10); MenuNavigation usermenu = new MenuNavigation(ev, "topnavi.usernavi", menusort = +10);
usermenu.addPage(menuitemfacade.findOrCreate("/index"), UserPermission.ANYUSER); usermenu.addPage(menuitemfacade.findOrCreate("/frontpage"), UserPermission.ANYUSER);
usermenu.addPage(menuitemfacade.findOrCreate("/permissionDenied"), null).setVisible(false); usermenu.addPage(menuitemfacade.findOrCreate("/permissionDenied"), null).setVisible(false);
usermenu.addPage(menuitemfacade.findOrCreate("/auth/login"), null).setVisible(false); usermenu.addPage(menuitemfacade.findOrCreate("/auth/login"), null).setVisible(false);
usermenu.addPage(menuitemfacade.findOrCreate("/auth/loginError"), null).setVisible(false); usermenu.addPage(menuitemfacade.findOrCreate("/auth/loginError"), null).setVisible(false);
...@@ -89,8 +89,8 @@ public class MenuBean implements MenuBeanLocal { ...@@ -89,8 +89,8 @@ public class MenuBean implements MenuBeanLocal {
MenuNavigation userEvent = usermenu.addPage(null, null); MenuNavigation userEvent = usermenu.addPage(null, null);
userEvent.setKey("topnavi.userevent"); userEvent.setKey("topnavi.userevent");
userEvent.addPage(menuitemfacade.findOrCreate("/poll/index"), PollPermission.ANSWER); userEvent.addPage(menuitemfacade.findOrCreate("/poll/index"), PollPermission.ANSWER);
userEvent.addPage(menuitemfacade.findOrCreate("/feedback/index"), UserPermission.ANYUSER); userEvent.addPage(menuitemfacade.findOrCreate("/user/invite"), UserPermission.INVITE_USERS);
userEvent.addPage(menuitemfacade.findOrCreate("/user/invite"), UserPermission.ANYUSER); userEvent.addPage(menuitemfacade.findOrCreate("/feedback/index"), UserPermission.VITUTTAAKO);
MenuNavigation userkauppa = usermenu.addPage(null, null); MenuNavigation userkauppa = usermenu.addPage(null, null);
userkauppa.setKey("topnavi.usershop"); userkauppa.setKey("topnavi.usershop");
...@@ -229,8 +229,12 @@ public class MenuBean implements MenuBeanLocal { ...@@ -229,8 +229,12 @@ public class MenuBean implements MenuBeanLocal {
gamenavi.setKey("topnavi.license"); gamenavi.setKey("topnavi.license");
gamenavi.addPage(menuitemfacade.findOrCreate("/license/manageCodes"), LicensePermission.MANAGE); gamenavi.addPage(menuitemfacade.findOrCreate("/license/manageCodes"), LicensePermission.MANAGE);
adminevent.addPage(menuitemfacade.findOrCreate("/eventorg/list"), EventPermission.MANAGE_PROPERTIES); adminevent.addPage(menuitemfacade.findOrCreate("/eventorg/list"), EventPermission.MANAGE_PROPERTIES);
adminevent.addPage(menuitemfacade.findOrCreate("/feedback/index"), UserPermission.VITUTTAAKO);
navifacade.create(adminmenu); navifacade.create(adminmenu);
MenuNavigation shopmenu = new MenuNavigation(ev, "topnavi.shopnavi", menusort = +10); MenuNavigation shopmenu = new MenuNavigation(ev, "topnavi.shopnavi", menusort = +10);
...@@ -309,7 +313,7 @@ public class MenuBean implements MenuBeanLocal { ...@@ -309,7 +313,7 @@ public class MenuBean implements MenuBeanLocal {
MenuNavigation frontTopnavi = usernavi.addPage(null, null); MenuNavigation frontTopnavi = usernavi.addPage(null, null);
frontTopnavi.setKey("topnavi.frontpage"); frontTopnavi.setKey("topnavi.frontpage");
frontTopnavi.addPage(menuitemfacade.findOrCreate("/index"), UserPermission.ANYUSER); frontTopnavi.addPage(menuitemfacade.findOrCreate("/frontpage"), UserPermission.ANYUSER);
frontTopnavi.addPage(menuitemfacade.findOrCreate("/user/create"), UserPermission.CREATE_NEW); frontTopnavi.addPage(menuitemfacade.findOrCreate("/user/create"), UserPermission.CREATE_NEW);
frontTopnavi.addPage(menuitemfacade.findOrCreate("/auth/sendResetMail"), UserPermission.LOGIN); frontTopnavi.addPage(menuitemfacade.findOrCreate("/auth/sendResetMail"), UserPermission.LOGIN);
frontTopnavi.addPage(menuitemfacade.findOrCreate("/user/invite"), UserPermission.INVITE_USERS); frontTopnavi.addPage(menuitemfacade.findOrCreate("/user/invite"), UserPermission.INVITE_USERS);
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties
...@@ -875,7 +875,7 @@ submenu.bill.billSummary = Bill summary ...@@ -875,7 +875,7 @@ 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.eventorg.list = Manage Event
submenu.feedback.index = Feedback submenu.feedback.index = U Mad?!
submenu.foodadmin.createTemplate = Create foodwave template submenu.foodadmin.createTemplate = Create foodwave template
submenu.foodadmin.listTemplates = List foodwave templates submenu.foodadmin.listTemplates = List foodwave templates
submenu.foodmanager.listFoodwaves = List active foodwaves submenu.foodmanager.listFoodwaves = List active foodwaves
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties
...@@ -856,7 +856,7 @@ submenu.bill.billSummary = Laskujen yhteenveto ...@@ -856,7 +856,7 @@ 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.eventorg.list = Organisaation hallinta
submenu.feedback.index = Palaute submenu.feedback.index = Vituttaako?
submenu.foodadmin.createTemplate = Luo tilauspohja submenu.foodadmin.createTemplate = Luo tilauspohja
submenu.foodadmin.listTemplates = Muokkaa tilauspohjia submenu.foodadmin.listTemplates = Muokkaa tilauspohjia
submenu.foodmanager.listFoodwaves = Aktiiviset ruokatilaukset submenu.foodmanager.listFoodwaves = Aktiiviset ruokatilaukset
......
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/user/AuthView.java
...@@ -53,8 +53,10 @@ public class AuthView extends GenericCDIView { ...@@ -53,8 +53,10 @@ public class AuthView extends GenericCDIView {
logger.warn("Error executing logout", e); logger.warn("Error executing logout", e);
} }
} }
req.getSession().invalidate(); req.getSession().invalidate();
navihandler.forward("/index");
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!