wice_grid 3.5.0 → 3.6.0.pre1

data/lib/wice/wice_grid_serialized_queries_controller.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Wice
   class <<self
     # Used in routes.rb to define routes to the query processing controller.
@@ -10,18 +11,16 @@ module Wice
       controller = controller.to_s
 
       map.post '/wice_grid_serialized_queries/:grid_name',
-        to: "#{controller}#create_saved_query",
-        as: 'create_serialized_query'
+               to: "#{controller}#create_saved_query",
+               as: 'create_serialized_query'
 
       map.post '/wice_grid_serialized_queries/:grid_name/:id',
-        to: "#{controller}#delete_saved_query",
-        as: 'delete_serialized_query'
-
+               to: "#{controller}#delete_saved_query",
+               as: 'delete_serialized_query'
     end
   end
 
   module SerializedQueriesControllerMixin   #:nodoc:
-
     def delete_saved_query  #:nodoc:
       init
       if sq = @query_store_model.find_by_id_and_grid_name(params[:id], @grid_name)
@@ -59,19 +58,19 @@ module Wice
         @grid_title_id = "#{@grid_name}_title"
         @notification_messages = NlMessage['query_saved_message']
       else
-        @error_messages = @saved_query.errors.map{ |_, msg| msg }.join(' ')
+        @error_messages = @saved_query.errors.map { |_, msg| msg }.join(' ')
       end
 
       render_asyns_result
     end
 
-    def extra
+    def extra #:nodoc:
       params[:extra]
     end
 
     protected
 
-    def render_asyns_result
+    def render_asyns_result #:nodoc:
       render json: {
         'error_messages'        => @error_messages,
         'notification_messages' => @notification_messages,
@@ -80,9 +79,9 @@ module Wice
     end
 
     def init  #:nodoc:
-      @query_store_model = ::Wice::get_query_store_model
+      @query_store_model = ::Wice.get_query_store_model
       @confirm = params[:confirm] == '1' || params[:confirm] == 'true'
       @grid_name = params[:grid_name]
     end
   end
-end
+end

data/lib/wice/wice_grid_serialized_query.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class WiceGridSerializedQuery < ActiveRecord::Base  #:nodoc:
   serialize :query
 
@@ -5,9 +6,9 @@ class WiceGridSerializedQuery < ActiveRecord::Base  #:nodoc:
 
   validates_presence_of :name, message: 'Please submit the name of the custom query'
 
-  def self.list(name, controller)
-    conditions = {grid_name: name}
+  # returns a list of all serialized queries
+  def self.list(name, _controller)
+    conditions = { grid_name: name }
     self.where(conditions).to_a
   end
-
 end

data/lib/wice/wice_grid_spreadsheet.rb

@@ -1,18 +1,19 @@
-require 'csv'
-
-module Wice
-  class Spreadsheet  #:nodoc:
-
-    attr_reader :tempfile
-
-    def initialize(name, field_separator)  #:nodoc:
-      @tempfile = Tempfile.new(name)
-      @csv = CSV.new(@tempfile, col_sep: field_separator)
-    end
-
-    def << (row)  #:nodoc:
-      @csv << row
-    end
-
-  end
-end
+# encoding: utf-8
+require 'csv'
+
+module Wice
+  class Spreadsheet  #:nodoc:
+
+    #:nodoc:
+    attr_reader :tempfile
+
+    def initialize(name, field_separator)  #:nodoc:
+      @tempfile = Tempfile.new(name)
+      @csv = CSV.new(@tempfile, col_sep: field_separator)
+    end
+
+    def << (row)  #:nodoc:
+      @csv << row
+    end
+  end
+end

data/lib/wice_grid.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'wice/wice_grid_misc.rb'
 require 'wice/wice_grid_core_ext.rb'
 require 'wice/grid_renderer.rb'
@@ -15,50 +16,56 @@ require 'wice/wice_grid_spreadsheet.rb'
 require 'wice/wice_grid_serialized_queries_controller.rb'
 require 'wice/columns/column_processor_index.rb'
 require 'wice/columns.rb'
+require 'wice/columns/common_date_datetime_mixin.rb'
+require 'wice/columns/common_standard_helper_date_datetime_mixin.rb'
+require 'wice/columns/common_js_date_datetime_mixin.rb'
+require 'wice/columns/common_js_date_datetime_conditions_generator_mixin.rb'
+require 'wice/columns/common_rails_date_datetime_conditions_generator_mixin.rb'
 require 'kaminari.rb'
 
-
 ActionController::Base.send(:helper_method, :wice_grid_custom_filter_params)
 
 module Wice
 
-  class WiceGridEngine < ::Rails::Engine #:nodoc:
+  def self.on_action_view_load #:nodoc:
+    ::ActionView::Base.class_eval { include Wice::GridViewHelper }
+    [ActionView::Helpers::AssetTagHelper,
+     ActionView::Helpers::TagHelper,
+     ActionView::Helpers::JavaScriptHelper,
+     ActionView::Helpers::FormTagHelper].each do |m|
+      JsCalendarHelpers.send(:include, m)
+    end
 
-    initializer "wice_grid_railtie.configure_rails_initialization" do |app|
+    Columns.load_column_processors
+    require 'wice/wice_grid_serialized_query.rb'
 
+    # It is here only because of this: https://github.com/amatsuda/kaminari/pull/267
+    require 'wice/kaminari_monkey_patching.rb'
+  end
+
+  class WiceGridEngine < ::Rails::Engine #:nodoc:
+    initializer 'wice_grid_railtie.configure_rails_initialization' do |_app|
       ActiveSupport.on_load :action_controller do
         ActionController::Base.send(:include, Wice::Controller)
       end
 
       ActiveSupport.on_load :active_record do
         ActiveRecord::ConnectionAdapters::Column.send(:include, ::Wice::WiceGridExtentionToActiveRecordColumn)
-        ActiveRecord::Base.send(:include, ::Wice::MergeConditions)
       end
 
       ActiveSupport.on_load :action_view do
-        ::ActionView::Base.class_eval { include Wice::GridViewHelper }
-        [ActionView::Helpers::AssetTagHelper,
-         ActionView::Helpers::TagHelper,
-         ActionView::Helpers::JavaScriptHelper,
-         ActionView::Helpers::FormTagHelper].each do |m|
-          JsCalendarHelpers.send(:include, m)
-        end
-
-        Columns.load_column_processors
-        require 'wice/wice_grid_serialized_query.rb'
-
-        # It is here only until this pull request is pulled: https://github.com/amatsuda/kaminari/pull/267
-        require 'wice/kaminari_monkey_patching.rb'
+        ::Wice.on_action_view_load
       end
     end
 
-    initializer "wice_grid_railtie.configure_rails_assets_precompilation" do |app|
+    initializer 'wice_grid_railtie.configure_rails_assets_precompilation' do |app|
       app.config.assets.precompile << 'icons/grid/*'
     end
   end
 
-  class WiceGrid
 
+  # Main class responsible for keeping the state of the grid, building an ActiveRelation, and running queries
+  class WiceGrid
     attr_reader :klass, :name, :resultset, :custom_order, :query_store_model #:nodoc:
     attr_reader :ar_options, :status, :export_to_csv_enabled, :csv_file_name, :csv_field_separator, :saved_query #:nodoc:
     attr_writer :renderer #:nodoc:
@@ -70,29 +77,29 @@ module Wice
       @controller = controller
 
       @relation = klass_or_relation
-      @klass = @relation.kind_of?(Class) && @relation.ancestors.index(ActiveRecord::Base) ?
-        klass_or_relation :
+      @klass = if @relation.is_a?(Class) && @relation.ancestors.index(ActiveRecord::Base)
+        klass_or_relation
+      else
         klass_or_relation.klass
+      end
 
-      unless @klass.kind_of?(Class) && @klass.ancestors.index(ActiveRecord::Base)
-        raise WiceGridArgumentError.new("ActiveRecord model class (second argument) must be a Class derived from ActiveRecord::Base")
+      unless @klass.is_a?(Class) && @klass.ancestors.index(ActiveRecord::Base)
+        fail WiceGridArgumentError.new('ActiveRecord model class (second argument) must be a Class derived from ActiveRecord::Base')
       end
 
       # validate :with_resultset & :with_paginated_resultset
       [:with_resultset, :with_paginated_resultset].each do |callback_symbol|
         unless [NilClass, Symbol, Proc].index(opts[callback_symbol].class)
-          raise WiceGridArgumentError.new(":#{callback_symbol} must be either a Proc or Symbol object")
+          fail WiceGridArgumentError.new(":#{callback_symbol} must be either a Proc or Symbol object")
         end
       end
 
-      opts[:order_direction].downcase! if opts[:order_direction].kind_of?(String)
+      opts[:order_direction].downcase! if opts[:order_direction].is_a?(String)
 
       # validate :order_direction
-      if opts[:order_direction] && ! (opts[:order_direction] == 'asc'  ||
-                                      opts[:order_direction] == :asc   ||
-                                      opts[:order_direction] == 'desc' ||
+      if opts[:order_direction] && ! (opts[:order_direction] == 'asc' || opts[:order_direction] == :asc || opts[:order_direction] == 'desc' ||
                                       opts[:order_direction] == :desc)
-        raise WiceGridArgumentError.new(":order_direction must be either 'asc' or 'desc'.")
+        fail WiceGridArgumentError.new(":order_direction must be either 'asc' or 'desc'.")
       end
 
       begin
@@ -100,26 +107,27 @@ module Wice
         @options = {
           conditions:                 nil,
           csv_file_name:              nil,
-          csv_field_separator:        Defaults::CSV_FIELD_SEPARATOR,
+          csv_field_separator:        ConfigurationProvider.value_for(:CSV_FIELD_SEPARATOR),
           custom_order:               {},
-          enable_export_to_csv:       Defaults::ENABLE_EXPORT_TO_CSV,
+          enable_export_to_csv:       ConfigurationProvider.value_for(:ENABLE_EXPORT_TO_CSV),
           group:                      nil,
           include:                    nil,
           joins:                      nil,
-          name:                       Defaults::GRID_NAME,
+          name:                       ConfigurationProvider.value_for(:GRID_NAME),
           order:                      nil,
-          order_direction:            Defaults::ORDER_DIRECTION,
+          order_direction:            ConfigurationProvider.value_for(:ORDER_DIRECTION),
           page:                       1,
-          page_method_name:           Defaults::PAGE_METHOD_NAME,
-          per_page:                   Defaults::PER_PAGE,
+          page_method_name:           ConfigurationProvider.value_for(:PAGE_METHOD_NAME),
+          per_page:                   ConfigurationProvider.value_for(:PER_PAGE),
           saved_query:                nil,
           total_entries:              nil,
           with_paginated_resultset:   nil,
-          with_resultset:             nil
+          with_resultset:             nil,
+          use_default_scope:          ConfigurationProvider.value_for(:USE_DEFAULT_SCOPE)
         }
       rescue NameError
-        raise NameError.new('A constant is missing in wice_grid_config.rb: ' + $!.message +
-          '. This can happen when you upgrade the WiceGrid to a newer version with a new configuration constant. ' +
+        raise NameError.new('A constant is missing in wice_grid_config.rb: ' + $ERROR_INFO.message +
+          '. This can happen when you upgrade the WiceGrid to a newer version with a new configuration constant. ' \
           'Add the constant manually or re-run `bundle exec rails g wice_grid:install`.')
       end
       # validate parameters
@@ -135,9 +143,9 @@ module Wice
       when Symbol
         @name = @name.to_s
       else
-        raise WiceGridArgumentError.new("name of the grid should be a string or a symbol")
+        fail WiceGridArgumentError.new('name of the grid should be a string or a symbol')
       end
-      raise WiceGridArgumentError.new("name of the grid can only contain alphanumeruc characters") unless @name =~ /^[a-zA-Z\d_]*$/
+      fail WiceGridArgumentError.new('name of the grid can only contain alphanumeruc characters') unless @name =~ /^[a-zA-Z\d_]*$/
 
       @table_column_matrix = TableColumnMatrix.new
       @table_column_matrix.default_model_class = @klass
@@ -162,7 +170,6 @@ module Wice
       process_params
 
       @ar_options_formed = false
-
     end
 
     # A block executed from within the plugin to process records of the current page.
@@ -212,18 +219,29 @@ module Wice
       end
     end
 
-    def declare_column(column_name, model, custom_filter_active, table_alias, filter_type)  #:nodoc:
+    # declare_column(String, ActiveRecord, CustomFilterSpec, nil | string, nil | Boolean)
+    def declare_column(
+                 column_name: nil,
+                       model: nil,
+        custom_filter_active: nil,
+                 table_alias: nil,
+                 filter_type: nil,
+                      assocs: [])  #:nodoc:
+
+
+      @options[:include] = Wice.build_includes(@options[:include], assocs)
+
       if model # this is an included table
         column = @table_column_matrix.get_column_by_model_class_and_column_name(model, column_name)
-        raise WiceGridArgumentError.new("Column '#{column_name}' is not found in table '#{model.table_name}'!") if column.nil?
+        fail WiceGridArgumentError.new("Column '#{column_name}' is not found in table '#{model.table_name}'!") if column.nil?
         main_table = false
         table_name = model.table_name
       else
         column = @table_column_matrix.get_column_in_default_model_class_by_column_name(column_name)
         if column.nil?
-          raise WiceGridArgumentError.new("Column '#{column_name}' is not found in table '#{@klass.table_name}'! " +
-            "If '#{column_name}' belongs to another table you should declare it in :include or :join when initialising " +
-            "the grid, and specify :model in column declaration.")
+          fail WiceGridArgumentError.new("Column '#{column_name}' is not found in table '#{@klass.table_name}'! " \
+            "If '#{column_name}' belongs to another table you should declare it in :include or :join when initialising " \
+            'the grid, and specify :model in column declaration.')
         end
         main_table = true
         table_name = @table_column_matrix.default_model_class.table_name
@@ -238,14 +256,13 @@ module Wice
         end
 
         @table_column_matrix.add_condition(column, conditions)
-        [column, table_name , main_table]
-      else
-        nil
+
+        # [ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter::Column, String, Boolean]
+        [column, table_name, main_table]
       end
     end
 
     def form_ar_options(opts = {})  #:nodoc:
-
       return if @ar_options_formed
       @ar_options_formed = true unless opts[:forget_generated_options]
 
@@ -266,11 +283,17 @@ module Wice
       #   @status.delete(:f)
       # end
 
-      @ar_options[:conditions] = klass.send(:merge_conditions, @status[:conditions], * @table_column_matrix.conditions )
+      initial_conditions_active_relation = @klass.where(@status[:conditions])
+
+      @ar_options[:conditions] =
+        @table_column_matrix.conditions.reduce(initial_conditions_active_relation) do |active_relation_accu, cond|
+          conditions_active_relation = @klass.where(cond)
+          active_relation_accu.merge(conditions_active_relation)
+        end
 
       # conditions processed
 
-      if (! opts[:skip_ordering]) && ! @status[:order].blank?
+      if (!opts[:skip_ordering]) && ! @status[:order].blank?
         @ar_options[:order] = add_custom_order_sql(complete_column_name(@status[:order]))
 
         @ar_options[:order] += ' ' + @status[:order_direction]
@@ -287,19 +310,15 @@ module Wice
         if (show_all_limit = Wice::ConfigurationProvider.value_for(:SHOW_ALL_ALLOWED_UP_TO, strict: false)) && all_record_mode?
           if do_count > show_all_limit # force-reset SHOW-ALL to pagination
             @status[:pp] = nil
-          else
-            # no resetting
           end
         end
 
       end
-
     end
 
-
-    def add_references relation
+    def add_references(relation) #:nodoc:
       if @ar_options[:include] && relation.respond_to?(:references)
-        refs = [@ar_options[:include]] unless @ar_options[:include].is_a?(Array)
+        # refs = [@ar_options[:include]] unless @ar_options[:include].is_a?(Array)
         relation =  relation.references(* @ar_options[:include])
       end
       relation
@@ -308,27 +327,27 @@ module Wice
     # TO DO: what to do with other @ar_options values?
     def read  #:nodoc:
       form_ar_options
-      @klass.unscoped do
+      use_default_or_unscoped do
         @resultset = if self.output_csv? || all_record_mode?
-          relation = @relation.
-            includes(@ar_options[:include]).
-            joins(   @ar_options[:joins]).
-            order(   @ar_options[:order]).
-            group(   @ar_options[:group]).
-            where(   @ar_options[:conditions])
+          relation = @relation
+                     .includes(@ar_options[:include])
+                     .joins(@ar_options[:joins])
+                     .order(@ar_options[:order])
+                     .group(@ar_options[:group])
+                     .merge(@ar_options[:conditions])
           relation = add_references relation
 
           relation
         else
           # p @ar_options
-          relation = @relation.
-            send(    @options[:page_method_name], @ar_options[:page]).
-            per(     @ar_options[:per_page]).
-            includes(@ar_options[:include]).
-            joins(   @ar_options[:joins]).
-            order(   @ar_options[:order]).
-            group(   @ar_options[:group]).
-            where(   @ar_options[:conditions])
+          relation = @relation
+                     .send(@options[:page_method_name], @ar_options[:page])
+                     .per(@ar_options[:per_page])
+                     .includes(@ar_options[:include])
+                     .joins(@ar_options[:joins])
+                     .order(@ar_options[:order])
+                     .group(@ar_options[:group])
+                     .merge(@ar_options[:conditions])
 
           relation = add_references relation
 
@@ -338,7 +357,6 @@ module Wice
       invoke_resultset_callbacks
     end
 
-
     # core workflow methods END
 
     # Getters
@@ -366,7 +384,7 @@ module Wice
 
     def ordered_by?(column)  #:nodoc:
       return nil if @status[:order].blank?
-      if column.main_table && ! offs = @status[:order].index('.')
+      if column.main_table && ! @status[:order].index('.')
         @status[:order] == column.attribute
       else
         @status[:order] == column.table_alias_or_table_name + '.' + column.attribute
@@ -377,13 +395,12 @@ module Wice
       @status[:order]
     end
 
-
     def order_direction  #:nodoc:
       @status[:order_direction]
     end
 
     def filtering_on?  #:nodoc:
-      not @status[:f].blank?
+      !@status[:f].blank?
     end
 
     def filtered_by  #:nodoc:
@@ -391,7 +408,7 @@ module Wice
     end
 
     def filtered_by?(view_column)  #:nodoc:
-      @status[:f].nil? ? false : @status[:f].has_key?(view_column.attribute_name_fully_qualified_for_all_but_main_table_columns)
+      @status[:f].nil? ? false : @status[:f].key?(view_column.attribute_name_fully_qualified_for_all_but_main_table_columns)
     end
 
     def get_state_as_parameter_value_pairs(including_saved_query_request = false) #:nodoc:
@@ -410,13 +427,13 @@ module Wice
       end
 
       if including_saved_query_request && @saved_query
-        res << ["#{name}[q]", @saved_query.id ]
+        res << ["#{name}[q]", @saved_query.id]
       end
 
-      [:order, :order_direction].select{|parameter|
+      [:order, :order_direction].select do|parameter|
         status[parameter]
-      }.collect do |parameter|
-        res << ["#{name}[#{parameter}]", status[parameter] ]
+      end.collect do |parameter|
+        res << ["#{name}[#{parameter}]", status[parameter]]
       end
 
       res
@@ -427,13 +444,14 @@ module Wice
       do_count
     end
 
-    def do_count
-      @relation.count(
-        conditions: @ar_options[:conditions],
-        joins:      @ar_options[:joins],
-        include:    @ar_options[:include],
-        group:      @ar_options[:group]
-      )
+    def do_count #:nodoc:
+      @relation
+        .all
+        .merge(@ar_options[:conditions]).count(
+          joins:      @ar_options[:joins],
+          include:    @ar_options[:include],
+          group:      @ar_options[:group]
+        )
     end
 
     alias_method :size, :count
@@ -444,12 +462,11 @@ module Wice
 
     # with this variant we get even those values which do not appear in the resultset
     def distinct_values_for_column(column)  #:nodoc:
-      res = column.model.select("distinct #{column.name}").order("#{column.name} asc").collect{|ar|
+      column.model.select("distinct #{column.name}").order("#{column.name} asc").collect do|ar|
         ar[column.name]
-      }.reject{|e| e.blank?}.map{|i|[i,i]}
+      end.reject(&:blank?).map { |i| [i, i] }
     end
 
-
     def distinct_values_for_column_in_resultset(messages)  #:nodoc:
       uniq_vals = Set.new
 
@@ -457,15 +474,15 @@ module Wice
         v = ar.deep_send(*messages)
         uniq_vals << v unless v.nil?
       end
-      return uniq_vals.to_a.map{|i|
+      uniq_vals.to_a.map do|i|
         if i.is_a?(Array) && i.size == 2
           i
         elsif i.is_a?(Hash) && i.size == 1
           i.to_a.flatten
         else
-          [i,i]
+          [i, i]
         end
-      }.sort{|a,b| a[0]<=>b[0]}
+      end.sort { |a, b| a[0] <=> b[0] }
     end
 
     def output_csv? #:nodoc:
@@ -481,27 +498,23 @@ module Wice
     end
 
     def dump_status #:nodoc:
-      "   params: #{params[name].inspect}\n"  +
-      "   status: #{@status.inspect}\n" +
-      "   ar_options #{@ar_options.inspect}\n"
+      "   params: #{params[name].inspect}\n" + "   status: #{@status.inspect}\n" \
+        "   ar_options #{@ar_options.inspect}\n"
     end
 
-
     # Returns the list of objects browsable through all pages with the current filters.
     # Should only be called after the +grid+ helper.
     def all_pages_records
-      raise WiceGridException.new("all_pages_records can only be called only after the grid view helper") unless self.view_helper_finished
+      fail WiceGridException.new('all_pages_records can only be called only after the grid view helper') unless self.view_helper_finished
       resultset_without_paging_with_user_filters
     end
 
     # Returns the list of objects displayed on current page. Should only be called after the +grid+ helper.
     def current_page_records
-      raise WiceGridException.new("current_page_records can only be called only after the grid view helper") unless self.view_helper_finished
+      fail WiceGridException.new('current_page_records can only be called only after the grid view helper') unless self.view_helper_finished
       @resultset
     end
 
-
-
     protected
 
     def invoke_resultset_callback(callback, argument) #:nodoc:
@@ -518,22 +531,18 @@ module Wice
       invoke_resultset_callback(@options[:with_resultset], self.active_relation_for_resultset_without_paging_with_user_filters)
     end
 
-
-
     def add_custom_order_sql(fully_qualified_column_name) #:nodoc:
-      custom_order = if @options[:custom_order].has_key?(fully_qualified_column_name)
+      custom_order = if @options[:custom_order].key?(fully_qualified_column_name)
         @options[:custom_order][fully_qualified_column_name]
       else
         if view_column = @renderer[fully_qualified_column_name]
           view_column.custom_order
-        else
-          nil
         end
       end
 
       if custom_order.blank?
         if ActiveRecord::ConnectionAdapters.const_defined?(:SQLite3Adapter) && ActiveRecord::Base.connection.is_a?(ActiveRecord::ConnectionAdapters::SQLite3Adapter)
-          fully_qualified_column_name.strip.split('.').map{|chunk| ActiveRecord::Base.connection.quote_table_name(chunk)}.join('.')
+          fully_qualified_column_name.strip.split('.').map { |chunk| ActiveRecord::Base.connection.quote_table_name(chunk) }.join('.')
         else
           ActiveRecord::Base.connection.quote_table_name(fully_qualified_column_name.strip)
         end
@@ -543,7 +552,7 @@ module Wice
         elsif custom_order.is_a? Proc
           custom_order.call(fully_qualified_column_name)
         else
-          raise WiceGridArgumentError.new("invalid custom order #{custom_order.inspect}")
+          fail WiceGridArgumentError.new("invalid custom order #{custom_order.inspect}")
         end
       end
     end
@@ -564,14 +573,14 @@ module Wice
       params[name]
     end
 
-
     def resultset_without_paging_without_user_filters  #:nodoc:
       form_ar_options
-      @klass.unscoped do
-        relation = @relation.joins(@ar_options[:joins]).
-          includes(@ar_options[:include]).
-          group(@ar_options[:group]).
-          where(@options[:conditions])
+
+      use_default_or_unscoped do
+        relation = @relation.joins(@ar_options[:joins])
+                   .includes(@ar_options[:include])
+                   .group(@ar_options[:group])
+                   .where(@options[:conditions])
 
         relation = add_references relation
 
@@ -593,35 +602,39 @@ module Wice
     # end
 
     def resultset_without_paging_with_user_filters  #:nodoc:
-      @klass.unscoped do
-        active_relation_for_resultset_without_paging_with_user_filters.to_a
-      end
+      active_relation_for_resultset_without_paging_with_user_filters.to_a
     end
 
     def active_relation_for_resultset_without_paging_with_user_filters  #:nodoc:
       form_ar_options
       relation = nil
-      @klass.unscoped do
-        relation = @relation.
-          where(@ar_options[:conditions]).
-          joins(@ar_options[:joins]).
-          includes(@ar_options[:include]).
-          order(@ar_options[:order])
+
+      use_default_or_unscoped do
+        relation = @relation
+                   .joins(@ar_options[:joins])
+                   .includes(@ar_options[:include])
+                   .order(@ar_options[:order])
+                   .merge(@ar_options[:conditions])
 
         relation = add_references relation
       end
       relation
     end
 
-
-
     def load_query(query_id) #:nodoc:
-      @query_store_model ||= Wice::get_query_store_model
+      @query_store_model ||= Wice.get_query_store_model
       query = @query_store_model.find_by_id_and_grid_name(query_id, self.name)
-      Wice::log("Query with id #{query_id} for grid '#{self.name}' not found!!!") if query.nil?
+      Wice.log("Query with id #{query_id} for grid '#{self.name}' not found!!!") if query.nil?
       query
     end
 
+    def use_default_or_unscoped #:nodoc:
+      if @options[:use_default_scope]
+        yield
+      else
+        @klass.unscoped { yield }
+      end
+    end
 
   end
 
@@ -635,7 +648,7 @@ module Wice
       # create a Time instance out of parameters
       def params_2_datetime(par)   #:nodoc:
         return nil if par.blank?
-        params =  [par[:year], par[:month], par[:day], par[:hour], par[:minute]].collect{|v| v.blank? ? nil : v.to_i}
+        params =  [par[:year], par[:month], par[:day], par[:hour], par[:minute]].collect { |v| v.blank? ? nil : v.to_i }
         begin
           Time.local(*params)
         rescue ArgumentError, TypeError
@@ -646,17 +659,13 @@ module Wice
       # create a Date instance out of parameters
       def params_2_date(par)   #:nodoc:
         return nil if par.blank?
-        params =  [par[:year], par[:month], par[:day]].collect{|v| v.blank? ? nil : v.to_i}
+        params =  [par[:year], par[:month], par[:day]].collect { |v| v.blank? ? nil : v.to_i }
         begin
           Date.civil(*params)
         rescue ArgumentError, TypeError
           nil
         end
       end
-
     end
   end
-
-
-
 end