Merge branch 'eventcreationcleanup' into 'master'

Event creation fixup

These were missing from previous event creation and property editing commit

See merge request !257

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/organisation/EventOrgView.java

@@ -155,12 +155,14 @@ public class EventOrgView extends GenericCDIView {
 		if (eventorg.getEvents() == null) {
 		if (eventorg.getEvents() == null) {
 			eventorg.setEvents(new ArrayList<LanEvent>());
 			eventorg.setEvents(new ArrayList<LanEvent>());
 		}
 		}
-		setEvent(new LanEvent());
-		getEvent().setName(eventname);
-		getEvent().setOrganiser(eventorg);
+		event = new LanEvent();
+		event.setName(eventname);
+		event.setOrganiser(eventorg);
 		eventname = "";
 		eventname = "";
 		eventorg.getEvents().add(getEvent());
 		eventorg.getEvents().add(getEvent());
-		eventorgbean.save(eventorg);
+		eventbean.create(event);
+
+		//eventorg = eventorgbean.save(eventorg);
 
 
 		return "/eventorg/editEvent";
 		return "/eventorg/editEvent";
 
 
@@ -267,12 +269,12 @@ public class EventOrgView extends GenericCDIView {
 			for (LanEvent lanEvent : eventbean.findAllEvents()) {
 			for (LanEvent lanEvent : eventbean.findAllEvents()) {
 
 
 				if (lanEvent.getStartTime() != null && lanEvent.getEndTime() != null && lanEvent.getTicketSalesBegin() != null) {
 				if (lanEvent.getStartTime() != null && lanEvent.getEndTime() != null && lanEvent.getTicketSalesBegin() != null) {
-					DefaultScheduleEvent event = new DefaultScheduleEvent("<"+lanEvent.getId() + "> " + lanEvent.getName() + ": " + I18n.get("event.ticketSale"), lanEvent.getTicketSalesBegin(), lanEvent.getEndTime());
+					DefaultScheduleEvent event = new DefaultScheduleEvent("<" + lanEvent.getId() + "> " + lanEvent.getName() + ": " + I18n.get("event.ticketSale"), lanEvent.getTicketSalesBegin(), lanEvent.getEndTime());
 					event.setAllDay(true);
 					event.setAllDay(true);
 					eventsCalendar.addEvent(event);
 					eventsCalendar.addEvent(event);
 					event.setStyleClass("calendarEventStyle");
 					event.setStyleClass("calendarEventStyle");
 
 
-					event = new DefaultScheduleEvent( "<"+lanEvent.getId() + "> " + lanEvent.getName() + ": " + I18n.get("event.running"), lanEvent.getStartTime(), lanEvent.getEndTime());
+					event = new DefaultScheduleEvent("<" + lanEvent.getId() + "> " + lanEvent.getName() + ": " + I18n.get("event.running"), lanEvent.getStartTime(), lanEvent.getEndTime());
 					event.setAllDay(true);
 					event.setAllDay(true);
 					event.setStyleClass("eventRunningCalendar");
 					event.setStyleClass("eventRunningCalendar");
 					eventsCalendar.addEvent(event);
 					eventsCalendar.addEvent(event);
@@ -285,9 +287,3 @@ public class EventOrgView extends GenericCDIView {
 	}
 	}
 
 
 }
 }
-
-
-
-
-
-

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/organisation/EventPropertyView.java

@@ -124,7 +124,7 @@ public class EventPropertyView extends GenericCDIView {
 	}
 	}
 
 
 	public String deleteProperty() {
 	public String deleteProperty() {
-		eventbean.deleteProperty(properties.getRowData());
+		eventorgview.setEvent(eventbean.deleteProperty(properties.getRowData()));
 		properties = null;
 		properties = null;
 		return null;
 		return null;
 	}
 	}
@@ -237,16 +237,14 @@ public class EventPropertyView extends GenericCDIView {
 	}
 	}
 
 
 	public ListDataModel<LanEventProperty> getProperties() {
 	public ListDataModel<LanEventProperty> getProperties() {
-		if (properties == null && eventorgview != null && eventorgview.getEvent() != null)
-		{
+		if (properties == null && eventorgview != null && eventorgview.getEvent() != null) {
 			properties = new ListDataModel<LanEventProperty>(eventorgview.getEvent().getProperties());
 			properties = new ListDataModel<LanEventProperty>(eventorgview.getEvent().getProperties());
 		}
 		}
 		return properties;
 		return properties;
 	}
 	}
 
 
 	public ListDataModel<LanEventPrivateProperty> getPrivateProperties() {
 	public ListDataModel<LanEventPrivateProperty> getPrivateProperties() {
-		if (privateProperties == null && eventorgview != null && eventbean.getCurrentEvent().equals(eventorgview.getEvent()))
-		{
+		if (privateProperties == null && eventorgview != null && eventbean.getCurrentEvent().equals(eventorgview.getEvent())) {
 			privateProperties = new ListDataModel<LanEventPrivateProperty>(eventbean.getPrivateProperties());
 			privateProperties = new ListDataModel<LanEventPrivateProperty>(eventbean.getPrivateProperties());
 		}
 		}
 		return privateProperties;
 		return privateProperties;