base controller

Conflicts:
	app/controllers/admin/commercials_controller.rb
	app/controllers/admin/questions_controller.rb
	app/controllers/admin/users_controller.rb

app/controllers/admin/base_controller.rb

@@ -0,0 +1,17 @@
+module Admin
+  class BaseController < ApplicationController
+    before_filter :verify_user_admin
+
+    def verify_user_admin
+      if (current_user.nil?)
+        redirect_to new_user_session_path
+        return false
+      end
+      unless (current_user.has_role? :organizer, :any) || (current_user.has_role? :cfp, :any) ||
+             (current_user.has_role? :info_desk, :any) ||
+             (current_user.has_role? :volunteers_coordinator, :any) || current_user.is_admin
+        raise CanCan::AccessDenied.new('You are not authorized to access this area!')
+      end
+    end
+  end
+end

app/controllers/admin/callforpapers_controller.rb

@@ -1,5 +1,5 @@
 module Admin
-  class CallforpapersController < ApplicationController
+  class CallforpapersController < Admin::BaseController
     load_and_authorize_resource :conference, find_by: :short_title
 #     load_and_authorize_resource :cfp, class: 'CallForPapers', through: :conference
 

app/controllers/admin/campaigns_controller.rb

@@ -1,5 +1,5 @@
 module Admin
-  class CampaignsController < ApplicationController
+  class CampaignsController < Admin::BaseController
     load_and_authorize_resource :conference, find_by: :short_title
     load_and_authorize_resource :campaign, through: :conference
 

app/controllers/admin/commercials_controller.rb

@@ -1,5 +1,5 @@
 module Admin
-  class CommercialsController < ApplicationController
+  class CommercialsController < Admin::BaseController
     load_and_authorize_resource :conference, find_by: :short_title
     load_and_authorize_resource through: :conference, except: [:new, :create]
 
@@ -9,7 +9,7 @@ module Admin
 
     def new
       @commercial = @conference.commercials.build
-      authorize! :create, @commercial
+      authorize! :create, @conference.commercials.new
     end
 
     def edit; end

app/controllers/admin/conference_controller.rb

@@ -1,5 +1,5 @@
 module Admin
-  class ConferenceController < ApplicationController
+  class ConferenceController < Admin::BaseController
     load_and_authorize_resource :conference, find_by: :short_title
     load_resource :user, only: [:remove_user]
 

app/controllers/admin/contacts_controller.rb

@@ -1,5 +1,5 @@
 module Admin
-  class ContactsController < ApplicationController
+  class ContactsController < Admin::BaseController
     load_and_authorize_resource :conference, find_by: :short_title
     load_and_authorize_resource through: :conference, singleton: true
 

app/controllers/admin/dietchoices_controller.rb

@@ -1,5 +1,5 @@
 module Admin
-  class DietchoicesController < ApplicationController
+  class DietchoicesController < Admin::BaseController
     load_and_authorize_resource :conference, find_by: :short_title
     load_and_authorize_resource :dietary_choice, through: :conference
 

app/controllers/admin/difficulty_levels_controller.rb

@@ -1,5 +1,5 @@
 module Admin
-  class DifficultyLevelsController < ApplicationController
+  class DifficultyLevelsController < Admin::BaseController
     load_and_authorize_resource :conference, find_by: :short_title
     authorize_resource through: :conference
 

app/controllers/admin/emails_controller.rb

@@ -1,5 +1,5 @@
 module Admin
-  class EmailsController < ApplicationController
+  class EmailsController < Admin::BaseController
     load_and_authorize_resource :conference, find_by: :short_title
     load_and_authorize_resource class: EmailSettings
 

app/controllers/admin/event_types_controller.rb

@@ -1,5 +1,5 @@
 module Admin
-  class EventTypesController < ApplicationController
+  class EventTypesController < Admin::BaseController
     load_and_authorize_resource :conference, find_by: :short_title
     authorize_resource :event_type, through: :conference
 

app/controllers/admin/events_controller.rb

@@ -1,5 +1,5 @@
 module Admin
-  class EventsController < ApplicationController
+  class EventsController < Admin::BaseController
     load_and_authorize_resource :conference, find_by: :short_title
     load_and_authorize_resource :event, through: :conference
 

app/controllers/admin/lodgings_controller.rb

@@ -1,5 +1,5 @@
 module Admin
-  class LodgingsController < ApplicationController
+  class LodgingsController < Admin::BaseController
     load_and_authorize_resource :conference, find_by: :short_title
     load_and_authorize_resource :venue, through: :conference, singleton: true
     authorize_resource :lodging, through: :venue

app/controllers/admin/photos_controller.rb

@@ -1,5 +1,5 @@
 module Admin
-  class PhotosController < ApplicationController
+  class PhotosController < Admin::BaseController
     load_and_authorize_resource :conference, find_by: :short_title
     load_and_authorize_resource through: :conference
 

app/controllers/admin/questions_controller.rb

@@ -1,5 +1,5 @@
 module Admin
-  class QuestionsController < ApplicationController
+  class QuestionsController < Admin::BaseController
     load_and_authorize_resource :conference, find_by: :short_title
     load_and_authorize_resource through: :conference, except: [:new, :create]
 

app/controllers/admin/registrations_controller.rb

@@ -1,5 +1,5 @@
 module Admin
-  class RegistrationsController < ApplicationController
+  class RegistrationsController < Admin::BaseController
     load_and_authorize_resource :conference, find_by: :short_title
     load_and_authorize_resource through: :conference
 

app/controllers/admin/rooms_controller.rb

@@ -1,5 +1,5 @@
 module Admin
-  class RoomsController < ApplicationController
+  class RoomsController < Admin::BaseController
     load_and_authorize_resource :conference, find_by: :short_title
     authorize_resource through: :conference
 

app/controllers/admin/schedules_controller.rb

@@ -1,5 +1,5 @@
 module Admin
-  class SchedulesController < ApplicationController
+  class SchedulesController < Admin::BaseController
     # By authorizing 'conference' resource, we can ensure there will be no unauthorized access to
     # the schedule of a conference, which should not be accessed in the first place
     load_and_authorize_resource :conference, find_by: :short_title

app/controllers/admin/social_events_controller.rb

@@ -1,5 +1,5 @@
 module Admin
-  class SocialEventsController < ApplicationController
+  class SocialEventsController < Admin::BaseController
     load_and_authorize_resource :conference, find_by: :short_title
     authorize_resource :social_event, through: :conference
 

app/controllers/admin/speakers_controller.rb

@@ -1,5 +1,5 @@
 module Admin
-  class SpeakersController < ApplicationController
+  class SpeakersController < Admin::BaseController
     load_and_authorize_resource :conference, find_by: :short_title
     load_and_authorize_resource :event
 

app/controllers/admin/sponsors_controller.rb

@@ -1,5 +1,5 @@
 module Admin
-  class SponsorsController < ApplicationController
+  class SponsorsController < Admin::BaseController
     load_and_authorize_resource :conference, find_by: :short_title
     authorize_resource :sponsor, through: :conference
 

app/controllers/admin/sponsorship_levels_controller.rb

@@ -1,5 +1,5 @@
 module Admin
-  class SponsorshipLevelsController < ApplicationController
+  class SponsorshipLevelsController < Admin::BaseController
     load_and_authorize_resource :conference, find_by: :short_title
     authorize_resource through: :conference
 

app/controllers/admin/stats_controller.rb

@@ -1,5 +1,5 @@
 module Admin
-  class StatsController < ApplicationController
+  class StatsController < Admin::BaseController
     load_and_authorize_resource
     load_and_authorize_resource :conference, find_by: :short_title
 

app/controllers/admin/supporter_levels_controller.rb

@@ -1,5 +1,5 @@
 module Admin
-  class SupporterLevelsController < ApplicationController
+  class SupporterLevelsController < Admin::BaseController
     load_and_authorize_resource :conference, find_by: :short_title
     authorize_resource through: :conference
 

app/controllers/admin/supporters_controller.rb

@@ -1,5 +1,5 @@
 module Admin
-  class SupportersController < ApplicationController
+  class SupportersController < Admin::BaseController
     load_and_authorize_resource :conference, find_by: :short_title
     load_and_authorize_resource through: :conference
 

app/controllers/admin/targets_controller.rb

@@ -1,5 +1,5 @@
 module Admin
-  class TargetsController < ApplicationController
+  class TargetsController < Admin::BaseController
     load_and_authorize_resource :conference, find_by: :short_title
     authorize_resource through: :conference
 

app/controllers/admin/tracks_controller.rb

@@ -1,5 +1,5 @@
 module Admin
-  class TracksController < ApplicationController
+  class TracksController < Admin::BaseController
     load_and_authorize_resource :conference, find_by: :short_title
     authorize_resource through: :conference
 

app/controllers/admin/users_controller.rb

@@ -1,5 +1,5 @@
 module Admin
-  class UsersController < ApplicationController
+  class UsersController < Admin::BaseController
     load_and_authorize_resource
 
     def new
@@ -21,9 +21,9 @@ module Admin
 
     def update
       if @user.update_attributes(params[:user])
-        redirect_to admin_users_path, notice: "Updated #{@user.email}"
+        redirect_to admin_users_path, notice: "Updated #{@user.name} (#{@user.email})!"
       else
-        redirect_to admin_users_path, alert: "Could not update #{@user.name}. #{@user.errors.full_messages.join '. '}."
+        redirect_to admin_users_path, alert: "Could not update #{@user.name} (#{@user.email}). #{@user.errors.full_messages.join('. ')}."
       end
     end
 

app/controllers/admin/venue_controller.rb

@@ -1,5 +1,5 @@
 module Admin
-  class VenueController < ApplicationController
+  class VenueController < Admin::BaseController
     load_and_authorize_resource :conference, find_by: :short_title
     load_and_authorize_resource :venue, through: :conference, singleton: true
 

app/controllers/admin/volunteers_controller.rb

@@ -1,5 +1,5 @@
 module Admin
-  class VolunteersController < ApplicationController
+  class VolunteersController < Admin::BaseController
     load_and_authorize_resource :conference, find_by: :short_title
 
     def index