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

pull/6827/head
jwollert 14 years ago
commit 1e99f0f831
  1. 4
      app/models/report/chainable.rb
  2. 5
      app/models/report/filter/base.rb
  3. 2
      app/models/report/result.rb
  4. 5
      lib/big_decimal_patch.rb

@ -21,7 +21,9 @@ class Report < ActiveRecord::Base
end
def self.base?
superclass == Chainable or self == Chainable
superclass == engine::Chainable or self == engine::Chainable or
superclass == Chainable or self == Chainable or
self == engine::Filter::Base or self == engine::GroupBy::Base
end
def self.base

@ -84,8 +84,9 @@ class Report::Filter
[]
end
def initialze(child = nil, options = {})
raise ArgumentError, "Child has to be a Filter." if child and not child.filter?
def initialize(child = nil, options = {})
# TODO: wtf?
#raise ArgumentError, "Child has to be a Filter." if child and not child.filter?
@values = []
super
end

@ -1,4 +1,4 @@
module Report::Result
class Report::Result
class Base
attr_accessor :parent, :type, :important_fields
attr_accessor :key

@ -13,4 +13,9 @@ module BigDecimalPatch
::String.send :include, self
def to_d; ::BigDecimal.new(self) end
end
module NilClass
::NilClass.send :include, self
def to_d; 0 end
end
end

Loading…
Cancel
Save