migrate to Rails 4.0 (closes foodcoops#214)

Conflicts:
	Gemfile.lock

app/controllers/admin/base_controller.rb

@@ -3,8 +3,8 @@ class Admin::BaseController < ApplicationController
   
   def index
     @user = self.current_user
-    @groups = Group.find(:all, :limit => 10, :order => 'created_on DESC', :conditions => {:deleted_at => nil})
-    @users = User.find(:all, :limit => 10, :order => 'created_on DESC')
+    @groups = Group.where(deleted_at: nil).order('created_on DESC').limit(10)
+    @users = User.order('created_on DESC').limit(10)
   end
   
 end

app/controllers/admin/workgroups_controller.rb

@@ -15,6 +15,6 @@ class Admin::WorkgroupsController < Admin::BaseController
     @workgroup.destroy
     redirect_to admin_workgroups_url, notice: t('admin.workgroups.destroy.notice')
   rescue => error
-    redirect_to admin_workgroups_url, alert: t('admin.workgroups.destroy.error')
+    redirect_to admin_workgroups_url, alert: t('admin.workgroups.destroy.error', error: error.message)
   end
 end

app/controllers/articles_controller.rb

@@ -199,11 +199,11 @@ class ArticlesController < ApplicationController
   # renders a view to import articles in local database
   #   
   def shared
-    # build array of keywords, required for meta search _all suffix
-    params[:search][:name_contains_all] = params[:search][:name_contains_all].split(' ') if params[:search]
+    # build array of keywords, required for ransack _all suffix
+    params[:q][:name_cont_all] = params[:q][:name_cont_all].split(' ') if params[:q]
     # Build search with meta search plugin
-    @search = @supplier.shared_supplier.shared_articles.search(params[:search])
-    @articles = @search.page(params[:page]).per(10)
+    @search = @supplier.shared_supplier.shared_articles.search(params[:q])
+    @articles = @search.result.page(params[:page]).per(10)
     render :layout => false
   end
   

app/controllers/deliveries_controller.rb

@@ -4,7 +4,7 @@ class DeliveriesController < ApplicationController
   before_filter :find_supplier, :exclude => :fill_new_stock_article_form
   
   def index
-    @deliveries = @supplier.deliveries.all :order => 'delivered_on DESC'
+    @deliveries = @supplier.deliveries.order('delivered_on DESC')
   end
 
   def show

app/controllers/finance/balancing_controller.rb

@@ -16,13 +16,13 @@ class Finance::BalancingController < Finance::BaseController
     sort_param = params['sort'] || 'name'
     @articles = case sort_param
                   when 'name' then
-                    OrderArticle.sort_by_name(@articles)
+                    @articles.order('articles.name ASC')
                   when 'name_reverse' then
-                    OrderArticle.sort_by_name(@articles).reverse
+                    @articles.order('articles.name DESC')
                   when 'order_number' then
-                    OrderArticle.sort_by_order_number(@articles)
+                    @articles.order('articles.order_number ASC')
                   when 'order_number_reverse' then
-                    OrderArticle.sort_by_order_number(@articles).reverse
+                    @articles.order('articles.order_number DESC')
                   else
                     @articles
                 end

app/controllers/foodcoop/workgroups_controller.rb

@@ -4,7 +4,7 @@ class Foodcoop::WorkgroupsController < ApplicationController
     :except => [:index]
 
   def index
-    @workgroups = Workgroup.all :order => "name"
+    @workgroups = Workgroup.order("name")
   end
   
   def edit

app/controllers/group_orders_controller.rb

@@ -74,8 +74,7 @@ class GroupOrdersController < ApplicationController
   end
 
   def ensure_open_order
-    @order = Order.find((params[:order_id] || params[:group_order][:order_id]),
-                        :include => [:supplier, :order_articles])
+    @order = Order.includes([:supplier, :order_articles]).find(params[:order_id] || params[:group_order][:order_id])
     unless @order.open?
       flash[:notice] = I18n.t('group_orders.errors.closed')
       redirect_to :action => 'index'

app/controllers/orders_controller.rb

@@ -21,7 +21,7 @@ class OrdersController < ApplicationController
     else
       sort = "ends DESC"
     end
-    @orders = Order.closed.page(params[:page]).per(@per_page).includes(:supplier).order(sort)
+    @orders = Order.closed.includes(:supplier).order(sort).page(params[:page]).per(@per_page)
   end
 
   # Gives a view for the results to a specific order
@@ -145,7 +145,7 @@ class OrdersController < ApplicationController
     text += "****** " + I18n.t('orders.fax.articles') + "\n\n"
     text += I18n.t('orders.fax.number') + "   " + I18n.t('orders.fax.amount') + "   " + I18n.t('orders.fax.name') + "\n"
     # now display all ordered articles
-    @order.order_articles.ordered.all(:include => [:article, :article_price]).each do |oa|
+    @order.order_articles.ordered.includes([:article, :article_price]).each do |oa|
       number = oa.article.order_number
       (8 - number.size).times { number += " " }
       quantity = oa.units_to_order.to_i.to_s