effective_datatables 2.0.6 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee352555dfda17eb3ac104a32f40da176aa25e92
-  data.tar.gz: 9d53b17a19f244c52cabcb9fef855a628094a2f9
+  metadata.gz: 0c2b41d68aae71ba0779f8dc2f8144dda6b5a892
+  data.tar.gz: 110fc6ea4011eca17caf7044ad0ef3801e5456f1
 SHA512:
-  metadata.gz: 6bd13ccd81794f45ccc7aded59f899192eebd3e134263495d19254d6598267fad646c6bfdfec327f144fe58f7d52ba3909e1730cdabeb882905c24a1616c6554
-  data.tar.gz: 8ad6860e06182a9c9078817e99a5683e11e5e98a7999406553c3a7cf5df97aef78a4f5aadade94a951a94ab21a8422ccbb5b08bac9ca4f31f1c4f426661bb2de
+  metadata.gz: 06e528fa15d587e5ee09d3a934a37add14cdc4e1b2fc26981a7cd7c1e5e3d3d7f15a4afdfb2c7458646804f74275f2f44b7d19d30aa267721d34b3cfdeea5e67
+  data.tar.gz: cbf3aad24a9878efa02c50f97f5c3e0dae9f43b532b74aec9f327466cad905f6f576f6b329a1fa657d8b38c579fcd4dfed866354dd0363a93425a867090de4f5

data/app/controllers/effective/datatables_controller.rb

@@ -7,7 +7,7 @@ module Effective
       @datatable = find_datatable(params[:id]).try(:new, params[:attributes])
       @datatable.view = view_context if !@datatable.nil?
 
-      EffectiveDatatables.authorized?(self, :index, @datatable.try(:collection_class) || Effective::Datatable)
+      EffectiveDatatables.authorized?(self, :index, @datatable.try(:collection_class) || @datatable.try(:class))
 
       respond_to do |format|
         format.html

data/app/models/effective/active_record_datatable_tool.rb

@@ -23,7 +23,7 @@ module Effective
       if [:string, :text].include?(order_column[:type]) && order_column[:sql_as_column] != true
         collection.order("COALESCE(#{order_column[:column]}, '') #{order_direction}")
       else
-        collection.order("#{order_column[:column]} #{order_direction} NULLS #{order_direction == 'ASC' ? 'LAST' : 'FIRST'}")
+        collection.order("#{order_column[:column]} #{order_direction} NULLS LAST")
       end
     end
 
@@ -98,13 +98,13 @@ module Effective
           collection
         end
       when :integer
-        collection.public_send(sql_op, "#{column} = :term", term: term.to_i)
+        collection.public_send(sql_op, "#{column} = :term", term: term.gsub(/\D/, '').to_i)
       when :year
         collection.public_send(sql_op, "EXTRACT(YEAR FROM #{column}) = :term", term: term.to_i)
       when :price
         price_in_cents = (term.gsub(/[^0-9|\.]/, '').to_f * 100.0).to_i
         collection.public_send(sql_op, "#{column} = :term", term: price_in_cents)
-      when :currency
+      when :currency, :decimal
         collection.public_send(sql_op, "#{column} = :term", term: term.gsub(/[^0-9|\.]/, '').to_f)
       else
         collection.public_send(sql_op, "#{column} = :term", term: term)

data/app/models/effective/datatable.rb

@@ -2,7 +2,7 @@ module Effective
   class Datatable
     attr_accessor :total_records, :display_records, :view, :attributes
 
-    delegate :render, :link_to, :mail_to, :number_to_currency, :to => :@view
+    delegate :render, :controller, :link_to, :mail_to, :number_to_currency, :to => :@view
 
     include Effective::EffectiveDatatable::Dsl
     extend Effective::EffectiveDatatable::Dsl::ClassMethods

data/app/models/effective/effective_datatable/dsl.rb

@@ -36,9 +36,9 @@ module Effective
       end
 
       def actions_column(options = {}, proc = nil, &block)
-        show = options.fetch(:show, false)
-        edit = options.fetch(:edit, true)
-        destroy = options.fetch(:destroy, true)
+        show = options.fetch(:show, (EffectiveDatatables.actions_column[:show] rescue false))
+        edit = options.fetch(:edit, (EffectiveDatatables.actions_column[:edit] rescue false))
+        destroy = options.fetch(:destroy, (EffectiveDatatables.actions_column[:destroy] rescue false))
         name = options.fetch(:name, 'actions')
 
         opts = {

data/app/models/effective/effective_datatable/options.rb

@@ -124,13 +124,25 @@ module Effective
         when :belongs_to
           {
             type: :select,
-            values: Proc.new { belongs_to[:klass].all.map { |obj| [obj.to_s, obj.id] }.sort { |x, y| x[0] <=> y[0] } }
+            values: (
+              if belongs_to[:klass].respond_to?(:datatables_filter)
+                Proc.new { belongs_to[:klass].datatables_filter }
+              else
+                Proc.new { belongs_to[:klass].all.map { |obj| [obj.to_s, obj.id] }.sort { |x, y| x[0] <=> y[0] } }
+              end
+            )
           }
         when :has_many
           {
             type: :select,
             multiple: true,
-            values: Proc.new { has_many[:klass].all.map { |obj| [obj.to_s, obj.id] }.sort { |x, y| x[0] <=> y[0] } }
+            values: (
+              if has_many[:klass].respond_to?(:datatables_filter)
+                Proc.new { has_many[:klass].datatables_filter }
+              else
+                Proc.new { has_many[:klass].all.map { |obj| [obj.to_s, obj.id] }.sort { |x, y| x[0] <=> y[0] } }
+              end
+            )
           }
         when :effective_roles
           {type: :select, values: EffectiveRoles.roles}

data/app/models/effective/effective_datatable/rendering.rb

@@ -71,6 +71,20 @@ module Effective
             }
             locals.merge!(opts[:partial_locals]) if opts[:partial_locals]
 
+            if active_record_collection?
+              if locals[:show_action] == :authorize
+                locals[:show_action] = (EffectiveDatatables.authorized?(controller, :show, collection_class) rescue false)
+              end
+
+              if locals[:edit_action] == :authorize
+                locals[:edit_action] = (EffectiveDatatables.authorized?(controller, :edit, collection_class) rescue false)
+              end
+
+              if locals[:destroy_action] == :authorize
+                locals[:destroy_action] = (EffectiveDatatables.authorized?(controller, :destroy, collection_class) rescue false)
+              end
+            end
+
             rendered[name] = (render(
               :partial => opts[:partial],
               :as => opts[:partial_local],
@@ -117,6 +131,14 @@ module Effective
                 number_to_currency(value / 100.0)
               when :currency
                 number_to_currency(value || 0)
+              when :integer
+                if EffectiveDatatables.integer_format.kind_of?(Symbol)
+                  view.instance_exec { public_send(EffectiveDatatables.integer_format, value) }
+                elsif EffectiveDatatables.integer_format.respond_to?(:call)
+                  view.instance_exec { EffectiveDatatables.integer_format.call(value) }
+                else
+                  value
+                end
               else
                 value
               end

data/app/views/effective/datatables/_actions_column.html.haml

@@ -1,14 +1,17 @@
 - if show_action
   - url = (polymorphic_path([*controller_namespace, resource]) rescue nil) || (polymorphic_path(resource) rescue nil)
-  %a{href: (url || '#'), title: 'Show'}
-    %span.glyphicon.glyphicon-eye-open
+  - if url.present?
+    %a{href: url, title: 'Show'}
+      %span.glyphicon.glyphicon-eye-open
 
 - if edit_action
   - url = (edit_polymorphic_path([*controller_namespace, resource]) rescue nil) || (edit_polymorphic_path(resource) rescue nil)
-  %a{href: (url || '#'), title: 'Edit'}
-    %span.glyphicon.glyphicon-edit
+  - if url.present?
+    %a{href: url, title: 'Edit'}
+      %span.glyphicon.glyphicon-edit
 
 - if destroy_action
   - url = (polymorphic_path([*controller_namespace, resource]) rescue nil) || (polymorphic_path(resource) rescue nil)
-  %a{href: (url || '#'), title: 'Delete', data: {method: :delete, confirm: 'Are you sure?'}}
-    %span.glyphicon.glyphicon-trash
+  - if url.present?
+    %a{href: url, title: 'Delete', data: {method: :delete, confirm: 'Are you sure?'}}
+      %span.glyphicon.glyphicon-trash

data/lib/effective_datatables.rb

@@ -7,7 +7,10 @@ module EffectiveDatatables
   mattr_accessor :authorization_method
   mattr_accessor :date_format
   mattr_accessor :datetime_format
+  mattr_accessor :integer_format
+
   mattr_accessor :default_entries
+  mattr_accessor :actions_column # A Hash
 
   def self.setup
     yield self

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '2.0.6'.freeze
+  VERSION = '2.1.0'.freeze
 end

data/lib/generators/templates/effective_datatables.rb

@@ -23,10 +23,32 @@ EffectiveDatatables.setup do |config|
 
   # Date & DateTime Format
   # By default, format Date and DateTime values with the following
-  config.date_format = "%Y-%m-%d"
-  config.datetime_format = "%Y-%m-%d %H:%M"
+  config.date_format = '%Y-%m-%d'
+  config.datetime_format = '%Y-%m-%d %H:%M'
+
+  # Format integer columns with the following proc or function
+  config.integer_format = :number_with_delimiter
 
   # Default number of entries shown per page
   # Valid options are: 10, 25, 50, 100, 250, 1000, :all
   config.default_entries = 25
+
+  # When using the actions_column DSL method, apply the following behavior
+  # Valid values for each action are:
+  # true (always include a link to this action)
+  # false (never include a link to this action)
+  # :authorize (include link only if authorized - only works with ActiveRecord collections)
+  #
+  # When :authorize, a single check will be made via the above authorization_method
+  # to see if the current_user has permission to :show/:edit/:destroy the collection class, i.e. Post
+  # EffectiveDatatables.authorized? (:show || :edit || :destroy), Post
+  #
+  # For performance reasons, we only check the class once, not every individual resource.
+  # You can override this default by calling `actions_column show: false, edit: true, destroy: :authorize`
+  config.actions_column = {
+    show: :authorize,
+    edit: :authorize,
+    destroy: :authorize
+  }
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.1.0
 platform: ruby
 authors:
 - Code and Effect