active_scaffold_config_list 3.5.1 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be3b1357610333757d013332316debd39b636bb7f690a3cf57ed27088faf9abe
-  data.tar.gz: 8940de8dc18e5575c74ed3604ddd22dfa6b06abf9a04503d1ffb2335858eb36c
+  metadata.gz: f2c3d3d9d64fafc128d38bf32437db1f53505bde01601d1186f562f3df76e3cf
+  data.tar.gz: f43e78ff81d757bef7fe7ea35d79a5ad73d5b1280dc6460a371e7cf98b212c9e
 SHA512:
-  metadata.gz: 8171e1910707eca649a41a9df49b7c4333be31a65fde1d9ddfc083c19f92dabc76fd5fef0f5cd3b8f245b5a252033484a3b559a2ccd78a324247042de32ae776
-  data.tar.gz: 6582db9e3c46b42c21330c4b67d0d726e6d55395db2e091849a59de9d09ff73b2b4ae261a2a6592819ffd7e9e7f308ca84660e57b35acbbe9b7daca05b40d73f
+  metadata.gz: 61ee9652c00712cf1a5c3163f358cc4c2c6d46accec2abde2c554aaa3604ce09d98c0af694028aba107d4c7254bb52d221a9921c279804eb678a9ea0850d9c51
+  data.tar.gz: 77e1bbda33907266fb31d67722a85c8e22d06b61bd0181a476c80157c52a32c30ba196d579625a5fd45874da2a8b600d900835fce0461cbb43ad6ecf658f364e

data/README.md

@@ -1,6 +1,7 @@
-This works with Rails >= 4.0 and ActiveScaffold >= 3.4.4
-Version 3.3.x worked with Rails 3.2 and ActiveScaffold >= 3.4.4
-Version 3.2.x worked with Rails 3.2 and ActiveScaffold >= 3.3.0
+This works with Rails >= 5.2 and ActiveScaffold >= 3.7.1  
+Version 3.4.x and 3.5.x worked with Rails >= 4.0 and ActiveScaffold >= 3.4.4  
+Version 3.3.x worked with Rails 3.2 and ActiveScaffold >= 3.4.4  
+Version 3.2.x worked with Rails 3.2 and ActiveScaffold >= 3.3.0  
 
 Usage:
 
@@ -37,6 +38,14 @@ list configuration, and setting config_list to use that method.
 conf.config_list.save_to_user = :config_list_for
 ```
 
+It can be changed globally for the app in `ActiveScaffold.defaults` in an initializer, such as:
+
+```rb
+ActiveScaffold.defaults do |config|
+  config.config_list.save_to_user
+end
+```
+
 The model storing list configuration must have a config_list text column storing the columns list, and config_list_sort
 serialized text column. For example:
 

data/app/views/active_scaffold_overrides/_show_config_list_form.html.erb

@@ -1,16 +1,16 @@
-<% url_options = params_for(:action => :index, :escape => false, :config_list => nil) -%>
+<% url_options = params_for(action: :index, escape: false, config_list: nil) -%>
 <%=
-options = {:id => element_form_id(:action => :config_list),
-           :class => "as_form config_list",
-           :remote => request.xhr?,
-           :method => :get,
+options = {id: element_form_id(action: :config_list),
+           class: "as_form config_list",
+           remote: request.xhr?,
+           method: :get,
            'data-loading' => true}
 form_tag url_options, options %>
   <h4><%= active_scaffold_config.config_list.label -%></h4>
-  <%= render :partial => 'show_config_list_form_body' %>
+  <%= render 'show_config_list_form_body' %>
   <p class="form-footer">
-    <%= submit_tag as_(:config_list), :class => "submit" %>
-    <%= link_to as_(:reset), url_for(url_options.merge(:config_list => '')), :class => 'as_cancel', :remote => true, :data => {:refresh => true} %>
-    <%= loading_indicator_tag(:action => :config_list) %>
+    <%= submit_tag as_(:config_list), class: "submit" %>
+    <%= link_to as_(:reset), url_for(url_options.merge(config_list: '')), class: 'as_cancel', remote: true, data: {refresh: true} %>
+    <%= loading_indicator_tag(action: :config_list) %>
   </p>
 </form>

data/app/views/active_scaffold_overrides/_show_config_list_form_body.html.erb

@@ -1,33 +1,31 @@
 <ol class="form">
+  <% if config_list_columns? %>
   <li class="form-element">
     <dl><dt><label><%= as_ :columns %></label></dt>
-    <dd><ul class="<%= active_scaffold_config.config_list.draggable ? 'draggable-lists' : 'sortable-container' %>" id="<%= element_form_id(:action => :config_list) %>-columns">
-<%
-  if !config_list_params.nil? && config_list_params.is_a?(Array)
-    config_list = config_list_params
-    list_columns.concat active_scaffold_config.list.columns.visible_columns.select{|column| config_list.exclude? column.name}
-  end
-%>
-<% list_columns.each do |c| %>
+    <dd><ul class="<%= active_scaffold_config.config_list.draggable ? 'draggable-lists' : 'sortable-container' %>" id="<%= element_form_id(action: :config_list) %>-columns">
+<% config_list_columns.each do |label, column| %>
       <li class="sortable">
-        <%= check_box_tag 'config_list[]', c.name.to_s, (config_list_params.nil? ? true : config_list_params.include?(c.name)), {:id => nil}%>
-        <label><%= column_heading_label(c) %></label>
+        <%= check_box_tag 'config_list[]', column.to_s, (config_list_params.nil? ? true : config_list_params.include?(column)), {id: nil}%>
+        <label><%= label %></label>
       </li>
 <% end %>
     </ul></dd></dl>
   </li>
+  <% end %>
+  <% if config_list_sorting? %>
   <li class="form-element">
     <dl><dt><label><%= as_ :default_sorting %></label></dt>
     <dd><ol>
 <%
-  columns_options = list_columns.select{|c| c.sortable?}.map{|c| [c.label, c.name]}
-  order_options = ['asc', 'desc'].map{ |v| [as_(v), v] }
+  columns_options = list_columns.select(&:sortable?).map { |c| [c.label, c.name] }
+  order_options = ['asc', 'desc'].map { |v| [as_(v), v] }
   selected = config_list_sorting || []
   3.times do |i|
 %>
-      <li><%= select_tag "config_list_sorting[#{i}][]", options_for_select(columns_options, :selected => selected[i].try(:first)), :include_blank => as_(:_select_), :class => 'column' %>
-      <%= select_tag "config_list_sorting[#{i}][]", options_for_select(order_options, :selected => selected[i].try(:last)), :include_blank => as_(:_select_), :class => 'order' %></li>
+      <li><%= select_tag "config_list_sorting[#{i}][]", options_for_select(columns_options, selected: selected[i]&.first), include_blank: as_(:_select_), class: 'column' %>
+      <%= select_tag "config_list_sorting[#{i}][]", options_for_select(order_options, selected: selected[i]&.last), include_blank: as_(:_select_), class: 'order' %></li>
 <% end %>
     </ol></dd></dl>
   </li>
+  <% end %>
 </ol>

data/app/views/active_scaffold_overrides/show_config_list_form.html.erb

@@ -1,5 +1,5 @@
 <div class="active-scaffold">
   <div class="config_list-view view">
-    <%= render :partial => 'show_config_list_form' -%>
+    <%= render 'show_config_list_form' -%>
   </div>
 </div>

data/lib/active_scaffold/actions/config_list.rb

@@ -2,17 +2,17 @@ module ActiveScaffold::Actions
   module ConfigList
     
     def self.included(base)
-      base.before_action :store_config_list_params, :set_default_sorting, :only => [:index]
+      base.before_action :store_config_list_params, :set_default_sorting, only: [:index]
       base.helper_method :config_list_params, :config_list_sorting
     end
 
     def show_config_list
       respond_to do |type|
         type.html do
-          render(:action => 'show_config_list_form', :layout => true)
+          render(action: 'show_config_list_form', layout: true)
         end
         type.js do
-          render(:partial => 'show_config_list_form', :layout => false)
+          render(partial: 'show_config_list_form', layout: false)
         end
       end
     end
@@ -58,13 +58,21 @@ module ActiveScaffold::Actions
       send(config_list_session_storage_method)
     end
 
+    def config_list_session_storage_key
+      active_scaffold_session_storage_key
+    end
+
+    def config_list_controller_name
+      controller_name
+    end
+
     def active_scaffold_current_user
       @active_scaffold_current_user ||= send(self.class.active_scaffold_config.class.security.current_user_method)
     end
 
     def delete_config_list_params
       if active_scaffold_config.config_list.save_to_user && active_scaffold_current_user
-        active_scaffold_current_user.send(active_scaffold_config.config_list.save_to_user, active_scaffold_session_storage_key, controller_name).destroy
+        active_scaffold_current_user.send(active_scaffold_config.config_list.save_to_user, config_list_session_storage_key, config_list_controller_name).destroy
       else
         config_list_session_storage['config_list'] = nil
         config_list_session_storage['config_list_sorting'] = nil
@@ -76,7 +84,7 @@ module ActiveScaffold::Actions
 
     def save_config_list_params(config_list, config_list_sorting)
       if active_scaffold_config.config_list.save_to_user && active_scaffold_current_user
-        record = active_scaffold_current_user.send(active_scaffold_config.config_list.save_to_user, active_scaffold_session_storage_key, controller_name)
+        record = active_scaffold_current_user.send(active_scaffold_config.config_list.save_to_user, config_list_session_storage_key, config_list_controller_name)
         record.config_list = config_list.join(',')
         record.config_list_sorting = config_list_sorting if record.respond_to? :config_list_sorting
         record.save
@@ -94,7 +102,7 @@ module ActiveScaffold::Actions
         @last_modified = [@last_modified, config_list_record.updated_at].compact.max if config_list_record.respond_to? :updated_at
         objects = super
         if objects.is_a? Hash
-          objects.merge(:etag => [objects[:etag], config_list_record])
+          objects.merge(etag: [objects[:etag], config_list_record])
         else
           [objects, config_list_record]
         end
@@ -105,20 +113,22 @@ module ActiveScaffold::Actions
 
     def config_list_record
       return @config_list_record if defined? @config_list_record
-      @config_list_record = if active_scaffold_config.config_list.save_to_user
-        if active_scaffold_current_user
-          active_scaffold_current_user.send(active_scaffold_config.config_list.save_to_user, active_scaffold_session_storage_key, controller_name)
+      @config_list_record =
+        if active_scaffold_config.config_list.save_to_user && active_scaffold_current_user
+          active_scaffold_current_user.send(active_scaffold_config.config_list.save_to_user, config_list_session_storage_key, config_list_controller_name)
         end
-      end
     end
 
     def config_list_params
-      @config_list_params = if config_list_record 
-        params = config_list_record.config_list
-        params.split(',').map(&:to_sym) if params
-      else
-        config_list_session_storage['config_list']
-      end unless defined? @config_list_params
+      unless defined? @config_list_params
+        @config_list_params =
+          if config_list_record
+            params = config_list_record.config_list
+            params.split(',').map(&:to_sym) if params
+          else
+            config_list_session_storage['config_list']
+          end
+      end
       @config_list_params || config_list_default_columns
     end
 
@@ -127,11 +137,14 @@ module ActiveScaffold::Actions
     end
 
     def config_list_sorting
-      @config_list_sorting = if config_list_record 
-        config_list_record.config_list_sorting if config_list_record.respond_to? :config_list_sorting
-      else
-        config_list_session_storage['config_list_sorting']
-      end unless defined? @config_list_sorting
+      unless defined? @config_list_sorting
+        @config_list_sorting =
+          if config_list_record
+            config_list_record.config_list_sorting if config_list_record.respond_to? :config_list_sorting
+          else
+            config_list_session_storage['config_list_sorting']
+          end
+      end
       @config_list_sorting
     end
 
@@ -139,8 +152,9 @@ module ActiveScaffold::Actions
       @list_columns ||= begin
         columns = super
         if config_list_params.present?
-          config_list = Hash[config_list_params.each_with_index.map{|c,i| [c,i]}]
-          columns.select{|column| config_list.include? column.name}.sort{|x,y| config_list[x.name] <=> config_list[y.name]}
+          config_list = config_list_params.each.with_index.to_h
+          columns.select { |column| config_list.include? column.name }.
+            sort { |x, y| config_list[x.name] <=> config_list[y.name] }
         else
           columns
         end
@@ -150,7 +164,7 @@ module ActiveScaffold::Actions
     # The default security delegates to ActiveRecordPermissions.
     # You may override the method to customize.
     def config_list_authorized?
-      authorized_for?(:action => :read)
+      authorized_for?(action: :read)
     end
   end
 end

data/lib/active_scaffold/helpers/config_list_helpers.rb

@@ -0,0 +1,24 @@
+module ActiveScaffold
+  module Helpers
+    module ConfigListHelpers
+      def config_list_sorting?
+        true
+      end
+
+      def config_list_columns?
+        true
+      end
+
+      def config_list_columns
+        columns =
+          if config_list_params.is_a?(Array)
+            config_list = config_list_params
+            list_columns.concat active_scaffold_config.list.columns.visible_columns.select { |column| config_list.exclude? column.name }
+          else
+            list_columns
+          end
+        columns.map { |c| [column_heading_label(c), c.name] }
+      end
+    end
+  end
+end

data/lib/active_scaffold_config_list/engine.rb

@@ -5,5 +5,11 @@ module ActiveScaffoldConfigList
         self::ACTIVE_SCAFFOLD_CORE_ROUTING[:collection][:show_config_list] = :get
       end
     end
+
+    initializer 'active_scaffold_config_list.action_view' do
+      ActiveSupport.on_load :action_view do
+        ActionView::Base.send :include, ActiveScaffold::Helpers::ConfigListHelpers
+      end
+    end
   end
 end

data/lib/active_scaffold_config_list/version.rb

@@ -1,8 +1,8 @@
 module ActiveScaffoldConfigList
   module Version
     MAJOR = 3
-    MINOR = 5
-    PATCH = 1
+    MINOR = 6
+    PATCH = 0
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/lib/active_scaffold_config_list.rb

@@ -9,4 +9,9 @@ module ActiveScaffold
   module Config
     ActiveScaffold.autoload_subdir('config', self, File.dirname(__FILE__))
   end
+
+  module Helpers
+    ActiveScaffold.autoload_subdir('helpers', self, File.dirname(__FILE__))
+  end
 end
+ActiveSupport.run_load_hooks(:active_scaffold_config_list)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold_config_list
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.6.0
 platform: ruby
 authors:
 - Sergio Cambra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-25 00:00:00.000000000 Z
+date: 2024-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_scaffold
@@ -59,6 +59,7 @@ files:
 - config/locales/ru.yml
 - lib/active_scaffold/actions/config_list.rb
 - lib/active_scaffold/config/config_list.rb
+- lib/active_scaffold/helpers/config_list_helpers.rb
 - lib/active_scaffold_config_list.rb
 - lib/active_scaffold_config_list/engine.rb
 - lib/active_scaffold_config_list/version.rb
@@ -74,14 +75,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: User specific column configuration for ActiveScaffold