effective_datatables 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97ad579e4f968c5ee88cb8ad0605da46407b1723
-  data.tar.gz: f9213e7655967748c32d8a943d24f42e439a7c5d
+  metadata.gz: a7737d3c09cfab493da58775899fcfcec9cebf6e
+  data.tar.gz: 07baaea95de4d129716ec3b0c949c3adf427c93e
 SHA512:
-  metadata.gz: 78940c0eab2515f28183f6dbcda1305bc3788a09140f763db6477cb9fc4d2105739effd501a19551615cb0c130a3a8654db12ba4fbf2b82fca72d904ca8f2a6a
-  data.tar.gz: da86c0c0e2beb673cc80c52f481181ea54d77ee1a798f4adce58957ced1103347f22f104c35bd275721b720ede63e21dbf4f3e2fcffd313b3c7e4ddb50df0eeb
+  metadata.gz: a298d125254e19d5450ecdf719b0a96246be4b2ced78f2806ba5066996c0bfab1957555b268c2a28069ebd769d7754df962d5b35a6eb09992330504d43190722
+  data.tar.gz: 9d4f06230ed4ecbf2e461afe72fcc5ed1f32eba2599ef99928b0293b335a0cdcd689d0ed39b3766c7069a0e2ac949d975c5df659d8085d9233dbede56370ff82

data/app/assets/javascripts/effective_datatables/initialize.js.coffee.erb

@@ -23,7 +23,7 @@ initializeDataTables = ->
         serverParams: (params) ->
           table = this.DataTable()
           table.columns().flatten().each (index) =>  # Pass which columns are visible back to server
-            params['columns'][index]['visible'] =  table.column(index).visible()
+            params['columns'][index]['visible'] = table.column(index).visible()
         colVis:
           showAll: 'Show all'
           restore: 'Show default'

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

@@ -39,13 +39,14 @@ module Effective
         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))
+        unarchive = options.fetch(:unarchive, (EffectiveDatatables.actions_column[:unarchive] rescue false))
         name = options.fetch(:name, 'actions')
 
         opts = {
           sortable: false,
           filter: false,
           partial_local: :resource,
-          partial_locals: { show_action: show, edit_action: edit, destroy_action: destroy }
+          partial_locals: { show_action: show, edit_action: edit, destroy_action: destroy, unarchive_action: unarchive }
         }.merge(options)
 
         opts[:partial] ||= '/effective/datatables/actions_column' unless (block_given? || proc.present?)

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

@@ -149,7 +149,11 @@ module Effective
         when :integer
           {type: :number}
         when :boolean
-          {type: :boolean, values: [true, false]}
+          if EffectiveDatatables.boolean_format == :yes_no
+            {type: :boolean, values: [['Yes', true], ['No', false]] }
+          else
+            {type: :boolean, values: [['true', true], ['false', false]] }
+          end
         when :datetime
           {type: :datetime}
         when :date

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

@@ -67,7 +67,8 @@ module Effective
               controller_namespace: view.controller_path.split('/')[0...-1].map { |path| path.downcase.to_sym if path.present? }.compact,
               show_action: (opts[:partial_locals] || {})[:show_action],
               edit_action: (opts[:partial_locals] || {})[:edit_action],
-              destroy_action: (opts[:partial_locals] || {})[:destroy_action]
+              destroy_action: (opts[:partial_locals] || {})[:destroy_action],
+              unarchive_action: (opts[:partial_locals] || {})[:unarchive_action]
             }
             locals.merge!(opts[:partial_locals]) if opts[:partial_locals]
 
@@ -83,6 +84,10 @@ module Effective
               if locals[:destroy_action] == :authorize
                 locals[:destroy_action] = (EffectiveDatatables.authorized?(controller, :destroy, collection_class) rescue false)
               end
+
+              if locals[:unarchive_action] == :authorize
+                locals[:unarchive_action] = (EffectiveDatatables.authorized?(controller, :unarchive, collection_class) rescue false)
+              end
             end
 
             rendered[name] = (render(
@@ -139,6 +144,14 @@ module Effective
                 else
                   value
                 end
+              when :boolean
+                if EffectiveDatatables.boolean_format == :yes_no && value == true
+                  'Yes'
+                elsif EffectiveDatatables.boolean_format == :yes_no && value == false
+                  'No'
+                else
+                  value
+                end
               else
                 value
               end

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

@@ -13,5 +13,15 @@
 - if destroy_action
   - url = (polymorphic_path([*controller_namespace, resource]) rescue nil) || (polymorphic_path(resource) rescue nil)
   - if url.present?
-    %a{href: url, title: 'Delete', data: {method: :delete, confirm: 'Are you sure?'}}
-      %span.glyphicon.glyphicon-trash
+    - if resource.respond_to?(:archived?) && !resource.archived?
+      %a{href: url, title: 'Archive', data: {method: :delete, confirm: "Are you sure you want to archive this item?"}}
+        %span.glyphicon.glyphicon-trash
+    - elsif resource.respond_to?(:archived?) == false
+      %a{href: url, title: 'Delete', data: {method: :delete, confirm: "Are you sure you want to delete this item?"}}
+        %span.glyphicon.glyphicon-trash
+
+- if unarchive_action && resource.respond_to?(:archived?) && resource.archived?
+  - url = (polymorphic_path([*controller_namespace, resource], action: :unarchive) rescue nil) || (polymorphic_path(resource, action: :unarchive) rescue nil)
+  - if url.present?
+    %a{href: url, title: 'Unarchive', data: {confirm: 'Are you sure you want to unarchive this item?'}}
+      %span.glyphicon.glyphicon-retweet

data/lib/effective_datatables.rb

@@ -8,6 +8,7 @@ module EffectiveDatatables
   mattr_accessor :date_format
   mattr_accessor :datetime_format
   mattr_accessor :integer_format
+  mattr_accessor :boolean_format
 
   mattr_accessor :default_entries
   mattr_accessor :actions_column # A Hash

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '2.1.1'.freeze
+  VERSION = '2.1.2'.freeze
 end

data/lib/generators/templates/effective_datatables.rb

@@ -26,6 +26,10 @@ EffectiveDatatables.setup do |config|
   config.date_format = '%Y-%m-%d'
   config.datetime_format = '%Y-%m-%d %H:%M'
 
+  # Boolean format
+  # If :yes_no, display as yes_no instead of true/false
+  config.boolean_format = :yes_no
+
   # Format integer columns with the following proc or function
   config.integer_format = :number_with_delimiter
 
@@ -48,7 +52,8 @@ EffectiveDatatables.setup do |config|
   config.actions_column = {
     show: :authorize,
     edit: :authorize,
-    destroy: :authorize
+    destroy: :authorize,
+    unarchive: :authorize
   }
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails