fix admin schedule routing

This commit is contained in:
Stella Rouzi 2014-06-12 19:49:54 +03:00
parent 39f527627b
commit 37ec4ce746
4 changed files with 20 additions and 21 deletions

View file

@ -1,6 +1,6 @@
class Admin::ScheduleController < ApplicationController class Admin::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"
def show def show
@ -13,26 +13,26 @@ class Admin::ScheduleController < ApplicationController
end end
def update def update
event = Event.where(:guid => params[:event]).first event = Event.where(guid: params[:event]).first
error_message = nil error_message = nil
if event.nil? if event.nil?
error_message = "Could not find event GUID: #{params[:event]}" error_message = "Could not find event GUID: #{params[:event]}"
end end
if params[:date] == "none" if params[:date] == 'none'
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
if room.nil? if room.nil?
error_message = "Could not find room GUID: #{params[:room]}" error_message = "Could not find room GUID: #{params[:room]}"
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
@ -44,10 +44,10 @@ class Admin::ScheduleController < ApplicationController
# 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") # startTime = DateTime.strptime(time + zone.formatted_offset, "%Y-%m-%d %k:%M %Z")
startTime = DateTime.strptime(time, "%Y-%m-%d %k:%M") startTime = DateTime.strptime(time, '%Y-%m-%d %k:%M')
event.start_time = startTime event.start_time = startTime
event.save! event.save!
render :json => {"status" => "ok"} render json: {'status' => 'ok'}
end end

View file

@ -9,7 +9,7 @@
%ul#date-tabs %ul#date-tabs
- @dates.each do |date| - @dates.each do |date|
%li.date-selector %li.date-selector
= link_to "#{date}", "#", :id => "#{date}-selector", :onclick => "Schedule.changeDay('#{date}')" = link_to "#{date}", "#", id: "#{date}-selector", onclick: "Schedule.changeDay('#{date}')"
.schedule-rooms-container .schedule-rooms-container
= render 'day_tab' = render 'day_tab'

View file

@ -2,22 +2,21 @@ Osem::Application.routes.draw do
get 'conference/show' get 'conference/show'
devise_for :users, :controllers => { :registrations => :registrations }, :path => 'accounts' devise_for :users, controllers: { registrations: :registrations }, path: 'accounts'
namespace :admin do namespace :admin do
resources :users resources :users
resources :people resources :people
resources :conference do resources :conference do
get "/schedule" => "schedule#show" resource :schedule, only: [:show, :update]
patch "/schedule" => "schedule#update" get '/stats' => 'stats#index'
get "/stats" => "stats#index" get '/venue' => 'venue#show', as: 'venue_info'
get "/venue" => "venue#show", :as => "venue_info" patch '/venue' => 'venue#update', as: 'venue_update'
patch "/venue" => "venue#update", :as => "venue_update" get '/dietary_choices' => 'dietchoices#show', as: 'dietary_list'
get "/dietary_choices" => "dietchoices#show", :as => "dietary_list" patch '/dietary_choices' => 'dietchoices#update', as: 'dietary_update'
patch "/dietary_choices" => "dietchoices#update", :as => "dietary_update" get '/volunteers_list' => 'volunteers#show'
get "/volunteers_list" => "volunteers#show" get '/volunteers' => 'volunteers#index', as: 'volunteers_info'
get "/volunteers" => "volunteers#index", :as => "volunteers_info" patch '/volunteers' => 'volunteers#update', as: 'volunteers_update'
patch "/volunteers" => "volunteers#update", :as => "volunteers_update"
patch '/registrations/change_field' => 'registrations#change_field' patch '/registrations/change_field' => 'registrations#change_field'
resources :registrations resources :registrations