Second part of admin-namespace-reorder. Also renamed OrderGroup into Ordergroup. More view-sharing between groups is neccessary.

app/controllers/admin/ordergroups_controller.rb

@@ -0,0 +1,69 @@
+class Admin::OrdergroupsController < ApplicationController
+  before_filter :authenticate_admin
+  
+  def index
+    if (params[:per_page] && params[:per_page].to_i > 0 && params[:per_page].to_i <= 100)
+      @per_page = params[:per_page].to_i
+    else
+      @per_page = 20
+    end
+
+    # if the search field is used
+    conditions = "name LIKE '%#{params[:query]}%'" unless params[:query].nil?
+
+    @total = Ordergroup.count(:conditions => conditions )
+    @ordergroups = Ordergroup.paginate(:conditions => conditions, :page => params[:page],
+      :per_page => @per_page, :order => 'name')
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.js { render :partial => "ordergroups" }
+    end
+  end
+
+
+  def show
+    @ordergroup = Ordergroup.find(params[:id])
+  end
+
+  def new
+    @ordergroup = Ordergroup.new
+  end
+
+  def edit
+    @ordergroup = Ordergroup.find(params[:id])
+  end
+
+  def create
+    @ordergroup = Ordergroup.new(params[:Ordergroup])
+
+    if @ordergroup.save
+      flash[:notice] = 'Ordergroup was successfully created.'
+      redirect_to([:admin, @ordergroup])
+    else
+      render :action => "new"
+    end
+  end
+
+  def update
+    @ordergroup = Ordergroup.find(params[:id])
+
+    if @ordergroup.update_attributes(params[:Ordergroup])
+      flash[:notice] = 'Ordergroup was successfully updated.'
+      redirect_to([:admin, @ordergroup])
+    else
+      render :action => "edit"
+    end
+  end
+
+  def destroy
+    @ordergroup = Ordergroup.find(params[:id])
+    @ordergroup.destroy
+
+    redirect_to(admin_Ordergroups_url)
+  end
+
+  def memberships
+    @group = Ordergroup.find(params[:id])
+  end
+end

app/controllers/admin/users_controller.rb

@@ -1,6 +1,7 @@
 class Admin::UsersController < ApplicationController
   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)
       @per_page = params[:per_page].to_i

app/controllers/admin/workgroups_controller.rb

@@ -1,4 +1,5 @@
 class Admin::WorkgroupsController < ApplicationController
+  before_filter :authenticate_admin
   
   def index
     if (params[:per_page] && params[:per_page].to_i > 0 && params[:per_page].to_i <= 100)
@@ -10,6 +11,7 @@ class Admin::WorkgroupsController < ApplicationController
     # if the search field is used
     conditions = "name LIKE '%#{params[:query]}%'" unless params[:query].nil?
 
+    @total = Ordergroup.count(:conditions => conditions )
     @workgroups = Workgroup.paginate(:conditions => conditions, :page => params[:page],
       :per_page => @per_page, :order => 'name')