app/controllers/events_controller.rb in artfully_ose-1.3.0.pre3 vs app/controllers/events_controller.rb in artfully_ose-1.3.0.pre4

@@ -1,19 +1,27 @@
 class EventsController < ArtfullyOseController
   respond_to :html, :json, :js
 
-  before_filter :find_event, :only => [ :show, :edit, :update, :destroy, :widget, :image, :storefront_link, :prices, :messages, :resell, :wp_plugin, :passes ]
+  before_filter :find_event, :only => [ :show, :edit, :update, :destroy, :widget, :image, :storefront_link, :prices, :messages, :resell, :wp_plugin, :passes, :seating ]
   before_filter :upcoming_shows, :only => :show
   before_filter { authorize! :view, @event if @event }
 
   def create
     @event = Event.new(params[:event])
-    @templates = current_organization.charts.template
     @event.organization_id = current_organization.id
     @event.is_free = !(current_organization.can? :access, :paid_ticketing)
-    @event.venue.organization_id = current_organization.id
-    @event.venue.time_zone = current_organization.time_zone
+
+    venue = Venue.most_recently_named(current_organization, params[:event][:venue_attributes][:name])
+
+    if venue
+      @event.venue = venue.dup
+      @event.set_default_chart(venue.default_chart.dup!({:save => true}))
+    else
+      @event.venue.organization_id = current_organization.id
+      @event.venue.time_zone = current_organization.time_zone
+    end
+
     @event.contact_email = current_organization.try(:email) || current_user.email
 
     if @event.save
       redirect_to edit_event_url(@event)
     else
@@ -52,12 +60,12 @@
   end
 
   def new
     @event = current_organization.events.build(:producer => current_organization.name)
     @event.venue = Venue.new
+    @venue_names = current_organization.venues.pluck(:name).uniq.sort
     authorize! :new, @event
-    @templates = current_organization.charts.template
   end
 
   def edit
     authorize! :edit, @event
   end
@@ -103,9 +111,12 @@
 
   def wp_plugin
   end
 
   def prices
+  end
+
+  def seating
   end
 
   def passes
   end