Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Fixed routing bug on (ex) admin controller.

Browse source
This commit is contained in:
Benjamin Meichsner 2010-03-22 01:58:37 +01:00
parent 9a54d8504c
commit 571548dfbc
10 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/admin_controller.rb → app/controllers/admin/base_controller.rb
View file

@ -1,7 +1,5 @@
class AdminController < ApplicationController
class Admin::BaseController < ApplicationController
before_filter :authenticate_admin
filter_parameter_logging :password, :password_confirmation # do not log passwort parameters
def index
@user = self.current_user

3
app/controllers/admin/ordergroups_controller.rb
View file

@ -1,5 +1,4 @@
class Admin::OrdergroupsController < ApplicationController
before_filter :authenticate_admin
class Admin::OrdergroupsController < Admin::BaseController
def index
if (params[:per_page] && params[:per_page].to_i > 0 && params[:per_page].to_i <= 100)

4
app/controllers/admin/users_controller.rb
View file

@ -1,6 +1,4 @@
class Admin::UsersController < ApplicationController
before_filter :authenticate_admin
filter_parameter_logging :password, :password_confirmation # do not log passwort parameters
class Admin::UsersController < Admin::BaseController
def index
if (params[:per_page] && params[:per_page].to_i > 0 && params[:per_page].to_i <= 100)

3
app/controllers/admin/workgroups_controller.rb
View file

@ -1,5 +1,4 @@
class Admin::WorkgroupsController < ApplicationController
before_filter :authenticate_admin
class Admin::WorkgroupsController < Admin::BaseController
def index
if (params[:per_page] && params[:per_page].to_i > 0 && params[:per_page].to_i <= 100)

1
app/controllers/application_controller.rb
View file

@ -1,5 +1,6 @@
class ApplicationController < ActionController::Base
filter_parameter_logging :password, :password_confirmation # do not log passwort parameters
before_filter :select_foodcoop, :authenticate, :store_controller
after_filter :remove_controller

1
app/controllers/login_controller.rb
View file

@ -1,6 +1,5 @@
class LoginController < ApplicationController
skip_before_filter :authenticate # no authentication since this is the login page
filter_parameter_logging "password" # do not log "password" parameter
before_filter :validate_token, :only => [:password, :update_password]
verify :method => :post, :only => [:login, :reset_password, :new], :redirect_to => { :action => :index }