Merge pull request #951 from amatsuda/trivial_changes

Code cleanups

Author: amatsuda

Guardfile

@@ -22,7 +22,6 @@ guard :rspec, cmd: 'bin/rspec' do
   watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
 end
 
-
 guard 'livereload' do
   watch(%r{app/views/.+\.(erb|haml|slim)$})
   watch(%r{app/helpers/.+\.rb})

app/assets/stylesheets/modules/data_tables.css

@@ -1,4 +1,3 @@
-/* Consider breaking the following into modules */
 /* datatables */
 table.datatable {
   thead {

app/controllers/admin/application_controller.rb

@@ -6,9 +6,7 @@ class Admin::ApplicationController < ApplicationController
 
   def require_admin
     unless current_user.admin?
-      flash[:danger] = "You must be signed in as an administrator to access this page."
-      redirect_to events_path
+      redirect_to events_path, flash: {danger: 'You must be signed in as an administrator to access this page.'}
     end
   end
-
 end

app/controllers/admin/events_controller.rb

@@ -15,15 +15,14 @@ def create
       @event.teammates.build(email: current_user.email, role: "organizer").accept(current_user)
       redirect_to event_staff_path(@event)
     else
-      flash[:danger] = "There was a problem saving your event; please review the form for issues and try again."
+      flash.now[:danger] = 'There was a problem saving your event; please review the form for issues and try again.'
       render :new
     end
   end
 
   def destroy
     @event.destroy
-    flash[:info] = "Your event has been deleted."
-    redirect_to events_path, status: :see_other
+    redirect_to events_path, status: :see_other, flash: {info: 'Your event has been deleted.'}
   end
 
   def archive

app/controllers/application_controller.rb

@@ -101,8 +101,7 @@ def event_staff?(event)
   def require_user
     unless user_signed_in?
       session[:target] = request.path
-      flash[:danger] = "You must be signed in to access this page. If you haven't created an account, please create one."
-      redirect_to new_user_session_url
+      redirect_to new_user_session_url, flash: {danger: "You must be signed in to access this page. If you haven't created an account, please create one."}
     end
   end
 
@@ -116,8 +115,7 @@ def require_event
     if @event
       set_current_event(@event)
     else
-      flash[:danger] = "Your event could not be found, please check the url."
-      redirect_to events_path
+      redirect_to events_path, flash: {danger: 'Your event could not be found, please check the url.'}
     end
   end
 
@@ -130,8 +128,7 @@ def require_proposal
   end
 
   def user_not_authorized
-    flash[:alert] = "You are not authorized to perform this action."
-    redirect_to(request.referrer || root_path)
+    redirect_to (request.referrer || root_path), flash: {alert: 'You are not authorized to perform this action.'}
   end
 
   def event_params

app/controllers/concerns/program_support.rb

@@ -28,5 +28,4 @@ def set_proposal_counts
       @all_waitlisted_track_count ||= current_event.stats.all_waitlisted_proposals(sticky_selected_track)
     end
   end
-
 end

app/controllers/concerns/schedule_support.rb

@@ -7,5 +7,4 @@ module ScheduleSupport
     before_action :require_organizer
     before_action :enable_staff_schedule_subnav
   end
-
 end

app/controllers/errors_controller.rb

@@ -1,5 +1,4 @@
 class ErrorsController < ApplicationController
-
   def not_found
     render :status => 404
   end
@@ -11,5 +10,4 @@ def unacceptable
   def internal_error
     render :status => 500
   end
-
 end

app/controllers/home_controller.rb

@@ -1,5 +1,4 @@
 class HomeController < ApplicationController
-
   # Go to:
   # - the currently live event guidelines page, or
   # - /events if no current event
@@ -11,5 +10,4 @@ def show
       redirect_to events_url
     end
   end
-
 end

app/controllers/notifications_controller.rb

@@ -15,7 +15,6 @@ def show
 
   def mark_all_as_read
     current_user.notifications.where(read_at: nil).update_all(read_at: Time.current)
-    flash[:notice] = "All notifications marked as read"
-    redirect_to notifications_path, status: :see_other
+    redirect_to notifications_path, status: :see_other, flash: {notice: "All notifications marked as read"}
   end
 end