Skip to content

Linnea Samila / Moya

Go to a project
Commit e96331f9 by Tuukka Kivilahti
Options

foodwave fixes

1 parent dbe070a0
Inline Side-by-side
Showing with 9 additions and 3 deletions
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/MenuBean.java
...@@ -119,6 +119,9 @@ public class MenuBean implements MenuBeanLocal { ...@@ -119,6 +119,9 @@ public class MenuBean implements MenuBeanLocal {
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("/foodwave/listProducts"), ShopPermission.SHOP_FOODWAVE).setVisible(false);
userkauppa.addPage(menuitemfacade.findOrCreate("/foodwave/ThanksForOrderingFromCounter"), ShopPermission.SHOP_FOODWAVE).setVisible(false);
userkauppa.addPage(menuitemfacade.findOrCreate("/bill/list"), BillPermission.VIEW_OWN); 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/edit"), BillPermission.VIEW_OWN).setVisible(false);
userkauppa.addPage(menuitemfacade.findOrCreate("/bill/showBill"), BillPermission.VIEW_OWN).setVisible(false); userkauppa.addPage(menuitemfacade.findOrCreate("/bill/showBill"), BillPermission.VIEW_OWN).setVisible(false);
...@@ -471,6 +474,7 @@ public class MenuBean implements MenuBeanLocal { ...@@ -471,6 +474,7 @@ public class MenuBean implements MenuBeanLocal {
MenuNavigation foodwaveTopmenu = usernavi.addPage(null, null); MenuNavigation foodwaveTopmenu = usernavi.addPage(null, null);
foodwaveTopmenu.setKey("topnavi.foodwave"); foodwaveTopmenu.setKey("topnavi.foodwave");
foodwaveTopmenu.addPage(menuitemfacade.findOrCreate("/foodwave/list"), ShopPermission.SHOP_FOODWAVE); foodwaveTopmenu.addPage(menuitemfacade.findOrCreate("/foodwave/list"), ShopPermission.SHOP_FOODWAVE);
// foodwaveTopmenu.addPage(menuitemfacade.findOrCreate("/foodwave/listTemplates"), // foodwaveTopmenu.addPage(menuitemfacade.findOrCreate("/foodwave/listTemplates"),
// ShopPermission.SHOP_FOODWAVE); // ShopPermission.SHOP_FOODWAVE);
foodwaveTopmenu.addPage(menuitemfacade.findOrCreate("/foodwave/listProducts"), ShopPermission.SHOP_FOODWAVE).setVisible(false); foodwaveTopmenu.addPage(menuitemfacade.findOrCreate("/foodwave/listProducts"), ShopPermission.SHOP_FOODWAVE).setVisible(false);
......
code/MoyaWeb/WebContent/foodwave/list.xhtml
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
template="#{sessionHandler.template}"> template="#{sessionHandler.template}">
<f:metadata> <f:metadata>
<f:viewParam name="userid" value="#{userView.userid}" /> <f:viewParam name="userid" value="#{userView.userid}" />
<f:viewParam name="templateid" value="#{foodWaveView.templateId}" />
<f:event type="preRenderView" listener="#{foodWaveView.initListFoodwaves}" /> <f:event type="preRenderView" listener="#{foodWaveView.initListFoodwaves}" />
</f:metadata> </f:metadata>
......
code/MoyaWeb/WebContent/resources/cditools/foodwave/list.xhtml
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<h:outputScript library="primefaces" name="jquery/jquery.js" /> <h:outputScript library="primefaces" name="jquery/jquery.js" />
<p:dataTable columnClasses="nowrap,numalign,numalign,nowrap,numalign" styleClass="bordertable" value="#{foodWaveView.foodWaves}" var="foodwave" sortBy="#{foodwave.time.time}" rowStyleClass="#{foodwave.isFull() ? 'closed' : null}"> <p:dataTable columnClasses="nowrap,numalign,numalign,nowrap,numalign" styleClass="bordertable" value="#{foodWaveView.foodWaves}" var="foodwave" sortBy="#{foodwave.time.time}" rowStyleClass="#{foodwave.isFull() ? 'closed' : null}">
<p:column sortBy="#{i18n['foodWave.name']}"> <p:column sortBy="#{foodwave.name}">
<f:facet name="header"> <f:facet name="header">
<h:outputLabel id="name" value="#{i18n['foodWave.name']}" /> <h:outputLabel id="name" value="#{i18n['foodWave.name']}" />
</f:facet> </f:facet>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</p:column> </p:column>
<p:column sortBy="#{foodwave.template.name}"> <p:column sortBy="#{foodwave.template.name}">
<f:facet name="header"> <f:facet name="header">
<h:outputText value="Menu" /> <h:outputText value="#{i18n['foodwave.template.name']}" />
</f:facet> </f:facet>
<h:outputText value="#{foodwave.template.name}"> <h:outputText value="#{foodwave.template.name}">
<f:param name="foodwaveid" value="#{foodwave.id}" /> <f:param name="foodwaveid" value="#{foodwave.id}" />
......
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/shop/FoodWaveView.java
...@@ -108,6 +108,9 @@ public class FoodWaveView extends GenericCDIView { ...@@ -108,6 +108,9 @@ public class FoodWaveView extends GenericCDIView {
return "/foodmanager/listFoodwaves"; return "/foodmanager/listFoodwaves";
} }
public void initListFoodwaves() public void initListFoodwaves()
{ {
if (super.requirePermissions(ShopPermission.SHOP_FOODWAVE) && template == null) if (super.requirePermissions(ShopPermission.SHOP_FOODWAVE) && template == null)
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!