Fixed routing bug on (ex) admin controller.

app/controllers/admin/base_controller.rb

@@ -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

app/controllers/admin/ordergroups_controller.rb

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

app/controllers/admin/users_controller.rb

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

app/controllers/admin/workgroups_controller.rb

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

app/controllers/application_controller.rb

@@ -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
   

app/controllers/login_controller.rb

@@ -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 }

app/helpers/application_helper.rb

@@ -117,7 +117,7 @@ module ApplicationHelper
   end
 
   def tab_is_active?(tab)
-    tab[:active].detect {|c| c == controller.controller_path }
+    tab[:active].detect {|c| controller.controller_path.match(c) }
   end
 
   def icon(name, options={})

app/views/layouts/_main_tabnav.html.erb

@@ -52,7 +52,7 @@
         ]
       },
       { :name => "Administration", :url => admin_root_path,
-        :active => ["admin", "admin/users", "admin/ordergroups", "admin/workgroups"],
+        :active => ["admin/"],
         :access_denied? => (!u.role_admin?),
         :subnav => [
           { :name => "Benutzerinnen", :url => admin_users_path },

config/routes.rb

@@ -68,7 +68,7 @@ ActionController::Routing::Routes.draw do |map|
 
   # Administration
   map.namespace :admin do |admin|
-    admin.root :controller => "admin", :action => "index"
+    admin.root :controller => "base", :action => "index"
     admin.resources :users
     admin.resources :workgroups, :member => { :memberships => :get }
     admin.resources :ordergroups, :member => { :memberships => :get }