Changed behaviour of acts_as_paraniod. Finder wrapper removed an replaced by simple named_scope 'without_deleted'.

app/controllers/admin/ordergroups_controller.rb

@@ -11,8 +11,8 @@ class Admin::OrdergroupsController < ApplicationController
     # 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],
+    @total = Ordergroup.without_deleted.count(:conditions => conditions )
+    @ordergroups = Ordergroup.without_deleted.paginate(:conditions => conditions, :page => params[:page],
       :per_page => @per_page, :order => 'name')
 
     respond_to do |format|
@@ -60,7 +60,7 @@ class Admin::OrdergroupsController < ApplicationController
     @ordergroup = Ordergroup.find(params[:id])
     @ordergroup.destroy
 
-    redirect_to(admin_Ordergroups_url)
+    redirect_to(admin_ordergroups_url)
   end
 
   def memberships

app/controllers/articles_controller.rb

@@ -28,12 +28,14 @@ class ArticlesController < ApplicationController
     # if somebody uses the search field:
     conditions = ["articles.name LIKE ?", "%#{params[:query]}%"] unless params[:query].nil?
 
-    @total = @supplier.articles.count(:conditions => conditions)
-    @articles = @supplier.articles.paginate(:order => sort,
-                                             :conditions => conditions,
-                                             :page => params[:page],
-                                             :per_page => @per_page,
-                                             :include => :article_category)
+    @total = @supplier.articles.without_deleted.count(:conditions => conditions)
+    @articles = @supplier.articles.without_deleted.paginate(
+      :order => sort,
+      :conditions => conditions,
+      :page => params[:page],
+      :per_page => @per_page,
+      :include => :article_category
+    )
 
     respond_to do |format|
       format.html # list.haml
@@ -136,7 +138,7 @@ class ArticlesController < ApplicationController
   
   # Renders a form for editing all articles from a supplier
   def edit_all
-    @articles = @supplier.articles.all
+    @articles = @supplier.articles.without_deleted
   end
 
   # Updates all article of specific supplier

app/controllers/deliveries_controller.rb

@@ -101,7 +101,7 @@ class DeliveriesController < ApplicationController
   end
 
   def auto_complete_for_article_name
-    @articles = @supplier.articles.find(:all,
+    @articles = @supplier.articles.without_deleted.find(:all,
       :conditions => [ "LOWER(articles.name) LIKE ?", '%' + params[:article][:name].downcase + '%' ],
       :limit => 8)
     render :partial => 'shared/auto_complete_articles'

app/controllers/finance/transactions_controller.rb

@@ -20,9 +20,9 @@ class Finance::TransactionsController < ApplicationController
 
     conditions = "name LIKE '%#{params[:query]}%'" unless params[:query].nil?
 
-    @total = Ordergroup.count(:conditions => conditions)
-    @groups = Ordergroup.paginate :conditions => conditions, :page => params[:page],
-      :per_page => @per_page, :order => sort
+    @total = Ordergroup.without_deleted.count(:conditions => conditions)
+    @groups = Ordergroup.without_deleted.paginate :conditions => conditions,
+      :page => params[:page], :per_page => @per_page, :order => sort
 
     respond_to do |format|
       format.html

app/controllers/suppliers_controller.rb

@@ -3,7 +3,7 @@ class SuppliersController < ApplicationController
   helper :deliveries
 
   def index
-    @suppliers = Supplier.all :order => 'name'
+    @suppliers = Supplier.without_deleted :order => 'name'
     @deliveries = Delivery.recent
   end
 
@@ -53,7 +53,7 @@ class SuppliersController < ApplicationController
     flash[:notice] = "Lieferant wurde gelöscht"
     redirect_to suppliers_path
     rescue => e
-      flash[:error] = _("An error has occurred: ") + e.message
+      flash[:error] = "Ein Fehler ist aufgetreten: " + e.message
       redirect_to @supplier
   end