Skip to content

Linnea Samila / Moya

Go to a project
Commit 27c238c7 by Tuomas Riihimäki
Options

Menufixing

1 parent bf9adcc2
Inline Side-by-side
Showing with 37 additions and 25 deletions
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/MenuBean.java
...@@ -23,7 +23,6 @@ import fi.codecrew.moya.facade.MenuNavigationFacade; ...@@ -23,7 +23,6 @@ import fi.codecrew.moya.facade.MenuNavigationFacade;
import fi.codecrew.moya.facade.MenuitemFacade; import fi.codecrew.moya.facade.MenuitemFacade;
import fi.codecrew.moya.model.LanEvent; import fi.codecrew.moya.model.LanEvent;
import fi.codecrew.moya.model.MenuNavigation; import fi.codecrew.moya.model.MenuNavigation;
import fi.codecrew.moya.model.Menuitem;
/** /**
* Session Bean implementation class Menubean * Session Bean implementation class Menubean
...@@ -71,13 +70,10 @@ public class MenuBean implements MenuBeanLocal { ...@@ -71,13 +70,10 @@ public class MenuBean implements MenuBeanLocal {
int menusort = 100; int menusort = 100;
logger.info("Initializing new default menu"); logger.info("Initializing new default menu");
LanEvent ev = eventbean.getCurrentEvent(); LanEvent ev = eventbean.getCurrentEvent();
Menuitem idxpage = menuitemfacade.findOrCreate("/index");
MenuNavigation usermenu = new MenuNavigation(ev, "topnavi.usernavi", menusort = +10); MenuNavigation usermenu = new MenuNavigation(ev, "topnavi.usernavi", menusort = +10);
// usermenu.setItem(idxpage);
// usermenu.setPermission( UserPermission.ANYUSER); usermenu.addPage(menuitemfacade.findOrCreate("/index"), UserPermission.ANYUSER);
usermenu.addPage(idxpage, 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);
...@@ -87,43 +83,43 @@ public class MenuBean implements MenuBeanLocal { ...@@ -87,43 +83,43 @@ public class MenuBean implements MenuBeanLocal {
usermenu.addPage(menuitemfacade.findOrCreate("/auth/resetmailSent"), null).setVisible(false); usermenu.addPage(menuitemfacade.findOrCreate("/auth/resetmailSent"), null).setVisible(false);
usermenu.addPage(menuitemfacade.findOrCreate("/auth/passwordChanged"), null).setVisible(false); usermenu.addPage(menuitemfacade.findOrCreate("/auth/passwordChanged"), null).setVisible(false);
usermenu.addPage(menuitemfacade.findOrCreate("/auth/notauthorized"), null).setVisible(false); usermenu.addPage(menuitemfacade.findOrCreate("/auth/notauthorized"), null).setVisible(false);
MenuNavigation userEvent = usermenu.addPage(null, null); MenuNavigation userEvent = usermenu.addPage(null, null);
userEvent.setKey("topnavi.userevent"); userEvent.setKey("topnavi.userevent");
userEvent.addPage(menuitemfacade.findOrCreate("/place/placemap"), MapPermission.VIEW); userEvent.addPage(menuitemfacade.findOrCreate("/place/placemap"), MapPermission.VIEW);
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("/feedback/index"), UserPermission.ANYUSER);
userEvent.addPage(menuitemfacade.findOrCreate("/user/invite"), UserPermission.ANYUSER); userEvent.addPage(menuitemfacade.findOrCreate("/user/invite"), UserPermission.ANYUSER);
MenuNavigation userkauppa = usermenu.addPage(null, null); MenuNavigation userkauppa = usermenu.addPage(null, null);
userkauppa.setKey("topnavi.usershop"); userkauppa.setKey("topnavi.usershop");
userkauppa.addPage(menuitemfacade.findOrCreate("/shop/createBill"), BillPermission.CREATE_BILL); userkauppa.addPage(menuitemfacade.findOrCreate("/shop/createBill"), BillPermission.CREATE_BILL);
userkauppa.addPage(menuitemfacade.findOrCreate("/foodwave/list"), ShopPermission.SHOP_FOODWAVE); userkauppa.addPage(menuitemfacade.findOrCreate("/foodwave/list"), ShopPermission.SHOP_FOODWAVE);
userkauppa.addPage(menuitemfacade.findOrCreate("/bill/list"), BillPermission.VIEW_OWN); userkauppa.addPage(menuitemfacade.findOrCreate("/bill/list"), BillPermission.VIEW_OWN);
MenuNavigation usercompetitions = usermenu.addPage(null, null); MenuNavigation usercompetitions = usermenu.addPage(null, null);
usercompetitions.setKey("topnavi.competitions"); usercompetitions.setKey("topnavi.competitions");
usercompetitions.addPage(menuitemfacade.findOrCreate("/voting/compolist"), CompoPermission.VIEW_COMPOS); usercompetitions.addPage(menuitemfacade.findOrCreate("/voting/compolist"), CompoPermission.VIEW_COMPOS);
usercompetitions.addPage(menuitemfacade.findOrCreate("/voting/myEntries"), CompoPermission.VIEW_COMPOS); usercompetitions.addPage(menuitemfacade.findOrCreate("/voting/myEntries"), CompoPermission.VIEW_COMPOS);
usercompetitions.addPage(menuitemfacade.findOrCreate("/voting/submitEntry"), null).setVisible(false); usercompetitions.addPage(menuitemfacade.findOrCreate("/voting/submitEntry"), null).setVisible(false);
usercompetitions.addPage(menuitemfacade.findOrCreate("/voting/details"), null).setVisible(false); usercompetitions.addPage(menuitemfacade.findOrCreate("/voting/details"), null).setVisible(false);
/* MenuNavigation createuser = usermenu.addPage(null, null); /*
createuser.setKey("topnavi.createuser"); * MenuNavigation createuser = usermenu.addPage(null, null);
createuser.addPage(menuitemfacade.findOrCreate("/user/create"), UserPermission.CREATE_NEW); */ * createuser.setKey("topnavi.createuser");
* createuser.addPage(menuitemfacade.findOrCreate("/user/create"),
* UserPermission.CREATE_NEW);
*/
navifacade.create(usermenu); navifacade.create(usermenu);
Menuitem adminlist = menuitemfacade.findOrCreate("/useradmin/list");
MenuNavigation adminmenu = new MenuNavigation(ev, "topnavi.adminnavi", menusort = +10); MenuNavigation adminmenu = new MenuNavigation(ev, "topnavi.adminnavi", menusort = +10);
// adminmenu.setItem(adminlist); //
// adminmenu.setPermission(UserPermission.VIEW_ALL);
//
MenuNavigation adminuser = adminmenu.addPage(null, null); MenuNavigation adminuser = adminmenu.addPage(null, null);
adminuser.setKey("topnavi.usermgmt"); adminuser.setKey("topnavi.usermgmt");
adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/create"), UserPermission.VIEW_ALL); 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/edit"), UserPermission.VIEW_ALL).setVisible(false);
adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/changePassword"), 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); adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/accountEvents"), UserPermission.VIEW_ALL).setVisible(false);
...@@ -408,8 +404,8 @@ public class MenuBean implements MenuBeanLocal { ...@@ -408,8 +404,8 @@ public class MenuBean implements MenuBeanLocal {
} }
@Override @Override
public MenuNavigation findNavigationId(Integer id) { public MenuNavigation findNavigationId(Integer id) {
return navifacade.find(id); return navifacade.find(id);
} }
} }
code/MoyaWeb/WebContent/resources/templates/template1/template.xhtml
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
<h:form> <h:form>
<p:selectOneMenu value="#{menuView.menuChange}"> <p:selectOneMenu value="#{menuView.menuChange}">
<p:ajax listener="#{menuView.menuChangeEvent}" /> <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> </p:selectOneMenu>
</h:form> </h:form>
</div> </div>
......
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/menu/JsfMenuitem.java
...@@ -8,6 +8,11 @@ public class JsfMenuitem { ...@@ -8,6 +8,11 @@ public class JsfMenuitem {
private final MenuNavigation navigation; private final MenuNavigation navigation;
private String outcome; private String outcome;
public JsfMenuitem(String key, String outcome) {
this.navigation = new MenuNavigation(null, key, null);
this.outcome = outcome;
}
public JsfMenuitem(MenuNavigation navi) { public JsfMenuitem(MenuNavigation navi) {
this.navigation = navi; this.navigation = navi;
if (navi.getSitepage() != null) { if (navi.getSitepage() != null) {
......
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/menu/MenuView.java
package fi.codecrew.moya.web.cdiview.menu; package fi.codecrew.moya.web.cdiview.menu;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedList; import java.util.LinkedList;
...@@ -9,8 +10,6 @@ import java.util.Map; ...@@ -9,8 +10,6 @@ import java.util.Map;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
import javax.faces.context.FacesContext; import javax.faces.context.FacesContext;
import javax.faces.event.ValueChangeEvent;
import javax.faces.event.ValueChangeListener;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
...@@ -20,7 +19,6 @@ import org.slf4j.LoggerFactory; ...@@ -20,7 +19,6 @@ import org.slf4j.LoggerFactory;
import fi.codecrew.moya.beans.MenuBeanLocal; import fi.codecrew.moya.beans.MenuBeanLocal;
import fi.codecrew.moya.beans.SitePageBeanLocal; import fi.codecrew.moya.beans.SitePageBeanLocal;
import fi.codecrew.moya.model.MenuNavigation; import fi.codecrew.moya.model.MenuNavigation;
import fi.codecrew.moya.model.Menuitem;
import fi.codecrew.moya.model.PageContent; import fi.codecrew.moya.model.PageContent;
import fi.codecrew.moya.web.cdiview.GenericCDIView; import fi.codecrew.moya.web.cdiview.GenericCDIView;
import fi.codecrew.moya.web.helper.LayoutView; import fi.codecrew.moya.web.helper.LayoutView;
...@@ -85,6 +83,19 @@ public class MenuView extends GenericCDIView { ...@@ -85,6 +83,19 @@ public class MenuView extends GenericCDIView {
super.navihandler.forward(menuChange); 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() public LinkedList<List<JsfMenuitem>> getMenus()
{ {
if (menus == null) if (menus == null)
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!