Fixed admin, orders, wiki views. Converted all erb to haml.

app/controllers/admin/ordergroups_controller.rb

@@ -10,12 +10,7 @@ class Admin::OrdergroupsController < Admin::BaseController
       @ordergroups = @ordergroups.where('name LIKE ?', "%#{params[:query]}%")
     end
 
-    @ordergroups = @ordergroups.paginate(:page => params[:page], :per_page => @per_page)
-
-    respond_to do |format|
-      format.html # index.html.haml
-      format.js { render :layout => false } # index.js.erb
-    end
+    @ordergroups = @ordergroups.page(params[:page]).per(@per_page)
   end
 
   def destroy

app/controllers/admin/users_controller.rb

@@ -5,15 +5,11 @@ class Admin::UsersController < Admin::BaseController
     @users = User.order('nick ASC')
 
     # if somebody uses the search field:
-    unless params[:query].blank?
-      @users = @users.where(({:first_name.matches => "%#{params[:query]}%"}) | ({:last_name.matches => "%#{params[:query]}%"}) | ({:nick.matches => "%#{params[:query]}%"}))
+    unless params[:user_name].blank?
+      @users = @users.where("first_name LIKE :user_name OR last_name LIKE :user_name OR nick LIKE :user_name",
+                            user_name: "%#{params[:user_name]}%")
     end
 
-    @users = @users.paginate(:page => params[:page], :per_page => @per_page)
-
-    respond_to do |format|
-      format.html # index.html.haml
-      format.js { render :layout => false } # index.js.erb
-    end
+    @users = @users.page(params[:page]).per(@per_page)
   end
 end

app/controllers/admin/workgroups_controller.rb

@@ -7,12 +7,7 @@ class Admin::WorkgroupsController < Admin::BaseController
     # if somebody uses the search field:
     @workgroups = @workgroups.where('name LIKE ?', "%#{params[:query]}%") unless params[:query].blank?
 
-    @workgroups = @workgroups.paginate(:page => params[:page], :per_page => @per_page)
-
-    respond_to do |format|
-      format.html # index.html.haml
-      format.js { render :layout => false } # index.js.erb
-    end
+    @workgroups = @workgroups.page(params[:page]).per(@per_page)
   end
 
   def destroy

app/controllers/group_orders_controller.rb

@@ -54,8 +54,7 @@ class GroupOrdersController < ApplicationController
   # if selected, it shows all orders of the foodcoop
   def archive
     # get only orders belonging to the ordergroup
-    @closed_orders = Order.paginate :page => params[:page], :per_page => 10,
-                                    :conditions => { :state => 'closed' }, :order => "orders.ends DESC"
+    @closed_orders = Order.closed.page(params[:page]).per(10)
 
     respond_to do |format|
       format.html # archive.html.haml

app/controllers/invites_controller.rb

@@ -11,9 +11,15 @@ class InvitesController < ApplicationController
     @invite = Invite.new(params[:invite])
     if @invite.save
       Mailer.delay.invite(FoodsoftConfig.scope, @invite.id)
-      redirect_to back_or_default_path, notice: "Benutzerin wurde erfolgreich eingeladen."
+
+      respond_to do |format|
+        format.html do
+          redirect_to back_or_default_path, notice: "Benutzerin wurde erfolgreich eingeladen."
+        end
+        format.js { render layout: false }
+      end
+
     else
-      logger.debug "[debug] errors: #{@invite.errors.messages}"
       render action: :new
     end
   end

app/controllers/orders_controller.rb

@@ -20,18 +20,7 @@ class OrdersController < ApplicationController
     else
       sort = "ends DESC"
     end
-    @orders = Order.paginate :page => params[:page], :per_page => @per_page, 
-                             :order => sort, :conditions => "state != 'open'",
-                             :include => :supplier
-    
-    respond_to do |format|
-      format.html
-      format.js do
-        render :update do |page|
-          page.replace_html 'orders_table', :partial => "orders"
-        end
-      end
-    end
+    @orders = Order.page(params[:page]).per(@per_page).order(sort).where("state != 'open'").includes(:supplier)
   end
 
   # Gives a view for the results to a specific order
@@ -43,7 +32,7 @@ class OrdersController < ApplicationController
       format.html
       format.js do
         @partial = case params[:view]
-                     when 'normal' then "articles"
+                     when 'default' then "articles"
                      when 'groups'then 'shared/articles_by_groups'
                      when 'articles'then 'shared/articles_by_articles'
                      else 'articles'