From 91e6797b40cc34fe982e48f075a667845d5b3c83 Mon Sep 17 00:00:00 2001 From: Mike McCabe Date: Wed, 13 Nov 2013 18:23:04 -0500 Subject: [PATCH] adding broken functionality for A7 --- app/controllers/admin_controller.rb | 8 +++++++- app/controllers/application_controller.rb | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index 5926b40..d7a29c7 100755 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -1,6 +1,6 @@ class AdminController < ApplicationController - # before_filter :administrative + before_filter :administrative, :if => :admin_param skip_before_filter :has_info def dashboard @@ -45,4 +45,10 @@ class AdminController < ApplicationController end end + + private + + def admin_param + params[:admin_id] != '1' + end end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index a0ef5cf..9d5628d 100755 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -23,7 +23,7 @@ class ApplicationController < ActionController::Base def administrative if not is_admin? - reset_session + #reset_session redirect_to root_url end end