active_scaffold 3.4.43 → 3.5.0

data/config/locales/ru.yml

@@ -1,80 +1,84 @@
-ru: 
-  active_scaffold: 
-    ? "!="
-    : "!="
-    <: <
-    <=: <=
-    ? ">"
-    : ">"
-    ? ">="
-    : ">="
+ru:
+  active_scaffold:
+    "!=": "!="
+    "<": "<"
+    "<=": "<="
+    "=": "="
+    ">": ">"
+    ">=": ">="
     _select_: "- выбрать -"
     _to_: " to "
-    add: "Добавить запись"
-    add_existing: "Добавить существующую запись"
+    add: Добавить запись
+    add_existing: Добавить существующую запись
     add_existing_model: "%{model}: добавить существующую запись"
-    are_you_sure_to_delete: "Удалить %{label}?"
+    apply: Применить
+    are_you_sure_to_delete: Удалить %{label}?
     average: Среднее
-    begins_with: "Начинается с"
-    between: "В интервале"
+    begins_with: Начинается с
+    between: В интервале
     cancel: Отмена
-    cant_destroy_record: "Запись %{record} не может быть удалена"
-    click_to_edit: "Нажмите для редактирования"
-    click_to_reset: "Нажмите для сброса"
+    cant_destroy_record: Запись %{record} не может быть удалена
+    changes: 
+    click_to_edit: Нажмите для редактирования
+    click_to_reset: Нажмите для сброса
     close: Закрыть
+    config_list: Настройки списка
+    config_list_model: "%{model}: настройки списка"
     contains: Содержит
     create: Создать
     create_another: "%{model}: Создать другую запись"
-    create_apply: Создать и продолжить
+    create_apply: 
     create_model: "%{model}: создать запись"
-    create_new: "Создать новую запись"
+    create_new: Создать новую запись
     created_model: "%{model}: запись создана"
     customize: Настроить
-    date_picker_options: 
+    date_picker_options:
       firstDay: 1
       isRTL: false
       showMonthAfterYear: false
       weekHeader: Нед.
-    datetime_picker_options: 
-      closeText: ~
-      currentText: ~
-      timeText: ~
+    datetime_picker_options:
+      closeText: Закрыть
+      currentText: Текущее время
+      timeText: 
     days: дней
     delete: Удалить
     deleted_model: "%{model}: запись удалена"
+    deleted_records: 
     delimiter: Разделитель
     download: Загрузить
     edit: Изменить
-    ends_with: "Оканчивается на"
-    error_500: "500 ошибка сервера"
-    errors: 
-      template: 
-        body: "Проблемы возникли со следующими полями:"
-        header: 
+    ends_with: Оканчивается на
+    error_500: 500 ошибка сервера
+    errors:
+      template:
+        body: 'Проблемы возникли со следующими полями:'
+        header:
           few: "%{model}: сохранение не удалось из-за %{count} ошибок"
           many: "%{model}: сохранение не удалось из-за %{count} ошибок"
           one: "%{model}: сохранение не удалось из-за %{count} ошибки"
           other: "%{model}: сохранение не удалось из-за %{count} ошибки"
     export: Экспорт
-    ? "false"
-    : Нет
-    filtered: (Найденное)
-    found: 
+    'false': Нет
+    filtered: "(Найденное)"
+    found:
       few: записи
       many: записей
       one: запись
       other: записи
     future: Будущие
-    hide: (Скрыть)
+    group_by: 
+    grouped_by: 
+    hide: "(Скрыть)"
     hours: часов
-    human_conditions: 
+    human_conditions:
       association: "%{column} = %{value}"
       boolean: "%{column} = %{value}"
     inplace_edit_handle: "--"
-    internal_error: "Внутренняя ошибка"
+    internal_error: Внутренняя ошибка
     live_search: Поиск
     loading: Загрузка…
-    mark_all_records: "Отметить все"
+    mark_all_records: Отметить все
     maximum: Максимум
     minimum: Минимум
     minutes: минут
@@ -82,62 +86,69 @@ ru:
     nested_for_model: "%{parent_model} / %{nested_model}"
     nested_of_model: "%{nested_model} @ %{parent_model}"
     next: Следующее
-    next_month: "В следующем месяце"
-    next_week: "На следующей неделе"
-    next_year: "В следующем году"
-    no_authorization_for_action: "Нет прав на выполнение действия \"%{action}\""
-    no_entries: "Нет записей"
-    no_options: "Нет вариантов"
-    not_null: "Не пусто"
-    ? "null"
-    : Пусто
-    omit_header: "Пропустить заголовок"
-    optional_attributes: "Дополнительные настройки"
+    next_month: В следующем месяце
+    next_week: На следующей неделе
+    next_year: В следующем году
+    no_authorization_for_action: Нет прав на выполнение действия "%{action}"
+    no_color: 
+    no_entries: Нет записей
+    no_group: 
+    no_options: Нет вариантов
+    not_null: Не пусто
+    'null': Пусто
+    omit_header: Пропустить заголовок
+    optional_attributes: Дополнительные настройки
     options: Настройки
     past: Прошедшие
     pdf: PDF
-    prev_month: "В прошлом месяце"
-    prev_week: "На прошлой неделе"
-    prev_year: "В прошлом году"
+    prev_month: В прошлом месяце
+    prev_week: На прошлой неделе
+    prev_year: В прошлом году
     previous: Предыдущее
     print: Печать
     range: Интервал
-    record_not_saved: "Запись  не может быть сохранена из-за неизвестной ошибки"
-    records_marked: 
-      few: "Отмечено %{count} записи"
-      many: "Отмечено %{count} записей"
-      one: "Отмечена 1 запись"
-      other: "Отмечено %{count} записи"
+    record_not_saved: Запись  не может быть сохранена из-за неизвестной ошибки
+    records_marked:
+      few: Отмечено %{count} записи
+      many: Отмечено %{count} записей
+      one: Отмечена 1 запись
+      other: Отмечено %{count} записи
     refresh: Обновить
     remove: Удалить
-    remove_file: "Удалить или заменить файл"
-    replace_existing: "Заменить существующим"
-    replace_with_new: "Заменить новым"
+    remove_file: Удалить или заменить файл
+    replace_existing: Заменить существующим
+    replace_with_new: Заменить новым
     reset: Сброс
     revisions_for_model: "%{model}: редакции"
     saving: Сохранение…
     search: Поиск
-    search_terms: "Ключевые слова"
+    search_terms: Ключевые слова
     seconds: секунд
     show: Показать
-    show_block: (Показать)
+    show_block: "(Показать)"
     show_model: "%{model}: показать запись"
     sum: Сумма
-    this_month: "В этом месяце"
-    this_week: "На этой неделе"
-    this_year: "В этом году"
+    this_month: В этом месяце
+    this_week: На этой неделе
+    this_year: В этом году
     today: Сегодня
     tomorrow: Завтра
-    ? "true"
-    : Да
-    update: "Обновить запись"
-    update_apply: Применить
+    'true': Да
+    update: Обновить запись
+    update_apply: 
     update_model: "%{model}: обновить запись"
     updated_model: "%{model}: запись обновлена"
-    version_inconsistency: "Эта запись была обновлена с того момента, как вы начали ее редактировать"
+    version_inconsistency: Эта запись была обновлена с того момента, как вы начали ее редактировать
     weeks: недель
     years: лет
     yesterday: Вчера
-  time: 
-    formats: 
+  date:
+    formats:
+      month: 
+      quarter: 
+      week: 
+      year_month: 
+      year_quarter: 
+  time:
+    formats:
       picker: "%a, %d %b %Y %H:%M:%S"

data/lib/active_scaffold.rb

@@ -8,6 +8,7 @@ module ActiveScaffold
   autoload :DelayedSetup, 'active_scaffold/delayed_setup'
   autoload :Finder, 'active_scaffold/finder'
   autoload :MarkedModel, 'active_scaffold/marked_model'
+  autoload :OrmChecks, 'active_scaffold/orm_checks'
   autoload :RespondsToParent, 'active_scaffold/responds_to_parent'
   autoload :Tableless, 'active_scaffold/tableless'
   autoload :Version, 'active_scaffold/version'
@@ -91,5 +92,7 @@ module ActiveScaffold
   end
 end
 require 'active_scaffold/engine'
+require 'ice_nine'
+require 'ice_nine/core_ext/object'
 # TODO: clean up extensions. some could be organized for autoloading, and others could be removed entirely.
 Dir["#{File.dirname __FILE__}/active_scaffold/extensions/*.rb"].each { |file| require file }

data/lib/active_scaffold/actions/common_search.rb

@@ -3,9 +3,9 @@ module ActiveScaffold::Actions
     def self.included(base)
       unless base < InstanceMethods
         base.send :include, InstanceMethods
-        base.before_filter :search_authorized_filter, :only => :show_search
-        base.before_filter :store_search_params_into_session, :only => [:index]
-        base.before_filter :do_search, :only => [:index]
+        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
     end
@@ -17,8 +17,7 @@ module ActiveScaffold::Actions
 
       protected
 
-      def do_search
-      end
+      def do_search; end
 
       def search_partial
         @_search_partial ||=
@@ -29,12 +28,17 @@ module ActiveScaffold::Actions
           end
       end
 
+      def permitted_search_params
+        params_hash params[:search]
+      end
+
       def store_search_params_into_session
         if active_scaffold_config.store_user_settings
-          active_scaffold_session_storage['search'] = params.delete :search if params[:search]
+          active_scaffold_session_storage['search'] = permitted_search_params if params[:search]
         else
-          @search_params = params.delete :search
+          @search_params = permitted_search_params
         end
+        params.delete :search
       end
 
       def search_params

data/lib/active_scaffold/actions/core.rb

@@ -2,15 +2,17 @@ module ActiveScaffold::Actions
   module Core
     def self.included(base)
       base.class_eval do
-        before_filter :handle_user_settings
-        before_filter :check_input_device
-        before_filter :register_constraints_with_action_columns, :unless => :nested?
-        after_filter :clear_flashes
-        after_filter :clear_storage
+        before_action :set_vary_accept_header
+        before_action :handle_user_settings
+        before_action :check_input_device
+        before_action :register_constraints_with_action_columns, :unless => :nested?
+        after_action :clear_flashes
+        after_action :clear_storage
         rescue_from ActiveScaffold::RecordNotAllowed, ActiveScaffold::ActionNotAllowed, :with => :deny_access
       end
       base.helper_method :successful?
       base.helper_method :nested?
+      base.helper_method :grouped_search?
       base.helper_method :embedded?
       base.helper_method :loading_embedded?
       base.helper_method :calculate_query
@@ -18,6 +20,7 @@ module ActiveScaffold::Actions
       base.helper_method :touch_device?
       base.helper_method :hover_via_click?
     end
+
     def render_field
       if request.get?
         render_field_for_inplace_editing
@@ -33,7 +36,7 @@ module ActiveScaffold::Actions
     protected
 
     def loading_embedded?
-      @loading_embedded ||= params.delete(:embedded)
+      @loading_embedded ||= active_scaffold_embedded_params.delete(:loading)
     end
 
     def embedded?
@@ -44,6 +47,10 @@ module ActiveScaffold::Actions
       false
     end
 
+    def grouped_search?
+      false
+    end
+
     def render_field_for_inplace_editing
       @column = active_scaffold_config.columns[params[:update_column]]
       @record = find_if_allowed(params[:id], :crud_type => :update, :column => params[:update_column])
@@ -65,13 +72,13 @@ module ActiveScaffold::Actions
         else
           updated_record_with_column(@column, params.delete(:value), @scope)
         end
-      set_parent(@record) if params[:parent_controller] && @scope
+      set_parent(@record) if main_form_controller && @scope
       after_render_field(@record, @column)
     end
 
     def updated_record_with_form(columns, attributes, scope)
       if attributes && scope
-        attributes = scope.gsub('[', '').split(']').inject(attributes) { |h, idx| h[idx] }
+        attributes = scope.delete('[').split(']').inject(attributes) { |h, idx| h[idx] }
         id = attributes[:id]
       else
         id = params[:id]
@@ -88,7 +95,7 @@ module ActiveScaffold::Actions
     end
 
     def updated_record_with_column(column, value, scope)
-      record = params[:id] ? find_if_allowed(params[:id], :read).dup : new_model
+      record = params[:id] ? copy_attributes(find_if_allowed(params[:id], :read)) : new_model
       apply_constraints_to_record(record) unless scope || params[:id]
       value = column_value_from_param_value(record, column, value)
       record.send "#{column.name}=", value
@@ -96,39 +103,55 @@ module ActiveScaffold::Actions
       record
     end
 
+    def subform_child_association
+      params[:child_association].presence || (@scope.split(']').first.sub(/^\[/, '').presence if @scope)
+    end
+
+    def parent_controller_name
+      "#{params[:parent_controller].camelize}Controller"
+    end
+
     def set_parent(record)
-      controller = "#{params[:parent_controller].camelize}Controller".constantize
-      parent_model = controller.active_scaffold_config.model
-      child_association = params[:child_association].presence || @scope.split(']').first.sub(/^\[/, '')
-      association = parent_model.reflect_on_association(child_association.to_sym).try(:reverse)
+      cfg = main_form_controller.active_scaffold_config
+      association = cfg.columns[subform_child_association].try(:association).try(:reverse_association)
       return if association.nil?
 
+      parent_model = cfg.model
       parent = parent_model.new
-      copy_attributes(parent_model.find(params[:parent_id]), parent) if params[:parent_id]
+      copy_attributes(find_if_allowed(params[:parent_id], :read, parent_model), parent) if params[:parent_id]
       parent.id = params[:parent_id]
-      parent = update_record_from_params(parent, active_scaffold_config_for(parent_model).send(params[:parent_id] ? :update : :create).columns, params[:record], true) if @column.send_form_on_update_column
+      parent = update_record_from_params(parent, cfg.send(params[:parent_id] ? :update : :create).columns, params[:record], true) if @column.send_form_on_update_column
       apply_constraints_to_record(parent) unless params[:parent_id]
-      if record.class.reflect_on_association(association).collection?
-        record.send(association) << parent
+      if association.collection?
+        record.send(association.name) << parent
       else
-        record.send("#{association}=", parent)
+        record.send("#{association.name}=", parent)
+      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
+          apply_constraints_to_record(parent, constraints: {nested.child_association.name => nested.parent_id})
+        end
       end
+      parent
     end
 
     def copy_attributes(orig, dst = nil)
       dst ||= orig.class.new
-      attributes = orig.attributes
-      if orig.class.respond_to?(:accessible_attributes) && orig.class.accessible_attributes.present?
-        attributes.each { |attr, value| dst.send :write_attribute, attr, value if orig.class.accessible_attributes.deny? attr }
-        attributes = attributes.slice(*orig.class.accessible_attributes)
-      elsif orig.class.respond_to? :protected_attributes
-        orig.class.protected_attributes.each { |attr| dst.send :write_attribute, attr, orig[attr] if attr.present? }
-        attributes = attributes.except(*orig.class.protected_attributes)
-      end
-      dst.attributes = attributes
+      orig.attributes.each { |attr, value| dst.send :write_attribute, attr, value }
       dst
     end
 
+    def parent_sti_controller
+      return unless params[:parent_sti]
+      unless defined? @parent_sti_controller
+        controller = look_for_parent_sti_controller
+        @parent_sti_controller = controller.controller_path == params[:parent_sti] ? controller : false
+      end
+      @parent_sti_controller
+    end
+
     # override this method if you want to do something after render_field
     def after_render_field(record, column); end
 
@@ -149,7 +172,7 @@ module ActiveScaffold::Actions
     end
 
     def default_formats
-      [:html, :js, :json, :xml]
+      %i[html js json xml]
     end
 
     # Returns true if the client accepts one of the MIME types passed to it
@@ -192,12 +215,15 @@ module ActiveScaffold::Actions
     end
 
     def successful=(val)
-      @successful = (val) ? true : false
+      @successful = val ? true : false
     end
 
     # Redirect to the main page (override if the ActiveScaffold is used as a component on another controllers page) for Javascript degradation
     def return_to_main
-      redirect_to main_path_to_return
+      options = main_path_to_return
+      # use url_for in case main_path_to_return returns Hash with status param,
+      # which would be interpreted as status option to redirect_to instead of url param
+      redirect_to options.is_a?(Hash) ? url_for(options) : options
     end
 
     # Overide this method on your controller to provide model with named scopes
@@ -210,37 +236,43 @@ module ActiveScaffold::Actions
       @conditions_from_params ||= begin
         conditions = {}
         params.except(:controller, :action, :page, :sort, :sort_direction, :format, :id).each do |key, value|
-          column = active_scaffold_config.model.columns_hash[key.to_s]
+          column = active_scaffold_config._columns_hash[key.to_s]
           next unless column
           key = key.to_sym
-          not_string = [:string, :text].exclude?(column.type)
+          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
+          value = value.split('..') if range
           conditions[key] =
             if value.is_a?(Array)
               value.map { |v| v == '' && not_string ? nil : ActiveScaffold::Core.column_type_cast(v, column) }
             else
               value == '' && not_string ? nil : ActiveScaffold::Core.column_type_cast(value, column)
             end
+          conditions[key] = Range.new(*conditions[key]) if range
         end
         conditions
       end
     end
 
     def new_model
-      model = beginning_of_chain
-      if nested? && nested.association && nested.association.collection? && model.columns_hash[column = model.inheritance_column]
+      relation = beginning_of_chain
+      config = active_scaffold_config_for(relation.klass) if nested? && nested.plural_association?
+      if config && config._columns_hash[column = relation.klass.inheritance_column]
         model_name = params.delete(column) # in new action inheritance_column must be in params
-        model_name ||= params[:record].delete(column) unless params[:record].blank? # in create action must be inside record key
+        model_name ||= params[:record].delete(column) if params[:record].present? # 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
-      model.respond_to?(:build) ? model.build(build_options || {}) : model.new
+      relation.respond_to?(:build) ? relation.build(build_options || {}) : relation.new
     end
 
     def get_row(crud_type_or_security_options = :read)
-      klass = beginning_of_chain.preload(active_scaffold_preload)
+      klass = beginning_of_chain
+      klass = klass.preload(active_scaffold_preload) unless active_scaffold_config.mongoid?
       @record = find_if_allowed(params[:id], crud_type_or_security_options, klass)
     end
 
@@ -255,9 +287,17 @@ module ActiveScaffold::Actions
       session[session_index]
     end
 
+    def active_scaffold_embedded_params
+      params[:embedded] || {}
+    end
+
     def clear_storage
       session_index = active_scaffold_session_storage_key
-      session.delete(session_index) unless session[session_index].present?
+      session.delete(session_index) if session[session_index].blank?
+    end
+
+    def set_vary_accept_header
+      response.headers['Vary'] = 'Accept'
     end
 
     # at some point we need to pass the session and params into config. we'll just take care of that before any particular action occurs by passing those hashes off to the UserSettings class of each action.
@@ -271,13 +311,15 @@ module ActiveScaffold::Actions
     end
 
     def check_input_device
-      if request.env['HTTP_USER_AGENT'] && 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 if session[:input_device_type].nil?
+      if session[:input_device_type].nil?
+        if request.env['HTTP_USER_AGENT'] && 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
     end
 
     def touch_device?
@@ -288,6 +330,22 @@ module ActiveScaffold::Actions
       session[:hover_supported] == false
     end
 
+    def params_hash?(value)
+      value.is_a?(Hash) || controller_params?(value)
+    end
+
+    def controller_params?(value)
+      value.is_a?(::ActionController::Parameters)
+    end
+
+    def params_hash(value)
+      if controller_params?(value)
+        Rails.version < '4.2' ? value.clone.permit! : value.to_unsafe_h.with_indifferent_access
+      else
+        value
+      end
+    end
+
     # call this method in your action_link action to simplify processing of actions
     # eg for member action_link :fire
     # process_action_link_action do |record|
@@ -362,11 +420,11 @@ module ActiveScaffold::Actions
     end
 
     def virtual_columns(columns)
-      columns.reject { |col| active_scaffold_config.model.columns_hash[col.to_s] || active_scaffold_config.model.reflect_on_association(col) }
+      columns.reject { |col| active_scaffold_config.model.columns_hash[col.to_s] || active_scaffold_config.columns[col].try(:association) }
     end
 
     def association_columns(columns)
-      columns.select { |col| active_scaffold_config.model.reflect_on_association(col) }
+      columns.select { |col| active_scaffold_config.columns[col].try(:association) }
     end
 
     private
@@ -392,5 +450,19 @@ module ActiveScaffold::Actions
           (default_formats + active_scaffold_config.formats).uniq
         end
     end
+
+    def look_for_parent_sti_controller
+      klass = self.class.active_scaffold_config.model
+      loop do
+        klass = klass.superclass
+        controller = self.class.active_scaffold_controller_for(klass)
+        cfg = controller.active_scaffold_config if controller.uses_active_scaffold?
+        next unless cfg && cfg.add_sti_create_links?
+        return controller if cfg.sti_children.map(&:to_s).include? self.class.active_scaffold_config.model.name.underscore
+      end
+    rescue ActiveScaffold::ControllerNotFound => ex
+      logger.warn "#{ex.message} looking for parent_sti of #{self.class.active_scaffold_config.model.name}"
+      nil
+    end
   end
 end