Merge branch 'master' of codecrew.fi:bortal

code/LanBortalWeb/WebContent/foodadmin/createTemplate.xhtml

@@ -23,11 +23,10 @@
 
 		<ui:define name="content">
 			<h:form>
-				<p:wizard>
-					<p:tab id="basicinfo" title="#{i18n['foodwavetemplate.basicinfo']}">
+				<!-- 				<p:wizard>
+					<p:tab id="basicinfo" title="#{i18n['foodwavetemplate.basicinfo']}"> -->
 				<h:panelGrid columns="3">
-							<h:outputLabel for="name"
-								value="#{i18n['foodwavetemplate.name']}" />
+					<h:outputLabel for="name" value="#{i18n['foodwavetemplate.name']}" />
 					<h:inputText id="name" value="#{foodWaveView.template.name}"
 						required="true" requiredMessage="Name required" />
 					<h:message for="name" />
@@ -39,9 +38,9 @@
 						requiredMessage="Description required" />
 					<h:message for="description" />
 				</h:panelGrid>
-					</p:tab>
+				<!-- 				</p:tab>
 					<p:tab id="selectproducts"
-						title="#{i18n['foodwavetemplate.selectproducts']}">
+						title="#{i18n['foodwavetemplate.selectproducts']}"> -->
 				<h:messages />
 				<h:panelGrid columns="4">
 
@@ -114,10 +113,12 @@
 				</p:dataTable>
 
 				<h:commandButton action="#{foodWaveView.saveTemplate()}"
-							value="#{i18n['foodwavetemplate.savetemplate']}" />
-					</p:tab>
+					value="#{i18n['foodwavetemplate.savetemplate']}">
+					<f:param value="#{foodWaveView.templateId}" name="id" />
+				</h:commandButton>>
+				<!--  </p:tab> -->
 
-				</p:wizard>
+				<!-- </p:wizard> -->
 			</h:form>
 
 

code/LanBortalWeb/WebContent/foodadmin/editTemplate.xhtml

@@ -13,9 +13,9 @@
 	<ui:composition
 		template="/layout/#{sessionHandler.layout}/template.xhtml">
 		<f:metadata>
+			<f:viewParam name="id" value="#{foodWaveView.templateId}" />
 			<f:event type="preRenderView"
 				listener="#{foodWaveView.initEditTemplate()}" />
-			<f:viewParam name="id" value="#{foodWaveView.templateId}" />
 		</f:metadata>
 
 		<ui:define name="title">
@@ -43,7 +43,8 @@
 					</h:panelGrid>
 					<h:selectOneMenu value="#{foodWaveView.currentProduct}"
 						converter="#{productConverter}">
-						<f:selectItems value="#{foodWaveView.products}" var="product" itemLabel="#{product.name}"></f:selectItems>
+						<f:selectItems value="#{foodWaveView.products}" var="product"
+							itemLabel="#{product.name}"></f:selectItems>
 					</h:selectOneMenu>
 					<p:commandButton value="#{i18n['foodwavetemplate.addproduct']}"
 						actionListener="#{foodWaveView.addProductToTemplate}"
@@ -68,7 +69,8 @@
 								update="productTable" />
 
 						</h:panelGrid>
--->						<p:dataTable name="productTable" id="productTable"
+-->
+					<p:dataTable name="productTable" id="productTable"
 						value="#{foodWaveView.template.products}" var="product"
 						editable="true">
 						<p:column headerText="#{i18n['foodwavetemplate.productname']}">
@@ -118,8 +120,11 @@
 						</p:column>
 					</p:dataTable>
 					<h:commandButton action="#{foodWaveView.saveTemplate()}"
-							value="#{i18n['foodwavetemplate.savetemplate']}" /> <!-- -->
+						value="#{i18n['foodwavetemplate.savetemplate']}" />
+					<!-- -->
 				</p:panel>
+			</h:form>
+			<h:form>
 				<p:panel header="#{i18n['foodwavetemplate.createwave']}">
 					<h:panelGrid columns="3">
 						<h:outputLabel for="waveName"
@@ -145,11 +150,6 @@
 						value="#{i18n['foodwavetemplate.createFoodwave']}" />
 				</p:panel>
 			</h:form>
-			<ui:fragment>
-
-
-			</ui:fragment>
-
 		</ui:define>
 	</ui:composition>
 </h:body>

code/LanBortalWeb/WebContent/foodadmin/listTemplates.xhtml

@@ -24,7 +24,7 @@
 				</h:column>
 				<h:column>
 					<h:link value="LOL" outcome="/foodadmin/editTemplate">
-						<f:param value="#{foodwaveTemplate.id}" name="id"/>
+						<f:param value="#{foodWaveView.templateId}" name="id"/>
 					</h:link>
 				</h:column>
 			</h:dataTable>