Skip to content

Codecrew / Moya

Go to a project
Commit 7efd3a8a by Antti Tonkyra
Options

Merge branch 'devel' of codecrew.fi:bortal into devel

2 parents ce258baf 2e9fa114
Inline Side-by-side
Showing with 2 additions and 2 deletions
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/MenuBean.java
...@@ -74,7 +74,7 @@ public class MenuBean implements MenuBeanLocal { ...@@ -74,7 +74,7 @@ public class MenuBean implements MenuBeanLocal {
logger.info("Initializing new default menu"); logger.info("Initializing new default menu");
LanEvent ev = eventbean.getCurrentEvent(); LanEvent ev = eventbean.getCurrentEvent();
MenuNavigation usermenu = new MenuNavigation(ev, "topmenu.user", 40); MenuNavigation usermenu = new MenuNavigation(ev, "topmenu.user", 5);
usermenu.addPage(menuitemfacade.findOrCreate("/frontpage"), 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);
......
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/menu/MenuView.java
...@@ -91,7 +91,7 @@ public class MenuView { ...@@ -91,7 +91,7 @@ public class MenuView {
// logger.info("Executed menuchange-eventlistener for menuChange {} newval {}", menuChange, e.getNewValue()); // logger.info("Executed menuchange-eventlistener for menuChange {} newval {}", menuChange, e.getNewValue());
menuChange = e.getNewValue().toString(); menuChange = e.getNewValue().toString();
layoutview.setPageName(menuChange); layoutview.setPageName(menuChange);
navihandler.forward(menuChange); navihandler.forward(menuChange + "?faces-redirect=true");
// super.navihandler.forward(menuChange); // super.navihandler.forward(menuChange);
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!