listtemplate mergeily

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/PermissionBean.java

@@ -51,6 +51,7 @@ import fi.insomnia.bortal.model.User;
 		MapPermission.S_MANAGE_MAPS,
 		MapPermission.S_MANAGE_MAPS,
 		MapPermission.S_MANAGE_OTHERS,
 		MapPermission.S_MANAGE_OTHERS,
 		MapPermission.S_BUY_PLACES,
 		MapPermission.S_BUY_PLACES,
+		MapPermission.S_RELEASE_PLACE,
 
 
 		ShopPermission.S_LIST_ALL_PRODUCTS,
 		ShopPermission.S_LIST_ALL_PRODUCTS,
 		ShopPermission.S_LIST_USERPRODUCTS,
 		ShopPermission.S_LIST_USERPRODUCTS,

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/PlaceBean.java

@@ -459,7 +459,7 @@ public class PlaceBean implements PlaceBeanLocal {
 	 * @return true when successfull, on any erroro false.
 	 * @return true when successfull, on any erroro false.
 	 */
 	 */
 	@Override
 	@Override
-	@RolesAllowed(MapPermission.S_BUY_PLACES)
+	@RolesAllowed({ MapPermission.S_RELEASE_PLACE, MapPermission.S_MANAGE_OTHERS })
 	public boolean releasePlace(Place place) {
 	public boolean releasePlace(Place place) {
 		place = placeFacade.find(place.getId());
 		place = placeFacade.find(place.getId());
 		EventUser user = permbean.getCurrentUser();
 		EventUser user = permbean.getCurrentUser();

code/LanBortalUtilities/src/fi/insomnia/bortal/enums/apps/MapPermission.java

@@ -6,7 +6,7 @@ public enum MapPermission implements IAppPermission {
 	MANAGE_OTHERS, // ("Manage other users reservations in map"),
 	MANAGE_OTHERS, // ("Manage other users reservations in map"),
 	BUY_PLACES, // ("Reserve and buy places from map"),
 	BUY_PLACES, // ("Reserve and buy places from map"),
 	VIEW, // ("View maps"),
 	VIEW, // ("View maps"),
-	MANAGE_MAPS, // ("Create and modify maps")
+	MANAGE_MAPS, RELEASE_PLACE, // ("Create and modify maps")
 
 
 	;
 	;
 
 
@@ -14,7 +14,7 @@ public enum MapPermission implements IAppPermission {
 	public static final String S_BUY_PLACES = "MAP/BUY_PLACES";
 	public static final String S_BUY_PLACES = "MAP/BUY_PLACES";
 	public static final String S_VIEW = "MAP/VIEW";
 	public static final String S_VIEW = "MAP/VIEW";
 	public static final String S_MANAGE_MAPS = "MAP/MANAGE_MAPS";
 	public static final String S_MANAGE_MAPS = "MAP/MANAGE_MAPS";
-
+	public static final String S_RELEASE_PLACE = "MAP/RELEASE_PLACE";
 	private final String fullName;
 	private final String fullName;
 	private final String key;
 	private final String key;
 	private static final String I18N_HEADER = "bortalApplication.map.";
 	private static final String I18N_HEADER = "bortalApplication.map.";

code/LanBortalWeb/WebContent/foodadmin/listTemplates.xhtml

@@ -31,8 +31,8 @@
 					<h:outputText value="#{foodwaveTemplate.name}" />
 					<h:outputText value="#{foodwaveTemplate.name}" />
 				</h:column>
 				</h:column>
 				<h:column>
 				<h:column>
-					<h:link value="LOL" outcome="/foodadmin/editTemplate">
-						<f:param value="#{foodWaveView.templateId}" name="id" />
+					<h:link value="#{i18n['foodadmin.editTemplate']}" outcome="/foodadmin/editTemplate">
+						<f:param value="#{foodwaveTemplate.id}" name="id"/>
 					</h:link>
 					</h:link>
 				</h:column>
 				</h:column>
 			</h:dataTable>
 			</h:dataTable>