mirror of
https://github.com/openSUSE/osem.git
synced 2026-08-13 19:54:02 +00:00
hound fixes
This commit is contained in:
parent
37ec4ce746
commit
9fba9eedc7
1 changed files with 47 additions and 47 deletions
|
|
@ -1,54 +1,54 @@
|
|||
class Admin::SchedulesController < ApplicationController
|
||||
before_filter :verify_organizer
|
||||
skip_before_filter :verify_authenticity_token, only: [:update]
|
||||
layout "schedule"
|
||||
module Admin
|
||||
class SchedulesController < ApplicationController
|
||||
before_filter :verify_organizer
|
||||
skip_before_filter :verify_authenticity_token, only: [:update]
|
||||
layout "schedule"
|
||||
|
||||
def show
|
||||
if @conference.nil?
|
||||
redirect_to admin_conference_index_path
|
||||
return
|
||||
end
|
||||
@dates = @conference.start_date..@conference.end_date
|
||||
@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]}"
|
||||
def show
|
||||
if @conference.nil?
|
||||
redirect_to admin_conference_index_path
|
||||
return
|
||||
end
|
||||
@dates = @conference.start_date..@conference.end_date
|
||||
@rooms = @conference.rooms
|
||||
end
|
||||
|
||||
if params[:date] == 'none'
|
||||
event.start_time = nil
|
||||
event.room = nil
|
||||
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'
|
||||
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'}
|
||||
return
|
||||
end
|
||||
room = Room.where(guid: params[:room]).first
|
||||
if room.nil?
|
||||
error_message = "Could not find room GUID: #{params[:room]}"
|
||||
render json: { 'status' => 'ok' }
|
||||
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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue