carnival 0.2.5 → 0.2.6

data/app/services/carnival/query_form_creator.rb

@@ -21,7 +21,7 @@ module Carnival
       if date_filter_field.present?
         query_form.date_period_label = date_filter_field.default_date_filter if query_form.date_period_label.nil?
         query_form.date_period_from = date_filter_field.date_filter_periods[query_form.date_period_label].first if query_form.date_period_from.nil?
-        query_form.date_period_to = date_filter_field.date_filter_periods[query_form.date_period_label].first if query_form.date_period_to.nil?
+        query_form.date_period_to = date_filter_field.date_filter_periods[query_form.date_period_label].last if query_form.date_period_to.nil?
       end
 
       query_form

data/app/services/carnival/query_service.rb

@@ -87,7 +87,7 @@ module Carnival
     end
 
     def includes_relations(records)
-      if @should_include_relation and @presenter.join_tables.size > 0 
+      if @should_include_relation and @presenter.join_tables.size > 0
         records.includes(*@presenter.join_tables)
       else
         records

data/app/views/carnival/shared/_advanced_search.html.haml

@@ -8,10 +8,11 @@
       .search_field
         .label
           - label_field = presenter.get_field(field)
+          - default_label = t("activerecord.attributes.#{presenter.full_model_name}.#{key}")
           - if presenter.relation_field?(label_field)
-            = label_tag key, t("activerecord.attributes.#{label_field.name}")
+            = label_tag key, t("activerecord.attributes.#{label_field.name}", default: default_label)
           - else
-            = label_tag key, t("activerecord.attributes.#{presenter.full_model_name}.#{key}")
+            = label_tag key, default_label
         .field
           = render '/carnival/shared/advanced_search_field', :field => field, :presenter => presenter, :value => value
   %li.search_item

data/lib/carnival/version.rb

@@ -1,3 +1,3 @@
 module Carnival
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carnival
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails