gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hound fixes

Browse source
This commit is contained in:
Stella Rouzi 2014-06-13 15:38:07 +03:00
parent 37ec4ce746
commit 9fba9eedc7
1 changed files with 47 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/controllers/admin/schedules_controller.rb
View file

@ -1,4 +1,5 @@
class Admin::SchedulesController < ApplicationController module Admin
class SchedulesController < ApplicationController
before_filter :verify_organizer before_filter :verify_organizer
skip_before_filter :verify_authenticity_token, only: [:update] skip_before_filter :verify_authenticity_token, only: [:update]
layout "schedule" layout "schedule"
@ -23,7 +24,7 @@ class Admin::SchedulesController < ApplicationController
event.start_time = nil event.start_time = nil
event.room = nil event.room = nil
event.save! event.save!
render json: {'status' => 'ok'} render json: { 'status' => 'ok' }
return return
end end
room = Room.where(guid: params[:room]).first room = Room.where(guid: params[:room]).first
@ -32,7 +33,7 @@ class Admin::SchedulesController < ApplicationController
end end
if !error_message.nil? if !error_message.nil?
render json: {'status' => 'error', 'message' => error_message}, status: 500 render json: { 'status' => 'error', 'message' => error_message }, status: 500
return return
end end
@ -43,12 +44,11 @@ class Admin::SchedulesController < ApplicationController
# FIXME: Same here as in events_controller.rb. Event timezone should be applied # FIXME: Same here as in events_controller.rb. Event timezone should be applied
# only on output # only on output
# zone = ActiveSupport::TimeZone::new(@conference.timezone) # zone = ActiveSupport::TimeZone::new(@conference.timezone)
# startTime = DateTime.strptime(time + zone.formatted_offset, "%Y-%m-%d %k:%M %Z") # start_time = DateTime.strptime(time + zone.formatted_offset, "%Y-%m-%d %k:%M %Z")
startTime = DateTime.strptime(time, '%Y-%m-%d %k:%M') start_time = DateTime.strptime(time, '%Y-%m-%d %k:%M')
event.start_time = startTime event.start_time = start_time
event.save! event.save!
render json: {'status' => 'ok'} render json: { 'status' => 'ok' }
end end
end
end