active_scaffold 3.6.0.pre → 3.6.0.rc1

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

@@ -1,4 +1,4 @@
-<%= content_tag(:div, id: active_scaffold_id, class: as_main_div_class, data: params[:eid] ? {eid: id_from_controller(params[:eid])} : {}) do %>
+<%= content_tag(:div, id: active_scaffold_id, class: as_main_div_class, data: as_main_div_data) do %>
   <div class="active-scaffold-header">
     <%= render :partial => 'list_header' %>
   </div>

data/app/views/active_scaffold_overrides/_refresh_list.js.erb

@@ -4,7 +4,11 @@
 
     <% if @page.pager.infinite? || @page.number < @page.pager.number_of_pages -%>
       ActiveScaffold.auto_load_page('<%= url_for main_path_to_return %>', {auto_pagination: true, page: <%= @page.number + 1 %>});
+    <% else %>
+      ActiveScaffold.hide('<%= loading_indicator_id(action: :pagination) %>');
     <% end # @page.pager.infinite?... %>
+  <% else %>
+    ActiveScaffold.hide('<%= loading_indicator_id(action: :pagination) %>');
   <% end # @page.items.present? %>
 
   <% elsif active_scaffold_config.list.refresh_with_header -%>

data/config/locales/de.yml

@@ -107,7 +107,8 @@ de:
       other: "%{count} %{model} makriert"
     refresh: Neu laden
     remove: Entfernen
-    remove_file: Entferne oder Ersetze Datei
+    remove_file: Entferne oder Ersetzte Datei
+    remove_files: Entfernen oder Hinzufügen Dateien
     replace_existing: Existierenden ersetzen
     replace_with_new: Mit Neuer ersetzen
     reset: Zurücksetzen

data/config/locales/en.yml

@@ -108,6 +108,7 @@ en:
     refresh: Refresh
     remove: Remove
     remove_file: Remove or Replace file
+    remove_files: Remove or Add files
     replace_existing: Replace Existing
     replace_with_new: Replace With New
     reset: Reset

data/config/locales/es.yml

@@ -110,6 +110,7 @@ es:
     refresh: Recargar
     remove: Eliminar
     remove_file: Eliminar o Reemplazar archivo
+    remove_files: Eliminar o Añadir archivos
     replace_existing: Reemplazar existente
     replace_with_new: Reemplazar con Nuevo
     reset: Restaurar

data/config/locales/fr.yml

@@ -107,7 +107,8 @@ fr:
       other: "%{count} %{model} marqués"
     refresh: Rafraîchir
     remove: Supprimer
-    remove_file: Supprimer et remplacer le fichier
+    remove_file: Supprimer ou remplacer le fichier
+    remove_files: Supprimer ou Ajouter des fichiers
     replace_existing: Remplacer existant(e)
     replace_with_new: Remplacer avec le nouveau
     reset: Annuler

data/config/locales/hu.yml

@@ -108,6 +108,7 @@ hu:
     refresh: Frissítés
     remove: Törlés
     remove_file: Fájl törlése, vagy cseréje
+    remove_files: Fájlok törlése, vagy hozzáadása
     replace_existing: Replace existing
     replace_with_new: Csere újjal
     reset: Alapállapot

data/config/locales/ja.yml

@@ -108,6 +108,7 @@ ja:
     refresh: Refresh
     remove: 削除
     remove_file: ファイルを削除または置換
+    remove_files: ファイルを削除または追加する
     replace_existing: Replace existing
     replace_with_new: 新しいもので置換
     reset: リセット

data/config/locales/ru.yml

@@ -116,6 +116,7 @@ ru:
     refresh: Обновить
     remove: Удалить
     remove_file: Удалить или заменить файл
+    remove_files: Удалить или Добавить файлы
     replace_existing: Заменить существующим
     replace_with_new: Заменить новым
     reset: Сброс

data/lib/active_scaffold.rb

@@ -41,8 +41,8 @@ module ActiveScaffold
 
   class ControllerNotFound < RuntimeError; end
   class MalformedConstraint < RuntimeError; end
-  class RecordNotAllowed < SecurityError; end
-  class ActionNotAllowed < SecurityError; end
+  class RecordNotAllowed < RuntimeError; end
+  class ActionNotAllowed < RuntimeError; end
   class ReverseAssociationRequired < RuntimeError; end
 
   mattr_accessor :delayed_setup, instance_writer: false
@@ -84,7 +84,12 @@ module ActiveScaffold
     File.dirname(__FILE__) + '/..'
   end
 
-  def self.set_defaults(&block)
+  def self.set_defaults(&block) # rubocop:disable Naming/AccessorMethodName
+    ActiveSupport::Deprecation.warn 'use ActiveScaffold.defaults'
+    defaults(&block)
+  end
+
+  def self.defaults(&block)
     ActiveScaffold::Config::Core.configure(&block)
   end
 end

data/lib/active_scaffold/actions/common_search.rb

@@ -1,13 +1,12 @@
 module ActiveScaffold::Actions
   module CommonSearch
     def self.included(base)
-      unless base < InstanceMethods
-        base.send :include, InstanceMethods
-        base.before_action :search_authorized_filter, :only => :show_search
-        base.before_action :store_search_params_into_session, :only => [:index]
-        base.before_action :do_search, :only => [:index]
-        base.helper_method :search_params
-      end
+      return if base < InstanceMethods
+      base.send :include, InstanceMethods
+      base.before_action :search_authorized_filter, :only => :show_search
+      base.before_action :store_search_params_into_session, :only => [:index]
+      base.before_action :do_search, :only => [:index]
+      base.helper_method :search_params
     end
 
     module InstanceMethods
@@ -34,7 +33,11 @@ module ActiveScaffold::Actions
 
       def store_search_params_into_session
         if active_scaffold_config.store_user_settings
-          active_scaffold_session_storage['search'] = permitted_search_params if params[:search]
+          if params[:search].present?
+            active_scaffold_session_storage['search'] = permitted_search_params
+          elsif params.key? :search
+            active_scaffold_session_storage.delete 'search'
+          end
         else
           @search_params = permitted_search_params
         end

data/lib/active_scaffold/actions/core.rb

@@ -6,7 +6,7 @@ module ActiveScaffold::Actions
         before_action :check_input_device
         before_action :register_constraints_with_action_columns, :unless => :nested?
         after_action :clear_flashes
-        after_action :clear_storage
+        around_action :clear_storage
         rescue_from ActiveScaffold::RecordNotAllowed, ActiveScaffold::ActionNotAllowed, :with => :deny_access
       end
       base.helper_method :active_scaffold_config
@@ -72,7 +72,7 @@ module ActiveScaffold::Actions
         else
           updated_record_with_column(@column, params.delete(:value), @scope)
         end
-      set_parent(@record) if main_form_controller && @scope
+      setup_parent(@record) if main_form_controller && @scope
       after_render_field(@record, @column)
     end
 
@@ -111,7 +111,7 @@ module ActiveScaffold::Actions
       "#{params[:parent_controller].camelize}Controller"
     end
 
-    def set_parent(record)
+    def setup_parent(record)
       cfg = main_form_controller.active_scaffold_config
       association = cfg.columns[subform_child_association]&.association&.reverse_association
       return if association.nil?
@@ -129,8 +129,8 @@ module ActiveScaffold::Actions
       end
 
       if params[:nested] # form in nested scaffold, set nested parent_record to parent
-        nested = ActiveScaffold::DataStructures::NestedInfo.get(parent.class, params.delete(:nested))
-        if nested.child_association
+        nested = ActiveScaffold::DataStructures::NestedInfo.get(parent.class, params[:nested])
+        if nested&.child_association && !nested.child_association.polymorphic?
           apply_constraints_to_record(parent, constraints: {nested.child_association.name => nested.parent_id})
         end
       end
@@ -179,14 +179,12 @@ module ActiveScaffold::Actions
     # ex: accepts? :html, :xml
     def accepts?(*types)
       request.accepts.compact.each do |priority|
-        if priority == Mime::ALL
-          # Because IE always sends */* in the accepts header and we assume
-          # that if you really wanted XML or something else you would say so
-          # explicitly, we will assume */* to only ask for :html
-          return types.include?(:html)
-        elsif types.include?(priority.to_sym)
-          return true
-        end
+        # Because IE always sends */* in the accepts header and we assume
+        # that if you really wanted XML or something else you would say so
+        # explicitly, we will assume */* to only ask for :html
+        return types.include?(:html) if priority == Mime::ALL
+
+        return true if types.include?(priority.to_sym)
       end
       false
     end
@@ -204,6 +202,18 @@ module ActiveScaffold::Actions
       @response_object ||= successful? ? (@record || @records) : @record.errors
     end
 
+    def response_to_api(format, columns_names, options = {})
+      render(
+        options.reverse_merge(
+          format => response_object,
+          :only => columns_names + [active_scaffold_config.model.primary_key],
+          :include => association_columns(columns_names),
+          :methods => virtual_columns(columns_names),
+          :status => response_status
+        )
+      )
+    end
+
     # Success is the existence of one or more model objects. Most actions
     # circumvent this method by setting @success directly.
     def successful?
@@ -234,18 +244,19 @@ module ActiveScaffold::Actions
     # Builds search conditions by search params for column names. This allows urls like "contacts/list?company_id=5".
     def conditions_from_params
       @conditions_from_params ||= begin
-        conditions = {}
+        conditions = [{}]
         params.except(:controller, :action, :page, :sort, :sort_direction, :format, :id).each do |key, value|
-          column = active_scaffold_config._columns_hash[key.to_s]
+          distinct = true if key =~ /!$/
+          column = active_scaffold_config._columns_hash[key.to_s[0..(distinct ? -2 : -1)]]
           next unless column
-          key = key.to_sym
+          key = column.name.to_sym
           not_string = %i[string text].exclude?(column.type)
           next if active_scaffold_constraints[key]
           next if nested? && nested.param_name == key
 
-          range = %i[date datetime].include?(column.type) && value.is_a?(String) && value.scan('..').size == 1
+          range = %i[date datetime integer decimal float bigint].include?(column.type) && value.is_a?(String) && value.scan('..').size == 1
           value = value.split('..') if range
-          conditions[key] =
+          value =
             if value.is_a?(Array)
               value.map { |v| v == '' && not_string ? nil : ActiveScaffold::Core.column_type_cast(v, column) }
             elsif value == '' && (not_string || column.null)
@@ -253,30 +264,36 @@ module ActiveScaffold::Actions
             else
               ActiveScaffold::Core.column_type_cast(value, column)
             end
-          conditions[key] = Range.new(*conditions[key]) if range
+          value = Range.new(*value) if range
+          if distinct
+            conditions << active_scaffold_config.model.arel_table[key].not_eq(value)
+          else
+            conditions[0][key] = value
+          end
         end
         conditions
       end
     end
 
     def new_model
-      # ignore nested unrelated to current controller, e.g. adding record in subform inside subform, would create wrong parent_record
-      if nested? && nested.association && nested.association.klass != active_scaffold_config.model
-        return active_scaffold_config.model.new
-      end
       relation = beginning_of_chain
-      config = active_scaffold_config_for(relation.klass) if nested? && nested.plural_association?
-      column = relation.klass.inheritance_column if config
-      if column && config._columns_hash[column]
-        model_name = params.delete(column) # in new action inheritance_column must be in params
-        model_name ||= params[:record]&.delete(column) # in create action must be inside record key
-        model_name = model_name.camelize if model_name
-        model_name ||= active_scaffold_config.model.name
-        build_options = {column.to_sym => model_name} if model_name
-      end
+      build_options = sti_nested_build_options(relation.klass) if nested? && nested.plural_association?
       relation.respond_to?(:build) ? relation.build(build_options || {}) : relation.new
     end
 
+    def sti_nested_build_options(klass)
+      config = active_scaffold_config_for(klass)
+      return unless config
+      column = klass.inheritance_column
+      return unless column && config._columns_hash[column]
+
+      model_name = params.delete(column) # in new action inheritance_column must be in params
+      model_name ||= params[:record]&.delete(column) # in create action must be inside record key
+      model_name = model_name.camelize if model_name
+      model_name ||= active_scaffold_config.model.name
+      {column.to_sym => model_name} if model_name
+    end
+
     def get_row(crud_type_or_security_options = :read)
       klass = beginning_of_chain
       klass = klass.preload(active_scaffold_preload) unless active_scaffold_config.mongoid?
@@ -288,6 +305,8 @@ module ActiveScaffold::Actions
     end
 
     def clear_storage
+      yield if block_given?
+    ensure
       session_index = active_scaffold_session_storage_key
       session.delete(session_index) if session[session_index].blank?
     end
@@ -297,14 +316,13 @@ module ActiveScaffold::Actions
     end
 
     def check_input_device
-      if session[:input_device_type].nil?
-        if request.env['HTTP_USER_AGENT'] =~ /(iPhone|iPod|iPad)/i
-          session[:input_device_type] = 'TOUCH'
-          session[:hover_supported] = false
-        else
-          session[:input_device_type] = 'MOUSE'
-          session[:hover_supported] = true
-        end
+      return unless session[:input_device_type].nil?
+      if request.env['HTTP_USER_AGENT'] =~ /(iPhone|iPod|iPad)/i
+        session[:input_device_type] = 'TOUCH'
+        session[:hover_supported] = false
+      else
+        session[:input_device_type] = 'MOUSE'
+        session[:hover_supported] = true
       end
     end
 
@@ -367,12 +385,12 @@ module ActiveScaffold::Actions
       render :action => 'action_confirmation', :locals => {:record => @record, :link => link}
     end
 
+    def action_update_respond_on_iframe
+      responds_to_parent { action_update_respond_to_js }
+    end
+
     def action_update_respond_to_html
-      if params[:iframe] == 'true' # was this an iframe post ?
-        responds_to_parent { action_update_respond_to_js }
-      else
-        redirect_to :action => 'index'
-      end
+      redirect_to :action => 'index'
     end
 
     def action_update_respond_to_js
@@ -380,11 +398,11 @@ module ActiveScaffold::Actions
     end
 
     def action_update_respond_to_xml
-      render :xml => successful? ? '' : response_object, :only => list_columns_names + [active_scaffold_config.model.primary_key], :include => association_columns(list_columns_names), :methods => virtual_columns(list_columns_names), :status => response_status
+      response_to_api(:xml, list_columns_names)
     end
 
     def action_update_respond_to_json
-      render :json => successful? ? '' : response_object, :only => list_columns_names + [active_scaffold_config.model.primary_key], :include => association_columns(list_columns_names), :methods => virtual_columns(list_columns_names), :status => response_status
+      response_to_api(:json, list_columns_names)
     end
 
     def objects_for_etag
@@ -410,7 +428,9 @@ module ActiveScaffold::Actions
     end
 
     def virtual_columns(columns)
-      columns.reject { |col| active_scaffold_config.model.columns_hash[col.to_s] || active_scaffold_config.columns[col]&.association }
+      columns.reject do |col|
+        active_scaffold_config._columns_hash[col.to_s] || active_scaffold_config.columns[col]&.association
+      end
     end
 
     def association_columns(columns)
@@ -424,14 +444,22 @@ module ActiveScaffold::Actions
       respond_to do |type|
         action_formats.each do |format|
           type.send(format) do
-            if respond_to?(method_name = "#{action}_respond_to_#{format}", true)
-              send(method_name)
-            end
+            method_name = respond_method_for(action, format)
+            send(method_name) if method_name
           end
         end
       end
     end
 
+    def respond_method_for(action, format)
+      if format == :html && params[:iframe] == 'true'
+        method_name = "#{action}_respond_on_iframe"
+        return method_name if respond_to?(method_name, true)
+      end
+      method_name = "#{action}_respond_to_#{format}"
+      method_name if respond_to?(method_name, true)
+    end
+
     def action_formats
       @action_formats ||=
         if respond_to? "#{action_name}_formats", true

data/lib/active_scaffold/actions/create.rb

@@ -32,47 +32,47 @@ module ActiveScaffold::Actions
       render(:partial => 'create_form')
     end
 
+    def create_respond_on_iframe
+      do_refresh_list if successful? && active_scaffold_config.create.refresh_list && !render_parent?
+      responds_to_parent do
+        render :action => 'on_create', :formats => [:js], :layout => false
+      end
+    end
+
     def create_respond_to_html
-      if params[:iframe] == 'true' # was this an iframe post ?
-        do_refresh_list if successful? && active_scaffold_config.create.refresh_list && !render_parent?
-        responds_to_parent do
-          render :action => 'on_create', :formats => [:js], :layout => false
-        end
-      else
-        if successful?
-          flash[:info] = as_(:created_model, :model => ERB::Util.h(@record.to_label))
-          if (action = active_scaffold_config.create.action_after_create)
-            redirect_to params_for(:action => action, :id => @record.to_param)
-          elsif params[:dont_close]
-            redirect_to params_for(:action => 'new')
-          else
-            return_to_main
-          end
+      if successful?
+        flash[:info] = as_(:created_model, :model => ERB::Util.h(@record.to_label))
+        if (action = active_scaffold_config.create.action_after_create)
+          redirect_to params_for(:action => action, :id => @record.to_param)
+        elsif params[:dont_close]
+          redirect_to params_for(:action => 'new')
         else
-          if active_scaffold_config.actions.include?(:list) && active_scaffold_config.list.always_show_create
-            list
-          else
-            render(:action => 'create')
-          end
+          return_to_main
         end
+      elsif active_scaffold_config.actions.include?(:list) && active_scaffold_config.list.always_show_create
+        list
+      else
+        render(:action => 'create')
       end
     end
 
     def create_respond_to_js
-      do_refresh_list if successful? && active_scaffold_config.create.refresh_list && !render_parent?
-      if successful? && params[:dont_close] && !render_parent?
-        @saved_record = @record
-        do_new
+      if successful? && !render_parent?
+        do_refresh_list if active_scaffold_config.create.refresh_list
+        if params[:dont_close]
+          @saved_record = @record
+          do_new
+        end
       end
       render :action => 'on_create'
     end
 
     def create_respond_to_xml
-      render :xml => response_object, :only => create_columns_names + [active_scaffold_config.model.primary_key], :include => association_columns(create_columns_names), :methods => virtual_columns(create_columns_names), :status => response_status, :location => response_location
+      response_to_api(:xml, create_columns_names, location: response_location)
     end
 
     def create_respond_to_json
-      render :json => response_object, :only => create_columns_names + [active_scaffold_config.model.primary_key], :include => association_columns(create_columns_names), :methods => virtual_columns(create_columns_names), :status => response_status, :location => response_location
+      response_to_api(:json, create_columns_names, location: response_location)
     end
 
     def create_columns_names
@@ -136,7 +136,7 @@ module ActiveScaffold::Actions
     private
 
     def create_authorized_filter
-      link = active_scaffold_config.create.link || active_scaffold_config.create.class.link
+      link = active_scaffold_config.create.link || self.class.active_scaffold_config.create.class.link
       raise ActiveScaffold::ActionNotAllowed unless send(link.security_method)
     end