fixes #29 and fixes #11 , menukorjailuja

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

@@ -105,12 +105,15 @@ public class MenuBean implements MenuBeanLocal {
 		userkauppa.addPage(menuitemfacade.findOrCreate("/shop/createBill"), BillPermission.CREATE_BILL);
 		userkauppa.addPage(menuitemfacade.findOrCreate("/foodwave/list"), ShopPermission.SHOP_FOODWAVE);
 		userkauppa.addPage(menuitemfacade.findOrCreate("/bill/list"), BillPermission.VIEW_OWN);
+		userkauppa.addPage(menuitemfacade.findOrCreate("/bill/edit"), BillPermission.VIEW_OWN).setVisible(false);
+		userkauppa.addPage(menuitemfacade.findOrCreate("/bill/showBill"), BillPermission.VIEW_OWN).setVisible(false);
 		userkauppa.addPage(menuitemfacade.findOrCreate("/user/accountEvents"), UserPermission.VIEW_ACCOUNTEVENTS);
 
 		MenuNavigation userPlaces = usermenu.addPage(null, null);
 		userPlaces.setKey("topnavi.userplaces");
 		userPlaces.addPage(menuitemfacade.findOrCreate("/place/placemap"), MapPermission.VIEW);
 		userPlaces.addPage(menuitemfacade.findOrCreate("/place/myGroups"), MapPermission.BUY_PLACES);
+		userPlaces.addPage(menuitemfacade.findOrCreate("/place/edit"), MapPermission.MANAGE_OTHERS).setVisible(false);
 
 		MenuNavigation usercompetitions = usermenu.addPage(null, null);
 		usercompetitions.setKey("topnavi.competitions");

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

@@ -103,7 +103,7 @@
 
 			<nav>
 				<div id="menu">
-					<p:panelMenu model="#{primeMenuView.menuModel}" />
+					<p:panelMenu model="#{primeMenuView.menuModel}"  />
 					<h:link style="font-size: 10px;" rendered="#{readerView.shopToOthers}" outcome="/shop/showReaderEvents" value="Readers" />
 				</div>
 			</nav>

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

@@ -91,12 +91,18 @@ public class PrimeMenuView extends GenericCDIView {
 		{
 			menuModel = new DefaultMenuModel();
 			MenuNavigation selectedTop = layoutview.getSelectedTopmenu();
-			if (selectedTop == null)
+			
+			
+			
+			if (selectedTop == null) {
 				return null;
-
+			}
+			int testid = 3;
+			
 			for (MenuNavigation m : selectedTop.getChildren()) {
 				if (m.getItem() != null && m.getChildren().isEmpty()) {
 					DefaultMenuItem menuitem = mkMenuitem(m);
+					
 					if (menuitem != null) {
 						menuModel.addElement(menuitem);
 					}