active_scaffold 3.0.12 → 3.0.21

data/lib/active_scaffold/bridges/date_picker/lib/datepicker_bridge.rb

@@ -26,6 +26,15 @@ ActiveScaffold::Config::Core.class_eval do
   alias_method_chain :initialize, :date_picker
 end
 
+ActiveRecord::ConnectionAdapters::Column.class_eval do
+  class << self
+    def fallback_string_to_date_with_date_picker(string)
+      Date.strptime(string, I18n.t('date.formats.default')) rescue fallback_string_to_date_without_date_picker(string)
+    end
+    alias_method_chain :fallback_string_to_date, :date_picker
+  end
+end
+
 
 module ActiveScaffold
   module Bridges

data/lib/active_scaffold/bridges/dragonfly/bridge.rb

@@ -0,0 +1,9 @@
+ActiveScaffold::Bridges.bridge "Dragonfly" do
+  install do
+    require File.join(File.dirname(__FILE__), "lib/form_ui")
+    require File.join(File.dirname(__FILE__), "lib/list_ui")
+    require File.join(File.dirname(__FILE__), "lib/dragonfly_bridge_helpers")
+    require File.join(File.dirname(__FILE__), "lib/dragonfly_bridge")
+    ActiveScaffold::Config::Core.send :include, ActiveScaffold::Bridges::Dragonfly::Lib::DragonflyBridge
+  end
+end

data/lib/active_scaffold/bridges/dragonfly/bridge.rb~

@@ -0,0 +1,12 @@
+ActiveScaffold::Bridges.bridge "Paperclip" do
+  install do
+    if ActiveScaffold::Config::Core.instance_methods.include?("initialize_with_paperclip")
+      raise RuntimeError, "We've detected that you have active_scaffold_paperclip_bridge installed. This plugin has been moved to core. Please remove active_scaffold_paperclip_bridge to prevent any conflicts"
+    end
+    require File.join(File.dirname(__FILE__), "lib/form_ui")
+    require File.join(File.dirname(__FILE__), "lib/list_ui")
+    require File.join(File.dirname(__FILE__), "lib/paperclip_bridge_helpers")
+    require File.join(File.dirname(__FILE__), "lib/paperclip_bridge")
+    ActiveScaffold::Config::Core.send :include, ActiveScaffold::Bridges::Paperclip::Lib::PaperclipBridge
+  end
+end

data/lib/active_scaffold/bridges/dragonfly/lib/dragonfly_bridge.rb

@@ -0,0 +1,36 @@
+module ActiveScaffold
+  module Bridges
+    module Dragonfly
+      module Lib
+        module DragonflyBridge
+          def initialize_with_dragonfly(model_id)
+            initialize_without_dragonfly(model_id)
+            return unless self.model.respond_to?(:dragonfly_attachment_classes) && self.model.dragonfly_attachment_classes.present?
+      
+            self.update.multipart = true
+            self.create.multipart = true
+      
+            self.model.dragonfly_attachment_classes.each do |attachment|
+              configure_dragonfly_field(attachment.attribute)
+            end
+          end
+      
+          def self.included(base)
+            base.alias_method_chain :initialize, :dragonfly
+          end
+      
+          private
+          def configure_dragonfly_field(field)
+            self.columns << field
+            self.columns[field].form_ui ||= :dragonfly
+            self.columns[field].params.add "remove_#{field}"
+      
+            [:name, :uid].each do |f|
+              self.columns.exclude("#{field}_#{f}".to_sym)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_scaffold/bridges/dragonfly/lib/dragonfly_bridge.rb~

@@ -0,0 +1,36 @@
+module ActiveScaffold
+  module Bridges
+    module Dragonfly
+      module Lib
+        module DragonflyBridge
+          def initialize_with_dragonfly(model_id)
+            initialize_without_dragonfly(model_id)
+            return unless self.model.respond_to?(:dragonfly_attachment_classes) && self.model.dragonfly_attachment_classes.present?
+      
+            self.update.multipart = true
+            self.create.multipart = true
+      
+            self.model.dragonfly_attachment_classes.each do |attachment|
+              configure_dragonfly_field(attachment.attribute)
+            end
+          end
+      
+          def self.included(base)
+            base.alias_method_chain :initialize, :dragonfly
+          end
+      
+          private
+          def configure_dragonfly_field(field)
+            self.columns << field
+            self.columns[field].form_ui ||= :dragonfly
+            self.columns[field].params.add "delete_#{field}"
+      
+            [:name, :uid].each do |f|
+              self.columns.exclude("#{field}_#{f}".to_sym)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_scaffold/bridges/dragonfly/lib/dragonfly_bridge_helpers.rb

@@ -0,0 +1,12 @@
+module ActiveScaffold
+  module Bridges
+    module Dragonfly
+      module Lib
+        module DragonflyBridgeHelpers
+          mattr_accessor :thumbnail_style
+          self.thumbnail_style = 'x30>'
+        end
+      end
+    end
+  end
+end

data/lib/active_scaffold/bridges/dragonfly/lib/dragonfly_bridge_helpers.rb~

@@ -0,0 +1,12 @@
+module ActiveScaffold
+  module Bridges
+    module Dragonfly
+      module Lib
+        module DragonflyBridgeHelpers
+          mattr_accessor :thumbnail_style
+          self.thumbnail_style = :thumbnail
+        end
+      end
+    end
+  end
+end

data/lib/active_scaffold/bridges/dragonfly/lib/form_ui.rb

@@ -0,0 +1,27 @@
+module ActiveScaffold
+  module Helpers
+    module FormColumnHelpers
+      def active_scaffold_input_dragonfly(column, options)
+        options = active_scaffold_input_text_options(options)
+        input = file_field(:record, column.name, options)
+        dragonfly = @record.send("#{column.name}")
+        if dragonfly.present?
+          if ActiveScaffold.js_framework == :jquery
+            js_remove_file_code = "$(this).prev().val('true'); $(this).parent().hide().next().show(); return false;";
+          else
+            js_remove_file_code = "$(this).previous().value='true'; $(this).up().hide().next().show(); return false;";
+          end
+          
+          content = active_scaffold_column_dragonfly(column, @record)
+          content_tag(:div,
+            content + " | " +
+              hidden_field(:record, "remove_#{column.name}", :value => "false") +
+              content_tag(:a, as_(:remove_file), {:href => '#', :onclick => js_remove_file_code}) 
+          ) + content_tag(:div, input, :style => "display: none")
+        else
+          input
+        end
+      end
+    end
+  end
+end

data/lib/active_scaffold/bridges/dragonfly/lib/form_ui.rb~

@@ -0,0 +1,27 @@
+module ActiveScaffold
+  module Helpers
+    module FormColumnHelpers
+      def active_scaffold_input_dragonfly(column, options)
+        options = active_scaffold_input_text_options(options)
+        input = file_field(:record, column.name, options)
+        dragonfly = @record.send("#{column.name}")
+        if dragonfly && dragonfly.file?
+          if ActiveScaffold.js_framework == :jquery
+            js_remove_file_code = "$(this).prev().val('true'); $(this).parent().hide().next().show(); return false;";
+          else
+            js_remove_file_code = "$(this).previous().value='true'; $(this).up().hide().next().show(); return false;";
+          end
+          
+          content = active_scaffold_column_dragonfly(column, @record)
+          content_tag(:div,
+            content + " | " +
+              hidden_field(:record, "remove_#{column.name}", :value => "false") +
+              content_tag(:a, as_(:remove_file), {:href => '#', :onclick => js_remove_file_code}) 
+          ) + content_tag(:div, input, :style => "display: none")
+        else
+          input
+        end
+      end
+    end
+  end
+end

data/lib/active_scaffold/bridges/dragonfly/lib/list_ui.rb

@@ -0,0 +1,16 @@
+module ActiveScaffold
+  module Helpers
+    module ListColumnHelpers
+      def active_scaffold_column_dragonfly(column, record)
+        attachment = record.send("#{column.name}")
+        return nil unless attachment.present?
+        content = if attachment.image?
+          image_tag(attachment.thumb(column.options[:thumb] || ActiveScaffold::Bridges::Dragonfly::Lib::DragonflyBridgeHelpers.thumbnail_style).url, :border => 0)
+        else
+          attachment.name
+        end
+        link_to(content, attachment.remote_url, {'data-popup' => true, :target => '_blank'})
+      end
+    end
+  end
+end

data/lib/active_scaffold/bridges/dragonfly/lib/list_ui.rb~

@@ -0,0 +1,16 @@
+module ActiveScaffold
+  module Helpers
+    module ListColumnHelpers
+      def active_scaffold_column_dragonfly(column, record)
+        attachment = record.send("#{column.name}")
+        return nil unless attachment.present?
+        content = if attachment.image?
+          image_tag(attachment.thumb(ActiveScaffold::Bridges::Dragonfly::Lib::DragonflyBridgeHelpers.thumbnail_style).url, :border => 0)
+        else
+          attachment.name
+        end
+        link_to(content, attachment.remote_url, {'data-popup' => true, :target => '_blank'})
+      end
+    end
+  end
+end

data/lib/active_scaffold/bridges/paperclip/bridge.rb

@@ -9,4 +9,4 @@ ActiveScaffold::Bridges.bridge "Paperclip" do
     require File.join(File.dirname(__FILE__), "lib/paperclip_bridge")
     ActiveScaffold::Config::Core.send :include, ActiveScaffold::Bridges::Paperclip::Lib::PaperclipBridge
   end
-end
+end

data/lib/active_scaffold/bridges/record_select/bridge.rb

@@ -0,0 +1,5 @@
+ActiveScaffold::Bridges.bridge "RecordSelect" do
+  install do
+    require File.join(File.dirname(__FILE__), "lib/record_select_bridge.rb")
+  end
+end

data/lib/active_scaffold/bridges/record_select/lib/record_select_bridge.rb

@@ -0,0 +1,87 @@
+module ActiveScaffold
+  module RecordSelectBridge
+    def self.included(base)
+      base.class_eval do
+        include FormColumnHelpers
+        include SearchColumnHelpers
+        include ViewHelpers
+      end
+    end
+
+    module ViewHelpers
+      def self.included(base)
+        base.alias_method_chain :active_scaffold_includes, :record_select
+      end
+
+      def active_scaffold_includes_with_record_select(*args)
+        active_scaffold_includes_without_record_select(*args) + record_select_includes
+      end
+    end
+
+    module FormColumnHelpers
+      # requires RecordSelect plugin to be installed and configured.
+      def active_scaffold_input_record_select(column, options)
+        if column.singular_association?
+          multiple = false
+          multiple = column.options[:html_options][:multiple] if column.options[:html_options] &&  column.options[:html_options][:multiple]
+          active_scaffold_record_select(column, options, @record.send(column.name), multiple)
+        elsif column.plural_association?
+          active_scaffold_record_select(column, options, @record.send(column.name), true)
+        end
+      end
+
+      def active_scaffold_record_select(column, options, value, multiple)
+        unless column.association
+          raise ArgumentError, "record_select can only work against associations (and #{column.name} is not).  A common mistake is to specify the foreign key field (like :user_id), instead of the association (:user)."
+        end
+        remote_controller = active_scaffold_controller_for(column.association.klass).controller_path
+
+        # if the opposite association is a :belongs_to (in that case association in this class must be has_one or has_many)
+        # then only show records that have not been associated yet
+        if [:has_one, :has_many].include?(column.association.macro)
+          params.merge!({column.association.primary_key_name => ''})
+        end
+ 
+        record_select_options = {:controller => remote_controller, :id => options[:id]}
+        record_select_options.merge!(active_scaffold_input_text_options)
+        record_select_options.merge!(column.options)
+        if options['data-update_url']
+          record_select_options[:onchange] = %|function(id, label) {
+              ActiveScaffold.update_column($("##{options[:id]}"), "#{options['data-update_url']}", #{options['data-update_send_form'].to_json}, "#{options[:id]}", id);
+            }|
+        end
+ 
+        if multiple
+          record_multi_select_field(options[:name], value || [], record_select_options)
+        else
+          record_select_field(options[:name], value || column.association.klass.new, record_select_options)
+        end
+      end
+    end
+
+    module SearchColumnHelpers
+      def active_scaffold_search_record_select(column, options)
+        value = field_search_record_select_value(column)
+        active_scaffold_record_select(column, options, value, column.options[:multiple])
+      end
+      
+      def field_search_record_select_value(column)
+        begin
+          value = field_search_params[column.name]
+          unless value.blank?
+            if column.options[:multiple]
+              column.association.klass.find value.collect!(&:to_i)
+            else
+              column.association.klass.find(value.to_i)
+            end
+          end
+        rescue Exception => e
+          logger.error Time.now.to_s + "Sorry, we are not that smart yet. Attempted to restore search values to search fields but instead got -- #{e.inspect} -- on the ActiveScaffold column = :#{column.name} in #{@controller.class}"
+          raise e
+        end
+      end
+    end
+  end
+end
+
+ActionView::Base.class_eval { include ActiveScaffold::RecordSelectBridge }

data/lib/active_scaffold/bridges/record_select/lib/record_select_bridge.rb~

@@ -0,0 +1,84 @@
+module ActiveScaffold
+  module RecordSelectBridge
+    def self.included(base)
+      base.class_eval do
+        include FormColumnHelpers
+        include SearchColumnHelpers
+        include ViewHelpers
+      end
+    end
+
+    module ViewHelpers
+      def self.included(base)
+        base.alias_method_chain :active_scaffold_includes, :record_select
+      end
+
+      def active_scaffold_includes_with_record_select(*args)
+        active_scaffold_includes_without_record_select(*args) + record_select_includes
+      end
+    end
+
+    module FormColumnHelpers
+      # requires RecordSelect plugin to be installed and configured.
+      def active_scaffold_input_record_select(column, options)
+        if column.singular_association?
+          multiple = false
+          multiple = column.options[:html_options][:multiple] if column.options[:html_options] &&  column.options[:html_options][:multiple]
+          active_scaffold_record_select(column, options, @record.send(column.name), multiple)
+        elsif column.plural_association?
+          active_scaffold_record_select(column, options, @record.send(column.name), true)
+        end
+      end
+
+      def active_scaffold_record_select(column, options, value, multiple)
+        unless column.association
+          raise ArgumentError, "record_select can only work against associations (and #{column.name} is not).  A common mistake is to specify the foreign key field (like :user_id), instead of the association (:user)."
+        end
+        remote_controller = active_scaffold_controller_for(column.association.klass).controller_path
+
+        # if the opposite association is a :belongs_to (in that case association in this class must be has_one or has_many)
+        # then only show records that have not been associated yet
+        if [:has_one, :has_many].include?(column.association.macro)
+          params.merge!({column.association.primary_key_name => ''})
+        end
+ 
+        record_select_options = {:controller => remote_controller, :id => options[:id]}
+        record_select_options.merge!(active_scaffold_input_text_options)
+        record_select_options.merge!(column.options)
+ 
+        if multiple
+          record_multi_select_field(options[:name], value || [], record_select_options)
+        else
+          record_select_field(options[:name], value || column.association.klass.new, record_select_options)
+        end
+      end
+    end
+
+    module SearchColumnHelpers
+      def active_scaffold_search_record_select(column, options)
+        value = field_search_record_select_value(column)
+        active_scaffold_record_select(column, options, value, column.options[:multiple])
+      end
+      
+      def field_search_record_select_value(column)
+        begin
+          value = field_search_params[column.name]
+          value = unless value.blank?
+            if column.options[:multiple]
+              column.association.klass.find value.collect!(&:to_i)
+            else
+              column.association.klass.find(value.to_i)
+            end
+          end
+        rescue Exception => e
+          logger.error Time.now.to_s + "Sorry, we are not that smart yet. Attempted to restore search values to search fields but instead got -- #{e.inspect} -- on the ActiveScaffold column = :#{column.name} in #{@controller.class}"
+          raise e
+        end
+
+        active_scaffold_record_select(column, options, value, column.options[:multiple])
+      end
+    end
+  end
+end
+
+ActionView::Base.class_eval { include ActiveScaffold::RecordSelectBridge }

data/lib/active_scaffold/bridges/shared/date_bridge.rb

@@ -14,26 +14,26 @@ module ActiveScaffold
             tags << active_scaffold_search_date_bridge_range_tag(column, options, current_search)
             tags.join("&nbsp;").html_safe
           end
-
+          
           def active_scaffold_search_date_bridge_comparator_options(column)
             select_options = ActiveScaffold::Finder::DateComparators.collect {|comp| [as_(comp.downcase.to_sym), comp]}
             select_options + ActiveScaffold::Finder::NumericComparators.collect {|comp| [as_(comp.downcase.to_sym), comp]}
           end
-
+          
           def active_scaffold_search_date_bridge_comparator_tag(column, options, current_search)
             select_tag("#{options[:name]}[opt]", options_for_select(active_scaffold_search_date_bridge_comparator_options(column),current_search['opt']), :id => "#{options[:id]}_opt", :class => "as_search_range_option as_search_date_time_option")
           end
-
+          
           def active_scaffold_search_date_bridge_numeric_tag(column, options, current_search)
-            numeric_controls = "" <<
+            numeric_controls = "" << 
             active_scaffold_search_date_bridge_calendar_control(column, options, current_search, 'from') <<
             content_tag(:span, (" - " + active_scaffold_search_date_bridge_calendar_control(column, options, current_search, 'to')).html_safe,
-              :id => "#{options[:id]}_between", :class => "as_search_range_between", :style => "display:#{current_search['opt'] == 'BETWEEN' ? '' : 'none'}")
+              :id => "#{options[:id]}_between", :class => "as_search_range_between", :style => "display:#{current_search['opt'] == 'BETWEEN' ? '' : 'none'}")  
             content_tag("span", numeric_controls.html_safe, :id => "#{options[:id]}_numeric", :style => "display:#{ActiveScaffold::Finder::NumericComparators.include?(current_search['opt']) ? '' : 'none'}")
           end
-
+  
           def active_scaffold_search_date_bridge_trend_tag(column, options, current_search)
-            active_scaffold_date_bridge_trend_tag(column, options,
+            active_scaffold_date_bridge_trend_tag(column, options, 
                                                  {:name_prefix => 'search',
                                                   :number_value => current_search['number'],
                                                   :unit_value => current_search["unit"],
@@ -43,7 +43,7 @@ module ActiveScaffold
           def active_scaffold_date_bridge_trend_tag(column, options, trend_options)
             trend_controls = text_field_tag("#{trend_options[:name_prefix]}[#{column.name}][number]", trend_options[:number_value], :class => 'text-input', :size => 10, :autocomplete => 'off') << " " <<
             select_tag("#{trend_options[:name_prefix]}[#{column.name}][unit]",
-             options_for_select(active_scaffold_search_date_bridge_trend_units(column), trend_options[:name_prefix]),
+             options_for_select(active_scaffold_search_date_bridge_trend_units(column), trend_options[:unit_value]),
              :class => 'text-input')
             content_tag("span", trend_controls.html_safe, :id => "#{options[:id]}_trend", :style => "display:#{trend_options[:show] ? '' : 'none'}")
           end
@@ -53,14 +53,14 @@ module ActiveScaffold
              options = ActiveScaffold::Finder::TimeUnits.collect{|unit| [as_(unit.downcase.to_sym), unit]} + options if column_datetime?(column)
              options
           end
-
+          
           def active_scaffold_search_date_bridge_range_tag(column, options, current_search)
-            range_controls = select_tag("search[#{column.name}][range]",
-              options_for_select( ActiveScaffold::Finder::DateRanges.collect{|range| [as_(range.downcase.to_sym), range]}, current_search["range"]),
+            range_controls = select_tag("search[#{column.name}][range]", 
+              options_for_select( ActiveScaffold::Finder::DateRanges.collect{|range| [as_(range.downcase.to_sym), range]}, current_search["range"]), 
              :class => 'text-input')
             content_tag("span", range_controls.html_safe, :id => "#{options[:id]}_range", :style => "display:#{(current_search['opt'] == 'RANGE') ? '' : 'none'}")
           end
-
+          
           def column_datetime?(column)
             (!column.column.nil? && [:datetime, :time].include?(column.column.type))
           end
@@ -70,33 +70,55 @@ module ActiveScaffold
           def active_scaffold_human_condition_date_bridge(column, value)
             case value[:opt]
             when 'RANGE'
-              "#{column.active_record_class.human_attribute_name(column.name)} = #{as_(value[:range].downcase).downcase}"
+              range_type, range = value[:range].downcase.split('_')
+              format = active_scaffold_human_condition_date_bridge_range_format(range_type, range)
+              from, to = controller.class.date_bridge_from_to(column, value)
+              "#{column.active_record_class.human_attribute_name(column.name)} = #{as_(value[:range].downcase).downcase} (#{I18n.l(from, :format => format)})"
             when 'PAST', 'FUTURE'
-              "#{column.active_record_class.human_attribute_name(column.name)} #{as_(value[:opt].downcase).downcase} #{as_(value[:number])} #{as_(value[:unit].downcase)}"
+              from, to = controller.class.date_bridge_from_to(column, value)
+              "#{column.active_record_class.human_attribute_name(column.name)} #{as_('BETWEEN'.downcase).downcase} #{I18n.l(from)} - #{I18n.l(to)}"
             else
               from, to = controller.class.date_bridge_from_to(column, value)
               "#{column.active_record_class.human_attribute_name(column.name)} #{as_(value[:opt].downcase).downcase} #{I18n.l(from)} #{value[:opt] == 'BETWEEN' ? '- ' + I18n.l(to) : ''}"
             end
           end
-        end
 
+          def active_scaffold_human_condition_date_bridge_range_format(range_type, range)
+            case range
+            when 'week'
+              first_day_of_week = I18n.translate 'active_scaffold.date_picker_options.firstDay'
+              if first_day_of_week == 1
+                '%W %Y'
+              else
+                '%U %Y'
+              end
+            when 'month'
+              '%b %Y'
+            when 'year'
+              '%Y'
+            else
+              I18n.translate 'date.formats.default'
+            end
+          end
+        end
+        
         module Finder
           module ClassMethods
             def condition_for_date_bridge_type(column, value, like_pattern)
               operator = ActiveScaffold::Finder::NumericComparators.include?(value[:opt]) && value[:opt] != 'BETWEEN' ? value[:opt] : nil
               from_value, to_value = date_bridge_from_to(column, value)
-
+              
               if column.search_sql.is_a? Proc
                 column.search_sql.call(from_value, to_value, operator)
               else
                 unless operator.nil?
                   ["#{column.search_sql} #{value[:opt]} ?", from_value.to_s(:db)] unless from_value.nil?
                 else
-                  ["#{column.search_sql} BETWEEN ? AND ?", from_value.to_s(:db), to_value.to_s(:db)] unless from_value.nil? && to_value.nil?
+                  ["#{column.search_sql} BETWEEN ? AND ?", from_value.to_s(:db), to_value.to_s(:db)] unless from_value.nil? && to_value.nil?  
                 end
               end
             end
-
+            
             def date_bridge_from_to(column, value)
               conversion = column.column.type == :date ? :to_date : :to_time
               case value[:opt]
@@ -109,11 +131,15 @@ module ActiveScaffold
               end
             end
 
+            def date_bridge_now
+              Time.zone.now
+            end
+            
             def date_bridge_from_to_for_trend(column, value)
               case value['opt']
               when "PAST"
                 trend_number = [value['number'].to_i,  1].max
-                now = Time.zone.now
+                now = date_bridge_now
                 if date_bridge_column_date?(column)
                   from = now.beginning_of_day.ago((trend_number).send(value['unit'].downcase.singularize.to_sym))
                   to = now.end_of_day
@@ -124,7 +150,7 @@ module ActiveScaffold
                 return from, to
               when "FUTURE"
                 trend_number = [value['number'].to_i,  1].max
-                now = Time.zone.now
+                now = date_bridge_now
                 if date_bridge_column_date?(column)
                   from = now.beginning_of_day
                   to = now.end_of_day.in((trend_number).send(value['unit'].downcase.singularize.to_sym))
@@ -135,27 +161,27 @@ module ActiveScaffold
                 return from, to
               end
             end
-
+            
             def date_bridge_from_to_for_range(column, value)
               case value[:range]
               when 'TODAY'
-                return Time.zone.now.beginning_of_day, Time.zone.now.end_of_day
+                return date_bridge_now.beginning_of_day, date_bridge_now.end_of_day
               when 'YESTERDAY'
-                return Time.zone.now.ago(1.day).beginning_of_day, Time.zone.now.ago(1.day).end_of_day
-              when 'TOMMORROW'
-                return Time.zone.now.in(1.day).beginning_of_day, Time.zone.now.in(1.day).end_of_day
+                return date_bridge_now.ago(1.day).beginning_of_day, date_bridge_now.ago(1.day).end_of_day
+              when 'TOMORROW'
+                return date_bridge_now.in(1.day).beginning_of_day, date_bridge_now.in(1.day).end_of_day
               else
                 range_type, range = value[:range].downcase.split('_')
                 raise ArgumentError unless ['week', 'month', 'year'].include?(range)
                 case range_type
                 when 'this'
-                  return Time.zone.now.send("beginning_of_#{range}".to_sym), Time.zone.now.send("end_of_#{range}")
+                  return date_bridge_now.send("beginning_of_#{range}".to_sym), date_bridge_now.send("end_of_#{range}")
                 when 'prev'
-                  return Time.zone.now.ago(1.send(range.to_sym)).send("beginning_of_#{range}".to_sym), Time.zone.now.ago(1.send(range.to_sym)).send("end_of_#{range}".to_sym)
+                  return date_bridge_now.ago(1.send(range.to_sym)).send("beginning_of_#{range}".to_sym), date_bridge_now.ago(1.send(range.to_sym)).send("end_of_#{range}".to_sym)
                 when 'next'
-                  return Time.zone.now.in(1.send(range.to_sym)).send("beginning_of_#{range}".to_sym), Time.zone.now.in(1.send(range.to_sym)).send("end_of_#{range}".to_sym)
+                  return date_bridge_now.in(1.send(range.to_sym)).send("beginning_of_#{range}".to_sym), date_bridge_now.in(1.send(range.to_sym)).send("end_of_#{range}".to_sym)
                 else
-                  return nil, nil
+                  return nil, nil    
                 end
               end
             end
@@ -180,8 +206,4 @@ ActiveScaffold::Finder.const_set('TimeUnits', ["SECONDS", "MINUTES", "HOURS"])
 ActiveScaffold::Finder.const_set('DateRanges', ["TODAY", "YESTERDAY", "TOMORROW",
                                                 "THIS_WEEK", "PREV_WEEK", "NEXT_WEEK",
                                                 "THIS_MONTH", "PREV_MONTH", "NEXT_MONTH",
-                                                "THIS_YEAR", "PREV_YEAR", "NEXT_YEAR"])
-
-
-
-
+                                                "THIS_YEAR", "PREV_YEAR", "NEXT_YEAR"])