app/models/refine/inline/criterion.rb in refine-rails-2.9.1 vs app/models/refine/inline/criterion.rb in refine-rails-2.9.2
- old
+ new
@@ -19,10 +19,11 @@
# suffix nested hash keys with '_attributes' to initialize objects
attrs[:input_attributes] = attrs.delete(:input)
if input_attrs = attrs[:input_attributes]
input_attrs[:count_refinement_attributes] = input_attrs.delete(:count_refinement)
+ input_attrs[:date_refinement_attributes] = input_attrs.delete(:date_refinement)
end
new(attrs)
end
#
@@ -91,10 +92,11 @@
def to_blueprint_node
result = attributes.slice(:condition_id, :input_attributes)
result[:input] = result.delete(:input_attributes)
if input_attrs = result[:input]
input_attrs[:count_refinement] = input_attrs.delete(:count_refinement_attributes)
+ input_attrs[:date_refinement] = input_attrs.delete(:date_refinement_attributes)
end
result
end
def human_readable_value
@@ -119,11 +121,9 @@
selected_clause = condition.clauses.detect {|c| c.id == input.clause } || condition.clauses.first
selected_clause.meta[:multiple].present?
end
def validate!
- # TODO figure out how to validate inputs with count refinements
- return if input.count_refinement.attributes.present?
errors.clear
begin
query_for_validate = refine_filter.initial_query || refine_filter.model.all
condition&.apply(input_attributes, refine_filter.table, query_for_validate)
rescue Refine::Conditions::Errors::ConditionClauseError => e