active_list 7.0.0 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '022092abfbb1ef56a9e935ba1f815b5f13dd7fc4'
-  data.tar.gz: c15a78e14c48e10bfe281e2f735e5b3bc9084ea7
+  metadata.gz: 81ce03aaece14d5f38d557ccc43ab2d1252aa1b9
+  data.tar.gz: 58f4a6bfc926669b9aa8b7022655141f25c16959
 SHA512:
-  metadata.gz: 51bed46ba112355efe2aadbeae3e652296fbe9071d63d915a73d4189b87c21b933c44b3af2eefc14032827bcf13e5e370f6310f6f30dc66c30ddbaf658330013
-  data.tar.gz: edc59cfcb98fa9f621d67f1f6b593657ca2e1ede60c22631884c0ec749ed455e5ff0e8724c6559e2a2e8a915288d22311d8d72a6247aaea69687b7df29eb5fd5
+  metadata.gz: ae364e886416828ab7c632e871e4a7bbb8ab5b94c58ca50902fcff74ccddbb4face3ae8aae6064490e217ad806f7c0fef712ba79627cd45aad296fbbf6ff45ae
+  data.tar.gz: 71ec9909171eaba5b35562600e72da60d2e618eb8b13c6acda5d72a7fccb3f92fc2198a8b22842c172021bf088f57d52c3319cc1bb151c3ab8eb7aee3c9c5358

data/lib/active_list/definition/action_column.rb

@@ -95,7 +95,7 @@ module ActiveList
             url.delete_if { |_k, v| v.nil? }
             cases << "#{record}.#{@name} == #{expected.inspect}\nlink_to(content_tag(:i) + h(#{url[:action].inspect}.t(scope: 'rest.actions'))"\
                      ', {' + url.collect { |k, v| "#{k}: " + urlify(v, record) }.join(', ') + format + '}' \
-                                                                                                       ", {class: '#{@name}'" + link_options + '}'\
+                                                                                                       ", {class: '#{@options[:icon_name] || @name}'" + link_options + '}'\
                                                                                                                                                ")\n"
           end
 
@@ -109,7 +109,7 @@ module ActiveList
           url[:redirect] ||= 'params[:redirect]'.c
           url.delete_if { |_k, v| v.nil? }
           url = '{' + url.collect { |k, v| "#{k}: " + urlify(v, record) }.join(', ') + format + '}'
-          code = "{class: '#{@name}'" + link_options + '}'
+          code = "{class: '#{@options[:icon_name] || @name}'" + link_options + '}'
           code = "link_to(content_tag(:i) + h(' ' + :#{action}.t(scope: 'rest.actions')), " + url + ', ' + code + ')'
         end
         if @options[:if]

data/lib/active_list/definition/attribute_column.rb

@@ -11,13 +11,7 @@ module ActiveList
                         else
                           @label_method.to_s.gsub('human_', '').to_sym
                         end
-        unless @sort_column = options[:sort]
-          @sort_column = if @table.model.columns_hash[@label_method.to_s]
-                           @label_method
-                         elsif @table.model.columns_hash[@name.to_s]
-                           @name
-                         end
-        end
+        @sort_column = get_sort_column
         @computation_method = options[:on_select]
         @column = @table.model.columns_hash[@label_method.to_s]
       end
@@ -51,6 +45,24 @@ module ActiveList
         code.c
       end
 
+      def get_sort_column
+        selects = @table.options[:select] || {}
+        selects_label = selects.find { |sql_name, name| name.to_s == @label_method.to_s }&.last
+        selects_name = selects.find { |sql_name, name| name.to_s == @name.to_s }&.last
+        if (selects_label || selects_name) && options[:sort].blank?
+          sort_column = (selects_label || selects_name)
+        else
+          sort_column = options[:sort]
+          sort_column ||= if @table.model.columns_hash[@label_method.to_s]
+                             @label_method
+                           elsif @table.model.columns_hash[@name.to_s]
+                             @name
+                           end
+          sort_column &&= "#{@table.model.table_name}.#{sort_column}"
+        end
+        sort_column
+      end
+
       # Returns the class name of the used model
       def class_name
         table.model.name
@@ -70,7 +82,7 @@ module ActiveList
       end
 
       def sort_expression
-        "#{@table.model.table_name}.#{@sort_column}"
+        @sort_column
       end
     end
   end

data/lib/active_list/generator/finder.rb

@@ -34,7 +34,6 @@ module ActiveList
               else
                 "#{var_name(:count)} = #{query_code}.count\n"
               end
-
       query_code << ".group(#{@table.options[:group].inspect})" unless @table.options[:group].blank?
       query_code << ".reorder(#{var_name(:order)})"
 
@@ -133,7 +132,7 @@ module ActiveList
       code << 'DISTINCT ' if @table.options[:distinct]
       if @table.options[:select]
         # code << @table.options[:select].collect { |k, v| ", #{k[0].to_s + '.' + k[1].to_s} AS #{v}" }.join
-        code << @table.options[:select].collect do |k, v| 
+        code << @table.options[:select].collect do |k, v|
           c = if k.is_a? Array
                 k[0].to_s + '.' + k[1].to_s
               else

data/lib/active_list/renderers/simple_renderer.rb

@@ -314,7 +314,7 @@ module ActiveList
         end
         table.columns.each do |column|
           next if column.is_a?(ActiveList::Definition::ActionColumn) && !column.use_single?
-          code << "<th data-list-column=\"#{column.sort_id}\""
+          code << "<th data-list-column=\"#{column.options[:icon_name] || column.sort_id}\""
           code << " data-list-column-cells=\"#{column.short_id}\""
           code << " data-list-column-sort=\"'+(#{var_name(:params)}[:sort] != '#{column.sort_id}' ? 'asc' : #{var_name(:params)}[:dir] == 'asc' ? 'desc' : 'asc')+'\"" if column.sortable?
           code << " data-list-column-computation=\"#{column.computation_method}\"" if column.computable?

data/lib/active_list/version.rb

@@ -1,3 +1,3 @@
 module ActiveList
-  VERSION = '7.0.0'.freeze
+  VERSION = '7.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_list
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.1.0
 platform: ruby
 authors:
 - Brice Texier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-01 00:00:00.000000000 Z
+date: 2019-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails