Menufixing

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/MenuBean.java

@@ -23,7 +23,6 @@ import fi.codecrew.moya.facade.MenuNavigationFacade;
 import fi.codecrew.moya.facade.MenuitemFacade;
 import fi.codecrew.moya.model.LanEvent;
 import fi.codecrew.moya.model.MenuNavigation;
-import fi.codecrew.moya.model.Menuitem;
 
 /**
  * Session Bean implementation class Menubean
@@ -71,13 +70,10 @@ public class MenuBean implements MenuBeanLocal {
 		int menusort = 100;
 		logger.info("Initializing new default menu");
 		LanEvent ev = eventbean.getCurrentEvent();
-		Menuitem idxpage = menuitemfacade.findOrCreate("/index");
 
 		MenuNavigation usermenu = new MenuNavigation(ev, "topnavi.usernavi", menusort = +10);
-//		usermenu.setItem(idxpage);
-//		usermenu.setPermission( UserPermission.ANYUSER);
 
-		usermenu.addPage(idxpage, UserPermission.ANYUSER);
+		usermenu.addPage(menuitemfacade.findOrCreate("/index"), UserPermission.ANYUSER);
 		usermenu.addPage(menuitemfacade.findOrCreate("/permissionDenied"), null).setVisible(false);
 		usermenu.addPage(menuitemfacade.findOrCreate("/auth/login"), null).setVisible(false);
 		usermenu.addPage(menuitemfacade.findOrCreate("/auth/loginError"), null).setVisible(false);
@@ -109,21 +105,21 @@ public class MenuBean implements MenuBeanLocal {
 		usercompetitions.addPage(menuitemfacade.findOrCreate("/voting/submitEntry"), null).setVisible(false);
 		usercompetitions.addPage(menuitemfacade.findOrCreate("/voting/details"), null).setVisible(false);
 
-		/* MenuNavigation createuser = usermenu.addPage(null, null);
-		createuser.setKey("topnavi.createuser");
-		createuser.addPage(menuitemfacade.findOrCreate("/user/create"), UserPermission.CREATE_NEW); */
+		/*
+		 * MenuNavigation createuser = usermenu.addPage(null, null);
+		 * createuser.setKey("topnavi.createuser");
+		 * createuser.addPage(menuitemfacade.findOrCreate("/user/create"),
+		 * UserPermission.CREATE_NEW);
+		 */
 
 		navifacade.create(usermenu);
 
-		Menuitem adminlist = menuitemfacade.findOrCreate("/useradmin/list");
 		MenuNavigation adminmenu = new MenuNavigation(ev, "topnavi.adminnavi", menusort = +10);
-//		adminmenu.setItem(adminlist);
-//		adminmenu.setPermission(UserPermission.VIEW_ALL);
-//	
+		//
 		MenuNavigation adminuser = adminmenu.addPage(null, null);
 		adminuser.setKey("topnavi.usermgmt");
 		adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/create"), UserPermission.VIEW_ALL);
-		adminuser.addPage(adminlist, UserPermission.VIEW_ALL);
+		adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/list"), UserPermission.VIEW_ALL);
 		adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/edit"), UserPermission.VIEW_ALL).setVisible(false);
 		adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/changePassword"), UserPermission.VIEW_ALL).setVisible(false);
 		adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/accountEvents"), UserPermission.VIEW_ALL).setVisible(false);

code/MoyaWeb/WebContent/resources/templates/template1/template.xhtml

@@ -103,7 +103,7 @@
 								<h:form>
 									<p:selectOneMenu value="#{menuView.menuChange}">
 										<p:ajax listener="#{menuView.menuChangeEvent}" />
-										<f:selectItems var="menuitem" value="#{menuView.getMenu(0)}" itemLabel="#{i18n[menuitem.navigation.key]}" itemValue="#{menuitem.outcome}" />
+										<f:selectItems var="menuitem" value="#{menuView.viewChangeTopmenu}" itemLabel="#{i18n[menuitem.navigation.key]}" itemValue="#{menuitem.outcome}" />
 									</p:selectOneMenu>
 								</h:form>
 							</div>

code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/menu/JsfMenuitem.java

@@ -8,6 +8,11 @@ public class JsfMenuitem {
 	private final MenuNavigation navigation;
 	private String outcome;
 
+	public JsfMenuitem(String key, String outcome) {
+		this.navigation = new MenuNavigation(null, key, null);
+		this.outcome = outcome;
+	}
+
 	public JsfMenuitem(MenuNavigation navi) {
 		this.navigation = navi;
 		if (navi.getSitepage() != null) {

code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/menu/MenuView.java

 package fi.codecrew.moya.web.cdiview.menu;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -9,8 +10,6 @@ import java.util.Map;
 import javax.ejb.EJB;
 import javax.enterprise.context.RequestScoped;
 import javax.faces.context.FacesContext;
-import javax.faces.event.ValueChangeEvent;
-import javax.faces.event.ValueChangeListener;
 import javax.inject.Inject;
 import javax.inject.Named;
 
@@ -20,7 +19,6 @@ import org.slf4j.LoggerFactory;
 import fi.codecrew.moya.beans.MenuBeanLocal;
 import fi.codecrew.moya.beans.SitePageBeanLocal;
 import fi.codecrew.moya.model.MenuNavigation;
-import fi.codecrew.moya.model.Menuitem;
 import fi.codecrew.moya.model.PageContent;
 import fi.codecrew.moya.web.cdiview.GenericCDIView;
 import fi.codecrew.moya.web.helper.LayoutView;
@@ -85,6 +83,19 @@ public class MenuView extends GenericCDIView {
 		super.navihandler.forward(menuChange);
 	}
 
+	private List<JsfMenuitem> viewchangeTopmenu;
+
+	public List<JsfMenuitem> getViewChangeTopmenu()
+	{
+		if (viewchangeTopmenu == null) {
+			viewchangeTopmenu = new ArrayList<JsfMenuitem>();
+			viewchangeTopmenu.add(new JsfMenuitem("hasdasdasd", "/index"));
+			viewchangeTopmenu.add(new JsfMenuitem("hasdasdasd2", "/userevent/list"));
+		}
+		return viewchangeTopmenu;
+
+	}
+
 	public LinkedList<List<JsfMenuitem>> getMenus()
 	{
 		if (menus == null)