hound fixes

app/controllers/admin/schedules_controller.rb

@@ -1,54 +1,54 @@
-class Admin::SchedulesController < ApplicationController
+module Admin
-  before_filter :verify_organizer
+  class SchedulesController < ApplicationController
-  skip_before_filter :verify_authenticity_token, only: [:update]
+    before_filter :verify_organizer
-  layout "schedule"
+    skip_before_filter :verify_authenticity_token, only: [:update]
+    layout "schedule"
 
-  def show
+    def show
-    if @conference.nil?
+      if @conference.nil?
-      redirect_to admin_conference_index_path
+        redirect_to admin_conference_index_path
-      return
+        return
-    end
+      end
-    @dates = @conference.start_date..@conference.end_date
+      @dates = @conference.start_date..@conference.end_date
-    @rooms = @conference.rooms
+      @rooms = @conference.rooms
-  end
-
-  def update
-    event = Event.where(guid: params[:event]).first
-    error_message = nil
-    if event.nil?
-      error_message = "Could not find event GUID: #{params[:event]}"
     end
 
-    if params[:date] == 'none'
+    def update
-      event.start_time = nil
+      event = Event.where(guid: params[:event]).first
-      event.room = nil
+      error_message = nil
+      if event.nil?
+        error_message = "Could not find event GUID: #{params[:event]}"
+      end
+
+      if params[:date] == 'none'
+        event.start_time = nil
+        event.room = nil
+        event.save!
+        render json: { 'status' => 'ok' }
+        return
+      end
+      room = Room.where(guid: params[:room]).first
+      if room.nil?
+        error_message = "Could not find room GUID: #{params[:room]}"
+      end
+
+      if !error_message.nil?
+        render json: { 'status' => 'error', 'message' => error_message }, status: 500
+        return
+      end
+
+      event.room = room
+      time = "#{params[:date]} #{params[:time]}"
+
+      Rails.logger.debug("Loading #{time}")
+      # FIXME: Same here as in events_controller.rb. Event timezone should be applied
+      # only on output 
+      # zone = ActiveSupport::TimeZone::new(@conference.timezone)
+      # start_time = DateTime.strptime(time + zone.formatted_offset, "%Y-%m-%d %k:%M %Z")
+      start_time = DateTime.strptime(time, '%Y-%m-%d %k:%M')
+      event.start_time = start_time
       event.save!
-      render json: {'status' => 'ok'}
+      render json: { 'status' => 'ok' }
-      return
-    end
-    room = Room.where(guid: params[:room]).first
-    if room.nil?
-      error_message = "Could not find room GUID: #{params[:room]}"
     end
 
-    if !error_message.nil?
-      render json: {'status' => 'error', 'message' => error_message}, status: 500
-      return
-    end
-
-    event.room = room
-    time = "#{params[:date]} #{params[:time]}"
-
-    Rails.logger.debug("Loading #{time}")
-    # FIXME: Same here as in events_controller.rb. Event timezone should be applied
-    # only on output 
-    # zone = ActiveSupport::TimeZone::new(@conference.timezone)
-    # startTime = DateTime.strptime(time + zone.formatted_offset, "%Y-%m-%d %k:%M %Z")
-    startTime = DateTime.strptime(time, '%Y-%m-%d %k:%M')
-    event.start_time = startTime
-    event.save!
-    render json: {'status' => 'ok'}
   end
-
-
-end