Merge branch 'master' of dev.intra.insomnia.fi:/data/bortal

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/RoleBeanLocal.java

@@ -31,6 +31,4 @@ public interface RoleBeanLocal {
 
 
 	public Role setPermissions(Role role, List<IAppPermission> newPerms);
 	public Role setPermissions(Role role, List<IAppPermission> newPerms);
 
 
-	public Object getEmptyRole();
-
 }
 }

code/LanBortalWeb/WebContent/product/createDiscount.xhtml

@@ -12,10 +12,7 @@
 	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
 	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
 
 
 		<ui:define name="content">
 		<ui:define name="content">
-			<h:link id="back" outcome="/product/edit" value="#{i18n['product.returnProductEdit']} #{productView.product.name}">
-			<f:param name="productid" value="#{productView.product.id}"/>
-			</h:link>
-			
+				
 			<products:manageDiscount commitaction="#{productView.createDiscount()}" commitvalue="#{i18n['discount.create']}" />
 			<products:manageDiscount commitaction="#{productView.createDiscount()}" commitvalue="#{i18n['discount.create']}" />
 
 
 
 

code/LanBortalWeb/WebContent/resources/cditools/products/manageDiscount.xhtml

@@ -14,6 +14,9 @@
 
 
 <composite:implementation>
 <composite:implementation>
 	<h:form id="discountform">
 	<h:form id="discountform">
+		<h:link id="back" outcome="/product/edit" value="#{i18n['product.returnProductEdit']} #{productView.product.name}">
+			<f:param name="productid" value="#{productView.product.id}" />
+		</h:link>
 		<h:panelGrid columns="2">
 		<h:panelGrid columns="2">
 			<h:outputLabel value="#{i18n['discount.shortdesc']}:" />
 			<h:outputLabel value="#{i18n['discount.shortdesc']}:" />
 			<h:inputText value="#{productView.discount.shortdesc}" />
 			<h:inputText value="#{productView.discount.shortdesc}" />

code/LanBortalWeb/WebContent/shop/shopToUser.xhtml

@@ -7,7 +7,6 @@
 >
 >
 <h:body>
 <h:body>
 	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
 	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
-		<ui:param name="thispage" value="page.eventorg.list" />
 		<f:metadata>
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{productShopView.initView}" />
 			<f:event type="preRenderView" listener="#{productShopView.initView}" />
 		</f:metadata>
 		</f:metadata>