From 37ec4ce7468a085f33a89bf5b81db88d26dab9ad Mon Sep 17 00:00:00 2001 From: Stella Rouzi Date: Thu, 12 Jun 2014 19:49:54 +0300 Subject: [PATCH 1/4] fix admin schedule routing --- ..._controller.rb => schedules_controller.rb} | 18 ++++++++-------- .../_day_tab.html.haml | 0 .../{schedule => schedules}/show.html.haml | 2 +- config/routes.rb | 21 +++++++++---------- 4 files changed, 20 insertions(+), 21 deletions(-) rename app/controllers/admin/{schedule_controller.rb => schedules_controller.rb} (68%) rename app/views/admin/{schedule => schedules}/_day_tab.html.haml (100%) rename app/views/admin/{schedule => schedules}/show.html.haml (95%) diff --git a/app/controllers/admin/schedule_controller.rb b/app/controllers/admin/schedules_controller.rb similarity index 68% rename from app/controllers/admin/schedule_controller.rb rename to app/controllers/admin/schedules_controller.rb index d35f0b15..1c9dd453 100644 --- a/app/controllers/admin/schedule_controller.rb +++ b/app/controllers/admin/schedules_controller.rb @@ -1,6 +1,6 @@ -class Admin::ScheduleController < ApplicationController +class Admin::SchedulesController < ApplicationController before_filter :verify_organizer - skip_before_filter :verify_authenticity_token, :only => [:update] + skip_before_filter :verify_authenticity_token, only: [:update] layout "schedule" def show @@ -13,26 +13,26 @@ class Admin::ScheduleController < ApplicationController end def update - event = Event.where(:guid => params[:event]).first + 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" + if params[:date] == 'none' event.start_time = nil event.room = nil event.save! - render :json => {"status" => "ok"} + render json: {'status' => 'ok'} return end - room = Room.where(:guid => params[:room]).first + 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 + render json: {'status' => 'error', 'message' => error_message}, status: 500 return end @@ -44,10 +44,10 @@ class Admin::ScheduleController < ApplicationController # 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") + startTime = DateTime.strptime(time, '%Y-%m-%d %k:%M') event.start_time = startTime event.save! - render :json => {"status" => "ok"} + render json: {'status' => 'ok'} end diff --git a/app/views/admin/schedule/_day_tab.html.haml b/app/views/admin/schedules/_day_tab.html.haml similarity index 100% rename from app/views/admin/schedule/_day_tab.html.haml rename to app/views/admin/schedules/_day_tab.html.haml diff --git a/app/views/admin/schedule/show.html.haml b/app/views/admin/schedules/show.html.haml similarity index 95% rename from app/views/admin/schedule/show.html.haml rename to app/views/admin/schedules/show.html.haml index a1bb6f7d..eda7348b 100644 --- a/app/views/admin/schedule/show.html.haml +++ b/app/views/admin/schedules/show.html.haml @@ -9,7 +9,7 @@ %ul#date-tabs - @dates.each do |date| %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 = render 'day_tab' diff --git a/config/routes.rb b/config/routes.rb index 887e5a61..ae46877b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,22 +2,21 @@ Osem::Application.routes.draw do get 'conference/show' - devise_for :users, :controllers => { :registrations => :registrations }, :path => 'accounts' + devise_for :users, controllers: { registrations: :registrations }, path: 'accounts' namespace :admin do resources :users resources :people resources :conference do - get "/schedule" => "schedule#show" - patch "/schedule" => "schedule#update" - get "/stats" => "stats#index" - get "/venue" => "venue#show", :as => "venue_info" - patch "/venue" => "venue#update", :as => "venue_update" - get "/dietary_choices" => "dietchoices#show", :as => "dietary_list" - patch "/dietary_choices" => "dietchoices#update", :as => "dietary_update" - get "/volunteers_list" => "volunteers#show" - get "/volunteers" => "volunteers#index", :as => "volunteers_info" - patch "/volunteers" => "volunteers#update", :as => "volunteers_update" + resource :schedule, only: [:show, :update] + get '/stats' => 'stats#index' + get '/venue' => 'venue#show', as: 'venue_info' + patch '/venue' => 'venue#update', as: 'venue_update' + get '/dietary_choices' => 'dietchoices#show', as: 'dietary_list' + patch '/dietary_choices' => 'dietchoices#update', as: 'dietary_update' + get '/volunteers_list' => 'volunteers#show' + get '/volunteers' => 'volunteers#index', as: 'volunteers_info' + patch '/volunteers' => 'volunteers#update', as: 'volunteers_update' patch '/registrations/change_field' => 'registrations#change_field' resources :registrations From 9fba9eedc7ae337edc0098747861b41a3df7dbf3 Mon Sep 17 00:00:00 2001 From: Stella Rouzi Date: Fri, 13 Jun 2014 15:38:07 +0300 Subject: [PATCH 2/4] hound fixes --- app/controllers/admin/schedules_controller.rb | 94 +++++++++---------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/app/controllers/admin/schedules_controller.rb b/app/controllers/admin/schedules_controller.rb index 1c9dd453..27a3dc9d 100644 --- a/app/controllers/admin/schedules_controller.rb +++ b/app/controllers/admin/schedules_controller.rb @@ -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 From cda2a0a1aeabed4016f9e9f9f628a3fc3ab516f1 Mon Sep 17 00:00:00 2001 From: Stella Rouzi Date: Tue, 17 Jun 2014 13:34:38 +0300 Subject: [PATCH 3/4] fix trailing space, add missing end --- app/controllers/admin/schedules_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/schedules_controller.rb b/app/controllers/admin/schedules_controller.rb index 27a3dc9d..85f2ac79 100644 --- a/app/controllers/admin/schedules_controller.rb +++ b/app/controllers/admin/schedules_controller.rb @@ -42,7 +42,7 @@ module Admin Rails.logger.debug("Loading #{time}") # 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) # start_time = DateTime.strptime(time + zone.formatted_offset, "%Y-%m-%d %k:%M %Z") start_time = DateTime.strptime(time, '%Y-%m-%d %k:%M') @@ -52,3 +52,4 @@ module Admin end end +end From 43c11133e4cba8ab7f4ef5b263f722b6941fdec9 Mon Sep 17 00:00:00 2001 From: Stella Rouzi Date: Wed, 18 Jun 2014 19:14:55 +0300 Subject: [PATCH 4/4] houndci fixes --- app/controllers/admin/schedules_controller.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/controllers/admin/schedules_controller.rb b/app/controllers/admin/schedules_controller.rb index 85f2ac79..cd7fff2b 100644 --- a/app/controllers/admin/schedules_controller.rb +++ b/app/controllers/admin/schedules_controller.rb @@ -2,7 +2,7 @@ module Admin class SchedulesController < ApplicationController before_filter :verify_organizer skip_before_filter :verify_authenticity_token, only: [:update] - layout "schedule" + layout 'schedule' def show if @conference.nil? @@ -32,7 +32,7 @@ module Admin error_message = "Could not find room GUID: #{params[:room]}" end - if !error_message.nil? + unless error_message.nil? render json: { 'status' => 'error', 'message' => error_message }, status: 500 return end @@ -50,6 +50,5 @@ module Admin event.save! render json: { 'status' => 'ok' } end - end end