Foodwavejuttuja ja useredittiä.

code/LanBortalDatabase/src/fi/insomnia/bortal/model/AccountEvent_.java

@@ -7,7 +7,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.827+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:35.503+0300")
 @StaticMetamodel(AccountEvent.class)
 @StaticMetamodel(AccountEvent.class)
 public class AccountEvent_ extends GenericEntity_ {
 public class AccountEvent_ extends GenericEntity_ {
 	public static volatile SingularAttribute<AccountEvent, Boolean> cash;
 	public static volatile SingularAttribute<AccountEvent, Boolean> cash;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/ActionLogMessageResponse_.java

@@ -6,7 +6,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.843+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:35.536+0300")
 @StaticMetamodel(ActionLogMessageResponse.class)
 @StaticMetamodel(ActionLogMessageResponse.class)
 public class ActionLogMessageResponse_ extends GenericEntity_ {
 public class ActionLogMessageResponse_ extends GenericEntity_ {
 	public static volatile SingularAttribute<ActionLogMessageResponse, Date> time;
 	public static volatile SingularAttribute<ActionLogMessageResponse, Date> time;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/ActionLogMessage_.java

@@ -7,7 +7,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.836+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:35.526+0300")
 @StaticMetamodel(ActionLogMessage.class)
 @StaticMetamodel(ActionLogMessage.class)
 public class ActionLogMessage_ extends GenericEntity_ {
 public class ActionLogMessage_ extends GenericEntity_ {
 	public static volatile SingularAttribute<ActionLogMessage, Date> time;
 	public static volatile SingularAttribute<ActionLogMessage, Date> time;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/ApplicationPermission_.java

@@ -4,7 +4,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.849+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:35.547+0300")
 @StaticMetamodel(ApplicationPermission.class)
 @StaticMetamodel(ApplicationPermission.class)
 public class ApplicationPermission_ extends GenericEntity_ {
 public class ApplicationPermission_ extends GenericEntity_ {
 	public static volatile SingularAttribute<ApplicationPermission, String> application;
 	public static volatile SingularAttribute<ApplicationPermission, String> application;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/BillLine_.java

@@ -5,7 +5,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.862+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:35.568+0300")
 @StaticMetamodel(BillLine.class)
 @StaticMetamodel(BillLine.class)
 public class BillLine_ extends GenericEntity_ {
 public class BillLine_ extends GenericEntity_ {
 	public static volatile SingularAttribute<BillLine, Bill> bill;
 	public static volatile SingularAttribute<BillLine, Bill> bill;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Bill_.java

@@ -7,7 +7,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.855+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:35.557+0300")
 @StaticMetamodel(Bill.class)
 @StaticMetamodel(Bill.class)
 public class Bill_ extends GenericEntity_ {
 public class Bill_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Bill, LanEvent> event;
 	public static volatile SingularAttribute<Bill, LanEvent> event;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/CardTemplate_.java

@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.868+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:35.575+0300")
 @StaticMetamodel(CardTemplate.class)
 @StaticMetamodel(CardTemplate.class)
 public class CardTemplate_ extends GenericEntity_ {
 public class CardTemplate_ extends GenericEntity_ {
 	public static volatile SingularAttribute<CardTemplate, LanEvent> event;
 	public static volatile SingularAttribute<CardTemplate, LanEvent> event;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryFile_.java

@@ -5,7 +5,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.892+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:35.604+0300")
 @StaticMetamodel(CompoEntryFile.class)
 @StaticMetamodel(CompoEntryFile.class)
 public class CompoEntryFile_ extends GenericEntity_ {
 public class CompoEntryFile_ extends GenericEntity_ {
 	public static volatile SingularAttribute<CompoEntryFile, String> mimeType;
 	public static volatile SingularAttribute<CompoEntryFile, String> mimeType;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryParticipant_.java

@@ -5,7 +5,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.899+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:35.614+0300")
 @StaticMetamodel(CompoEntryParticipant.class)
 @StaticMetamodel(CompoEntryParticipant.class)
 public class CompoEntryParticipant_ extends GenericEntity_ {
 public class CompoEntryParticipant_ extends GenericEntity_ {
 	public static volatile SingularAttribute<CompoEntryParticipant, CompoEntry> entry;
 	public static volatile SingularAttribute<CompoEntryParticipant, CompoEntry> entry;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntry_.java

@@ -6,7 +6,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.883+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:35.594+0300")
 @StaticMetamodel(CompoEntry.class)
 @StaticMetamodel(CompoEntry.class)
 public class CompoEntry_ extends GenericEntity_ {
 public class CompoEntry_ extends GenericEntity_ {
 	public static volatile SingularAttribute<CompoEntry, Compo> compo;
 	public static volatile SingularAttribute<CompoEntry, Compo> compo;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Compo_.java

@@ -6,7 +6,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.874+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:35.584+0300")
 @StaticMetamodel(Compo.class)
 @StaticMetamodel(Compo.class)
 public class Compo_ extends GenericEntity_ {
 public class Compo_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Compo, String> name;
 	public static volatile SingularAttribute<Compo, String> name;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/DiscountInstance_.java

@@ -4,7 +4,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.914+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:35.667+0300")
 @StaticMetamodel(DiscountInstance.class)
 @StaticMetamodel(DiscountInstance.class)
 public class DiscountInstance_ extends GenericEntity_ {
 public class DiscountInstance_ extends GenericEntity_ {
 	public static volatile SingularAttribute<DiscountInstance, AccountEvent> accountEvent;
 	public static volatile SingularAttribute<DiscountInstance, AccountEvent> accountEvent;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Discount_.java

@@ -7,7 +7,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.906+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:35.631+0300")
 @StaticMetamodel(Discount.class)
 @StaticMetamodel(Discount.class)
 public class Discount_ extends GenericEntity_ {
 public class Discount_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Discount, LanEvent> event;
 	public static volatile SingularAttribute<Discount, LanEvent> event;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/EntityEquals_.java

@@ -3,7 +3,7 @@ package fi.insomnia.bortal.model;
 import javax.annotation.Generated;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.921+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:35.690+0300")
 @StaticMetamodel(EntityEquals.class)
 @StaticMetamodel(EntityEquals.class)
 public class EntityEquals_ {
 public class EntityEquals_ {
 }
 }

code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventMap_.java

@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.927+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:35.702+0300")
 @StaticMetamodel(EventMap.class)
 @StaticMetamodel(EventMap.class)
 public class EventMap_ extends GenericEntity_ {
 public class EventMap_ extends GenericEntity_ {
 	public static volatile SingularAttribute<EventMap, LanEvent> event;
 	public static volatile SingularAttribute<EventMap, LanEvent> event;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventOrganiser_.java

@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.934+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:35.719+0300")
 @StaticMetamodel(EventOrganiser.class)
 @StaticMetamodel(EventOrganiser.class)
 public class EventOrganiser_ extends GenericEntity_ {
 public class EventOrganiser_ extends GenericEntity_ {
 	public static volatile SingularAttribute<EventOrganiser, String> organisation;
 	public static volatile SingularAttribute<EventOrganiser, String> organisation;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventUser_.java

@@ -6,7 +6,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.940+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:35.736+0300")
 @StaticMetamodel(EventUser.class)
 @StaticMetamodel(EventUser.class)
 public class EventUser_ extends GenericEntity_ {
 public class EventUser_ extends GenericEntity_ {
 	public static volatile SingularAttribute<EventUser, User> user;
 	public static volatile SingularAttribute<EventUser, User> user;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWaveTemplate_.java

@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.953+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:35.776+0300")
 @StaticMetamodel(FoodWaveTemplate.class)
 @StaticMetamodel(FoodWaveTemplate.class)
 public class FoodWaveTemplate_ extends GenericEntity_ {
 public class FoodWaveTemplate_ extends GenericEntity_ {
 	public static volatile SingularAttribute<FoodWaveTemplate, LanEvent> event;
 	public static volatile SingularAttribute<FoodWaveTemplate, LanEvent> event;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWave_.java

@@ -6,7 +6,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.947+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:35.757+0300")
 @StaticMetamodel(FoodWave.class)
 @StaticMetamodel(FoodWave.class)
 public class FoodWave_ extends GenericEntity_ {
 public class FoodWave_ extends GenericEntity_ {
 	public static volatile SingularAttribute<FoodWave, String> name;
 	public static volatile SingularAttribute<FoodWave, String> name;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/GenericEntity_.java

@@ -4,7 +4,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.959+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:35.785+0300")
 @StaticMetamodel(GenericEntity.class)
 @StaticMetamodel(GenericEntity.class)
 public class GenericEntity_ extends EntityEquals_ {
 public class GenericEntity_ extends EntityEquals_ {
 	public static volatile SingularAttribute<GenericEntity, Integer> id;
 	public static volatile SingularAttribute<GenericEntity, Integer> id;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/GroupMembership_.java

@@ -5,7 +5,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.966+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:35.819+0300")
 @StaticMetamodel(GroupMembership.class)
 @StaticMetamodel(GroupMembership.class)
 public class GroupMembership_ extends GenericEntity_ {
 public class GroupMembership_ extends GenericEntity_ {
 	public static volatile SingularAttribute<GroupMembership, String> inviteToken;
 	public static volatile SingularAttribute<GroupMembership, String> inviteToken;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEventDomain_.java

@@ -4,7 +4,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.979+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:35.867+0300")
 @StaticMetamodel(LanEventDomain.class)
 @StaticMetamodel(LanEventDomain.class)
 public class LanEventDomain_ extends GenericEntity_ {
 public class LanEventDomain_ extends GenericEntity_ {
 	public static volatile SingularAttribute<LanEventDomain, String> domain;
 	public static volatile SingularAttribute<LanEventDomain, String> domain;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEventPrivateProperty_.java

@@ -6,7 +6,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.985+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:35.884+0300")
 @StaticMetamodel(LanEventPrivateProperty.class)
 @StaticMetamodel(LanEventPrivateProperty.class)
 public class LanEventPrivateProperty_ extends GenericEntity_ {
 public class LanEventPrivateProperty_ extends GenericEntity_ {
 	public static volatile SingularAttribute<LanEventPrivateProperty, EventOrganiser> eventorg;
 	public static volatile SingularAttribute<LanEventPrivateProperty, EventOrganiser> eventorg;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEventProperty_.java

@@ -6,7 +6,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.005+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:35.895+0300")
 @StaticMetamodel(LanEventProperty.class)
 @StaticMetamodel(LanEventProperty.class)
 public class LanEventProperty_ extends GenericEntity_ {
 public class LanEventProperty_ extends GenericEntity_ {
 	public static volatile SingularAttribute<LanEventProperty, EventOrganiser> eventorg;
 	public static volatile SingularAttribute<LanEventProperty, EventOrganiser> eventorg;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEvent_.java

@@ -8,7 +8,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.973+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:35.829+0300")
 @StaticMetamodel(LanEvent.class)
 @StaticMetamodel(LanEvent.class)
 public class LanEvent_ extends GenericEntity_ {
 public class LanEvent_ extends GenericEntity_ {
 	public static volatile SingularAttribute<LanEvent, Calendar> startTime;
 	public static volatile SingularAttribute<LanEvent, Calendar> startTime;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Location_.java

@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.011+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:35.905+0300")
 @StaticMetamodel(Location.class)
 @StaticMetamodel(Location.class)
 public class Location_ extends GenericEntity_ {
 public class Location_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Location, LanEvent> event;
 	public static volatile SingularAttribute<Location, LanEvent> event;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/LogEntryType_.java

@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.025+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:35.939+0300")
 @StaticMetamodel(LogEntryType.class)
 @StaticMetamodel(LogEntryType.class)
 public class LogEntryType_ extends GenericEntity_ {
 public class LogEntryType_ extends GenericEntity_ {
 	public static volatile SingularAttribute<LogEntryType, String> name;
 	public static volatile SingularAttribute<LogEntryType, String> name;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/LogEntry_.java

@@ -5,7 +5,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.018+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:35.928+0300")
 @StaticMetamodel(LogEntry.class)
 @StaticMetamodel(LogEntry.class)
 public class LogEntry_ extends GenericEntity_ {
 public class LogEntry_ extends GenericEntity_ {
 	public static volatile SingularAttribute<LogEntry, LanEvent> parentEvent;
 	public static volatile SingularAttribute<LogEntry, LanEvent> parentEvent;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/MenuNavigation_.java

@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.038+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:35.973+0300")
 @StaticMetamodel(MenuNavigation.class)
 @StaticMetamodel(MenuNavigation.class)
 public class MenuNavigation_ extends GenericEntity_ {
 public class MenuNavigation_ extends GenericEntity_ {
 	public static volatile SingularAttribute<MenuNavigation, LanEvent> event;
 	public static volatile SingularAttribute<MenuNavigation, LanEvent> event;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Menuitem_.java

@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.031+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:35.952+0300")
 @StaticMetamodel(Menuitem.class)
 @StaticMetamodel(Menuitem.class)
 public class Menuitem_ extends GenericEntity_ {
 public class Menuitem_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Menuitem, String> url;
 	public static volatile SingularAttribute<Menuitem, String> url;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/NewsGroup_.java

@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.052+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:35.999+0300")
 @StaticMetamodel(NewsGroup.class)
 @StaticMetamodel(NewsGroup.class)
 public class NewsGroup_ extends GenericEntity_ {
 public class NewsGroup_ extends GenericEntity_ {
 	public static volatile SingularAttribute<NewsGroup, LanEvent> event;
 	public static volatile SingularAttribute<NewsGroup, LanEvent> event;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/News_.java

@@ -5,7 +5,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.045+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:35.987+0300")
 @StaticMetamodel(News.class)
 @StaticMetamodel(News.class)
 public class News_ extends GenericEntity_ {
 public class News_ extends GenericEntity_ {
 	public static volatile SingularAttribute<News, String> title;
 	public static volatile SingularAttribute<News, String> title;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/OrgRole_.java

@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.059+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:36.008+0300")
 @StaticMetamodel(OrgRole.class)
 @StaticMetamodel(OrgRole.class)
 public class OrgRole_ extends GenericEntity_ {
 public class OrgRole_ extends GenericEntity_ {
 	public static volatile SingularAttribute<OrgRole, String> name;
 	public static volatile SingularAttribute<OrgRole, String> name;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/PageContent_.java

@@ -5,7 +5,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.066+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:36.018+0300")
 @StaticMetamodel(PageContent.class)
 @StaticMetamodel(PageContent.class)
 public class PageContent_ extends GenericEntity_ {
 public class PageContent_ extends GenericEntity_ {
 	public static volatile SingularAttribute<PageContent, SitePage> sitepage;
 	public static volatile SingularAttribute<PageContent, SitePage> sitepage;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/PlaceGroup_.java

@@ -6,7 +6,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.093+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:36.040+0300")
 @StaticMetamodel(PlaceGroup.class)
 @StaticMetamodel(PlaceGroup.class)
 public class PlaceGroup_ extends GenericEntity_ {
 public class PlaceGroup_ extends GenericEntity_ {
 	public static volatile SingularAttribute<PlaceGroup, Calendar> created;
 	public static volatile SingularAttribute<PlaceGroup, Calendar> created;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Place_.java

@@ -5,7 +5,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.075+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:36.030+0300")
 @StaticMetamodel(Place.class)
 @StaticMetamodel(Place.class)
 public class Place_ extends GenericEntity_ {
 public class Place_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Place, String> description;
 	public static volatile SingularAttribute<Place, String> description;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/PollAnswer_.java

@@ -4,7 +4,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.110+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:36.068+0300")
 @StaticMetamodel(PollAnswer.class)
 @StaticMetamodel(PollAnswer.class)
 public class PollAnswer_ extends GenericEntity_ {
 public class PollAnswer_ extends GenericEntity_ {
 	public static volatile SingularAttribute<PollAnswer, String> answerText;
 	public static volatile SingularAttribute<PollAnswer, String> answerText;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/PollQuestion_.java

@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.118+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:36.088+0300")
 @StaticMetamodel(PollQuestion.class)
 @StaticMetamodel(PollQuestion.class)
 public class PollQuestion_ extends GenericEntity_ {
 public class PollQuestion_ extends GenericEntity_ {
 	public static volatile SingularAttribute<PollQuestion, Integer> characters;
 	public static volatile SingularAttribute<PollQuestion, Integer> characters;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Poll_.java

@@ -6,7 +6,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.102+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:36.053+0300")
 @StaticMetamodel(Poll.class)
 @StaticMetamodel(Poll.class)
 public class Poll_ extends GenericEntity_ {
 public class Poll_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Poll, LanEvent> event;
 	public static volatile SingularAttribute<Poll, LanEvent> event;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/PossibleAnswer_.java

@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.126+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:36.096+0300")
 @StaticMetamodel(PossibleAnswer.class)
 @StaticMetamodel(PossibleAnswer.class)
 public class PossibleAnswer_ extends GenericEntity_ {
 public class PossibleAnswer_ extends GenericEntity_ {
 	public static volatile SingularAttribute<PossibleAnswer, String> answer;
 	public static volatile SingularAttribute<PossibleAnswer, String> answer;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/PrintedCard_.java

@@ -6,7 +6,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.134+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:36.114+0300")
 @StaticMetamodel(PrintedCard.class)
 @StaticMetamodel(PrintedCard.class)
 public class PrintedCard_ extends GenericEntity_ {
 public class PrintedCard_ extends GenericEntity_ {
 	public static volatile SingularAttribute<PrintedCard, LanEvent> event;
 	public static volatile SingularAttribute<PrintedCard, LanEvent> event;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/ProductLimitation_.java

@@ -6,7 +6,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.148+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:36.134+0300")
 @StaticMetamodel(ProductLimitation.class)
 @StaticMetamodel(ProductLimitation.class)
 public class ProductLimitation_ extends GenericEntity_ {
 public class ProductLimitation_ extends GenericEntity_ {
 	public static volatile SingularAttribute<ProductLimitation, ProductLimitationType> type;
 	public static volatile SingularAttribute<ProductLimitation, ProductLimitationType> type;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Product_.java

@@ -7,7 +7,7 @@ import javax.persistence.metamodel.SetAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.141+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:36.124+0300")
 @StaticMetamodel(Product.class)
 @StaticMetamodel(Product.class)
 public class Product_ extends GenericEntity_ {
 public class Product_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Product, LanEvent> event;
 	public static volatile SingularAttribute<Product, LanEvent> event;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/ReaderEvent_.java

@@ -5,7 +5,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.162+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:36.159+0300")
 @StaticMetamodel(ReaderEvent.class)
 @StaticMetamodel(ReaderEvent.class)
 public class ReaderEvent_ extends GenericEntity_ {
 public class ReaderEvent_ extends GenericEntity_ {
 	public static volatile SingularAttribute<ReaderEvent, Calendar> time;
 	public static volatile SingularAttribute<ReaderEvent, Calendar> time;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Reader_.java

@@ -6,7 +6,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.155+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:36.150+0300")
 @StaticMetamodel(Reader.class)
 @StaticMetamodel(Reader.class)
 public class Reader_ extends GenericEntity_ {
 public class Reader_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Reader, ReaderType> type;
 	public static volatile SingularAttribute<Reader, ReaderType> type;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Role_.java

@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.170+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:36.169+0300")
 @StaticMetamodel(Role.class)
 @StaticMetamodel(Role.class)
 public class Role_ extends GenericEntity_ {
 public class Role_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Role, String> name;
 	public static volatile SingularAttribute<Role, String> name;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/SitePage_.java

@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.192+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:36.179+0300")
 @StaticMetamodel(SitePage.class)
 @StaticMetamodel(SitePage.class)
 public class SitePage_ extends GenericEntity_ {
 public class SitePage_ extends GenericEntity_ {
 	public static volatile SingularAttribute<SitePage, LanEvent> event;
 	public static volatile SingularAttribute<SitePage, LanEvent> event;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/UserImage_.java

@@ -5,7 +5,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.209+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:36.196+0300")
 @StaticMetamodel(UserImage.class)
 @StaticMetamodel(UserImage.class)
 public class UserImage_ extends GenericEntity_ {
 public class UserImage_ extends GenericEntity_ {
 	public static volatile SingularAttribute<UserImage, Calendar> uploaded;
 	public static volatile SingularAttribute<UserImage, Calendar> uploaded;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/UserNote_.java

@@ -4,7 +4,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.216+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:36.208+0300")
 @StaticMetamodel(UserNote.class)
 @StaticMetamodel(UserNote.class)
 public class UserNote_ extends GenericEntity_ {
 public class UserNote_ extends GenericEntity_ {
 	public static volatile SingularAttribute<UserNote, EventUser> user;
 	public static volatile SingularAttribute<UserNote, EventUser> user;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/User_.java

@@ -8,7 +8,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.201+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:36.187+0300")
 @StaticMetamodel(User.class)
 @StaticMetamodel(User.class)
 public class User_ extends GenericEntity_ {
 public class User_ extends GenericEntity_ {
 	public static volatile SingularAttribute<User, Calendar> created;
 	public static volatile SingularAttribute<User, Calendar> created;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Vote_.java

@@ -5,7 +5,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.223+0300")
+@Generated(value="Dali", date="2012-10-06T20:03:36.216+0300")
 @StaticMetamodel(Vote.class)
 @StaticMetamodel(Vote.class)
 public class Vote_ extends GenericEntity_ {
 public class Vote_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Vote, Integer> score;
 	public static volatile SingularAttribute<Vote, Integer> score;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/salespoint/SalesEntity_.java

@@ -6,7 +6,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.176+0300")
+@Generated(value="Dali", date="2012-10-06T18:55:59.612+0300")
 @StaticMetamodel(SalesEntity.class)
 @StaticMetamodel(SalesEntity.class)
 public class SalesEntity_ extends GenericEntity_ {
 public class SalesEntity_ extends GenericEntity_ {
 	public static volatile SingularAttribute<SalesEntity, String> certificate;
 	public static volatile SingularAttribute<SalesEntity, String> certificate;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/salespoint/Salespoint_.java

@@ -7,7 +7,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.186+0300")
+@Generated(value="Dali", date="2012-10-06T18:55:59.620+0300")
 @StaticMetamodel(Salespoint.class)
 @StaticMetamodel(Salespoint.class)
 public class Salespoint_ extends GenericEntity_ {
 public class Salespoint_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Salespoint, LanEvent> event;
 	public static volatile SingularAttribute<Salespoint, LanEvent> event;

code/LanBortalWeb/WebContent/foodadmin/edit.xhtml

@@ -6,29 +6,31 @@
 <h:body>
 <h:body>
 	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
 	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
 		<f:metadata>
 		<f:metadata>
-				<f:event type="preRenderView" listener="#{foodWaveView.initTemplateList()}" />
+			<f:event type="preRenderView" listener="#{foodWaveView.initEditTemplate()}" />
 		</f:metadata>
 		</f:metadata>
 
 
 		<ui:define name="title">
 		<ui:define name="title">
-			<h1>#{i18n['foodwave.template.list.title']}</h1>
+			<h1>#{i18n['foodwave.template.edit.title']}</h1>
 		</ui:define>
 		</ui:define>
 
 
 		<ui:define name="content">
 		<ui:define name="content">
+			<h:form>
+				<h:panelGrid columns="3">
+					<h:outputLabel for="name" value="#{i18n['foodwavetemplate.name']}" />
+					<h:inputText id="name" value="#{foodWaveView.template.name}" />
+					<h:message for="name" />
 
 
-		<h:dataTable var="templ" value="#{foodWaveView.templates}">
-			<h:column>
-				<h:outputText value="#{templ.name}" />
-			</h:column>
-			<h:column>
-				<h:link outcome="/foodadmin/editTemplate">
-					<f:param value="#{templ.id}"/>
-				</h:link>
-			</h:column>
-		</h:dataTable>
+				</h:panelGrid>
+				<h:inputTextarea value="#{foodWaveView.template.description}" />
+				<h:commanButton action="#{foodWaveView.saveTemplate()}" value="#{i18n['foowavetemplate.save']}" />
+				<h:commandButton action="#{foodWaveView.createFoodwave()}" value="#{i18n['foodwavetemplate.createFoodwave']}" />
+			</h:form>
+			<ui:fragment  >
 				
 				
-		</ui:define>
 
 
+			</ui:fragment>
 
 
+		</ui:define>
 	</ui:composition>
 	</ui:composition>
 </h:body>
 </h:body>
 </html>
 </html>
\ No newline at end of file

code/LanBortalWeb/WebContent/foodadmin/list.xhtml

@@ -17,11 +17,14 @@
 
 
 			<h:dataTable var="templ" value="#{foodWaveView.templates}">
 			<h:dataTable var="templ" value="#{foodWaveView.templates}">
 				<h:column>
 				<h:column>
+					<f:facet name="header">
+						<h:outputText value="#{i18n['foodwaveTemplate.name']}" />
+					</f:facet>
 					<h:outputText value="#{templ.name}" />
 					<h:outputText value="#{templ.name}" />
 				</h:column>
 				</h:column>
 				<h:column>
 				<h:column>
 					<h:link outcome="/foodadmin/editTemplate">
 					<h:link outcome="/foodadmin/editTemplate">
-					<f:param value="#{templ.id}"/>
+						<f:param value="#{templ.id}" />
 					</h:link>
 					</h:link>
 				</h:column>
 				</h:column>
 			</h:dataTable>
 			</h:dataTable>

code/LanBortalWeb/WebContent/place/edit.xhtml

@@ -105,7 +105,7 @@
 				</h:dataTable>
 				</h:dataTable>
 			</h:form>
 			</h:form>
 
 
-			<h:form rendered="#{!empty placeView.place.group and not placeView.place.group.places.empty">
+			<h:form rendered="#{!empty placeView.place.group and !empty placeView.place.group.places}">
 				<h:panelGrid columns="2">
 				<h:panelGrid columns="2">
 					<h:outputLabel value="#{i18n['placegroup.name']}:" />
 					<h:outputLabel value="#{i18n['placegroup.name']}:" />
 					<h:inputText value="#{placeView.place.group.name}" />
 					<h:inputText value="#{placeView.place.group.name}" />

code/LanBortalWeb/WebContent/resources/cditools/user/list.xhtml

@@ -56,7 +56,7 @@
 		</h:column>
 		</h:column>
 		
 		
 		<h:column>
 		<h:column>
-			<button onClick="location.replace('#{request.contextPath}/useradmin/edit.jsf?user.id=#{user.id}')">#{i18n['user.edit']}</button>
+			<button onClick="location.replace('#{request.contextPath}/useradmin/edit.jsf?userid=#{user.id}')">#{i18n['user.edit']}</button>
 		</h:column>
 		</h:column>
 		
 		
 		<!-- <h:column>
 		<!-- <h:column>

code/LanBortalWeb/WebContent/user/create.xhtml

@@ -13,8 +13,6 @@
 		<ui:define name="content">
 		<ui:define name="content">
 			<users:edit creating="true" commitaction="#{userView.createUser()}" commitvalue="#{i18n['user.create']}" />
 			<users:edit creating="true" commitaction="#{userView.createUser()}" commitvalue="#{i18n['user.create']}" />
 
 
-
-
 		</ui:define>
 		</ui:define>
 	</ui:composition>
 	</ui:composition>
 </h:body>
 </h:body>

code/LanBortalWeb/src/fi/insomnia/bortal/HostnameFilter.java

@@ -24,8 +24,7 @@ import fi.insomnia.bortal.model.User;
  */
  */
 public class HostnameFilter implements Filter {
 public class HostnameFilter implements Filter {
 
 
-	private static final Logger logger = LoggerFactory
-			.getLogger(HostnameFilter.class);
+	private static final Logger logger = LoggerFactory.getLogger(HostnameFilter.class);
 	private boolean developmentMode = false;
 	private boolean developmentMode = false;
 	private static final String HTTP_HOSTNAME_ID = "hostname_session_id";
 	private static final String HTTP_HOSTNAME_ID = "hostname_session_id";
 
 

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/shop/FoodWaveView.java

@@ -24,14 +24,24 @@ public class FoodWaveView extends GenericCDIView {
 	{
 	{
 		if (super.requirePermissions(ShopPermission.MANAGE_PRODUCTS))
 		if (super.requirePermissions(ShopPermission.MANAGE_PRODUCTS))
 		{
 		{
-			templates = new ListDataModel<FoodWaveTemplate>(foodwaveBean.getTemplates());
+			setTemplates(new ListDataModel<FoodWaveTemplate>(foodwaveBean.getTemplates()));
+			super.beginConversation();
+		}
+	}
+
+	public void initEditTemplate()
+	{
+
+		if (super.requirePermissions(ShopPermission.MANAGE_PRODUCTS) && template == null)
+		{
+
 			super.beginConversation();
 			super.beginConversation();
 		}
 		}
 	}
 	}
 
 
 	public void initCreateTemplate()
 	public void initCreateTemplate()
 	{
 	{
-		if (super.requirePermissions(ShopPermission.MANAGE_PRODUCTS) && getTemplate() == null)
+		if (super.requirePermissions(ShopPermission.MANAGE_PRODUCTS) && template == null)
 		{
 		{
 			setTemplate(new FoodWaveTemplate());
 			setTemplate(new FoodWaveTemplate());
 			super.beginConversation();
 			super.beginConversation();
@@ -40,7 +50,7 @@ public class FoodWaveView extends GenericCDIView {
 
 
 	public String editTemplate()
 	public String editTemplate()
 	{
 	{
-		setTemplate(templates.getRowData());
+		setTemplate(getTemplates().getRowData());
 		return "/foodadmin/editTemplate";
 		return "/foodadmin/editTemplate";
 	}
 	}
 
 
@@ -58,4 +68,12 @@ public class FoodWaveView extends GenericCDIView {
 		this.template = template;
 		this.template = template;
 	}
 	}
 
 
+	public ListDataModel<FoodWaveTemplate> getTemplates() {
+		return templates;
+	}
+
+	public void setTemplates(ListDataModel<FoodWaveTemplate> templates) {
+		this.templates = templates;
+	}
+
 }
 }