Merge branch 'feature_engine_tear_out' of https://dev.finn.de/git/reporting-engine into feature_engine_tear_out

14 years ago · 139bd7756d
parent 0f170fcda0 c2839ec6c8
commit 139bd7756d
2 changed files with 2 additions and 1 deletions
--- a/app/models/report/chainable.rb
+++ b/app/models/report/chainable.rb
@ -268,7 +268,7 @@ class Report < ActiveRecord::Base
    end

    def self.last_table
-      @last_table ||= 'entries'
+      @last_table ||= engine::Filter::NoFilter.table_name
    end

    def self.table_name(value = nil)
--- a/app/models/report/filter/no_filter.rb
+++ b/app/models/report/filter/no_filter.rb
@ -1,4 +1,5 @@
 class Report::Filter::NoFilter < Report::Filter::Base
+  table_name "entries"
  dont_display!
  singleton