active_list 6.1.0 → 6.1.1

data/lib/active_list/definition/action_column.rb

@@ -6,8 +6,12 @@ module ActiveList
     class ActionColumn < AbstractColumn
       include ActiveList::Helpers
 
+      ID_PLACEHOLDER = "##IDS##"
+
       USE_MODES = [:none, :single, :many, :both]
 
+      attr_reader :use_mode
+
       def initialize(table, name, options = {})
         super(table, name, options)
         @use_mode = (@options.delete(:on) || :single).to_sym
@@ -53,7 +57,7 @@ module ActiveList
           url[:format] = @options[:format]
         end
         if use_many? and use_mode == :many
-          url[:id] ||= "##IDS##"
+          url[:id] ||= ID_PLACEHOLDER
         end
         return url
       end
@@ -86,11 +90,11 @@ module ActiveList
             raise StandardError, "Only compatible with single actions"
           end
           unless @options[:actions].is_a? Hash
-            raise StandardError, "options[:actions] have to be a Hash."
+            raise StandardError, ":actions parameter have to be a Hash."
           end
           cases = []
           for expected, url in @options[:actions]
-            cases << record+"."+@name.to_s+" == " + expected.inspect + "\nlink_to(content_tag(:i) + h(#{url[:action].inspect}.t(scope: 'labels'))"+
+            cases << record+"."+@name.to_s+" == " + expected.inspect + "\nlink_to(content_tag(:i) + h(#{url[:action].inspect}.t(scope: 'rest.actions'))"+
               ", {"+(url[:controller] ? 'controller: :'+url[:controller].to_s+', ' : '')+"action: '"+url[:action].to_s+"', id: "+record+".id"+format+"}"+
               ", {:class => '#{@name}'"+link_options+"}"+
               ")\n"
@@ -102,10 +106,11 @@ module ActiveList
           url[:controller] ||= (@options[:controller] || "RECORD.class.name.tableize".c) # self.table.model.name.underscore.pluralize.to_s
           url[:action] ||= @name.to_s
           url[:id] ||= "RECORD.id".c
+          url[:id] = "RECORD.id".c if url[:id] == ID_PLACEHOLDER
           url.delete_if{|k, v| v.nil?}
           url = "{" + url.collect{|k, v| "#{k}: " + urlify(v, record)}.join(", ")+format+"}"
           code = "{class: '#{@name}'" + link_options+"}"
-          code = "link_to(content_tag(:i) + h(' ' + '#{action}'.t(scope: 'labels')), " + url + ", " + code + ")"
+          code = "link_to(content_tag(:i) + h(' ' + '#{action}'.t(scope: 'rest.actions')), " + url + ", " + code + ")"
         end
         if @options[:if]
           code = "if " + recordify!(@options[:if], record) + "\n" + code.dig + "end"

data/lib/active_list/definition/table.rb

@@ -13,7 +13,6 @@ module ActiveList
         @options[:renderer] ||= :simple_renderer
         @options[:per_page] = 20 if @options[:per_page].to_i <= 0
         @options[:page] = 1 if @options[:page].to_i <= 0
-        @selector = @options.delete(:selector)
         @columns = []
         @id = ActiveList.new_uid
       end
@@ -58,7 +57,7 @@ module ActiveList
       end
 
       def selectable?
-        @selector
+        action_columns.select(&:use_many?).any?
       end
 
       # Retrieves all columns in database

data/lib/active_list/renderers/simple_renderer.rb

@@ -283,7 +283,7 @@ module ActiveList
           actioner = ""
           actioner << "<span class=\"actioner\">'"
           for column in table.global_action_columns
-            actioner << " + link_to(content_tag(:i) + h(' ' + :#{column.name.to_s}.t(scope: 'labels')), #{column.default_url.inspect}, class: 'btn btn-#{column.name}'#{', style: "display: none"' unless column.use_none?}#{', method: "' + column.options[:method].to_s + '"' if column.options[:method]}, data: {list_actioner: :#{column.use_none? ? 'none' : 'many'}#{', confirm: :' + column.options[:confirm].to_s + '.t(scope: "labels")' if column.options[:confirm]}})"
+            actioner << " + link_to(content_tag(:i) + h(' ' + :#{column.name.to_s}.t(scope: 'rest.actions')), #{column.default_url.inspect}, class: 'btn btn-#{column.name}'#{', style: "display: none"' unless column.use_none?}#{', method: "' + column.options[:method].to_s + '"' if column.options[:method]}, data: {list_actioner: :#{column.use_none? ? 'none' : 'many'}#{', confirm: :' + column.options[:confirm].to_s + '.t(scope: "labels")' if column.options[:confirm]}})"
           end
           actioner << " + '</span>"
           code << "'#{actioner}'"
@@ -297,7 +297,7 @@ module ActiveList
           last_page = "#{var_name(:last)}"
 
           pagination << "<span class=\"pagination\">"
-          pagination << "<span class=\"status\">' + 'list.pagination.x_to_y_of_total'.t(x: (#{var_name(:offset)} + 1), y: ((#{var_name(:last)} == #{var_name(:page)}) ? #{var_name(:count)} : #{var_name(:offset)} + #{var_name(:limit)}), total: #{var_name(:count)}) + '</span>"
+          pagination << "<span class=\"status\">' + 'list.pagination.x_to_y_of_total'.t(x: (#{var_name(:offset)} + (#{var_name(:count)} > 0 ? 1 : 0)), y: ((#{var_name(:last)} == #{var_name(:page)}) ? #{var_name(:count)} : #{var_name(:offset)} + #{var_name(:limit)}), total: #{var_name(:count)}) + '</span>"
 
           pagination << "<span class=\"paginator\">"
 

data/lib/active_list/version.rb

@@ -1,5 +1,5 @@
 module ActiveList
 
-  VERSION = "6.1.0"
+  VERSION = "6.1.1"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_list
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails