active_scaffold 3.6.20 → 3.7.1

data/config/locales/es.yml

@@ -47,6 +47,9 @@ es:
     deleted_model: "%{model} borrado"
     deleted_records: Ver Eliminados
     delimiter: Delimitador
+    doesnt_begin_with: No empieza con
+    doesnt_contain: No contiene
+    doesnt_end_with: No termina con
     download: Descargar
     edit: Editar
     ends_with: Termina con

data/config/locales/fr.yml

@@ -47,6 +47,9 @@ fr:
     deleted_model: Suppression de %{model}
     deleted_records: Lister les enregistrements supprimés
     delimiter: Délimiteur
+    doesnt_begin_with:
+    doesnt_contain:
+    doesnt_end_with:
     download: Télécharger
     edit: Éditer
     ends_with: Se terminant par
@@ -63,7 +66,7 @@ fr:
     found: Trouvé
     future: Futur
     group_by: Grouper par
-    grouped_by: 
+    grouped_by:
     hide: "(Cacher)"
     hours: Heures
     human_conditions:
@@ -138,11 +141,11 @@ fr:
     yesterday: Hier
   date:
     formats:
-      month: 
-      quarter: 
-      week: 
-      year_month: 
-      year_quarter: 
+      month: "%B"
+      quarter:
+      week:
+      year_month: "%b %Y"
+      year_quarter:
   time:
     formats:
       picker: "%a, %d %b %Y %H:%M:%S"

data/config/locales/hu.yml

@@ -18,7 +18,7 @@ hu:
     between: Között
     cancel: Mégse
     cant_destroy_record: 'nem törölhető: %{record}'
-    changes: 
+    changes:
     click_to_edit: Kattints a szerkesztéshez
     click_to_reset: Kattints az alapállapothoz
     close: Bezárás
@@ -27,7 +27,7 @@ hu:
     contains: Contains
     create: Létrehozás
     create_another: Create Another %{model}
-    create_apply: 
+    create_apply:
     create_model: "%{model} létrehozása"
     create_new: Új létrehozása
     created_model: "%{model} létrehozva"
@@ -38,15 +38,18 @@ hu:
       showMonthAfterYear: false
       weekHeader: Wk
     datetime_picker_options:
-      closeText: 
-      currentText: 
+      closeText:
+      currentText:
       timeText:
-      timezoneText: Timezone
+      timezoneText:
     days: Days
     delete: Törlés
     deleted_model: "%{model} törölve"
-    deleted_records: 
+    deleted_records:
     delimiter: Elválasztó
+    doesnt_begin_with:
+    doesnt_contain:
+    doesnt_end_with:
     download: Letöltés
     edit: Szerkesztés
     ends_with: Ends with
@@ -62,8 +65,8 @@ hu:
     filtered: "(Szűrt)"
     found: Találat
     future: Future
-    group_by: 
-    grouped_by: 
+    group_by:
+    grouped_by:
     hide: "(Elrejtés)"
     hours: Hours
     human_conditions:
@@ -85,9 +88,9 @@ hu:
     next_week: Next Week
     next_year: Next Year
     no_authorization_for_action: No Authorization for action %{action}
-    no_color: 
+    no_color:
     no_entries: Nincs elem
-    no_group: 
+    no_group:
     no_options: nincsenek opciók
     not_null: Not Null
     'null': 'Null'
@@ -109,7 +112,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
+    remove_files:
     replace_existing: Replace existing
     replace_with_new: Csere újjal
     reset: Alapállapot
@@ -129,7 +132,7 @@ hu:
     tomorrow: Tomorrow
     'true': 'True'
     update: Modosítás
-    update_apply: 
+    update_apply:
     update_model: "%{model} modosítása"
     updated_model: "%{model} módosítva"
     version_inconsistency: Verzió ütközés - ezt a rekordot módosították mióta elkezdted szerkeszteni.
@@ -138,11 +141,11 @@ hu:
     yesterday: Yesterday
   date:
     formats:
-      month: 
-      quarter: 
-      week: 
-      year_month: 
-      year_quarter: 
+      month:
+      quarter:
+      week:
+      year_month:
+      year_quarter:
   time:
     formats:
       picker: "%a, %d %b %Y %H:%M:%S"

data/config/locales/ja.yml

@@ -11,23 +11,23 @@ ja:
     add: 追加
     add_existing: 既存のものを追加
     add_existing_model: 既存の%{model}を追加
-    apply: Apply
-    are_you_sure_to_delete: Are you sure you want to delete %{label}?
-    average: Average
-    begins_with: Begins with
-    between: Between
+    apply: 適用
+    are_you_sure_to_delete: "%{label}を消去してもよろしいですか？"
+    average: 平均
+    begins_with: 開始時間
+    between: 範囲指定
     cancel: キャンセル
-    cant_destroy_record: "%{record}を削除で来ません"
-    changes: 
+    cant_destroy_record: "%{record}を削除できません"
+    changes: 差分
     click_to_edit: クリックして編集
-    click_to_reset: Click to reset
+    click_to_reset: クリックしてリセット
     close: 閉じる
-    config_list: Configure
-    config_list_model: Configure Columns for %{model}
-    contains: Contains
+    config_list:
+    config_list_model:
+    contains: 部分一致検索
     create: 作成
-    create_another: Create Another %{model}
-    create_apply: 
+    create_another:
+    create_apply:
     create_model: "%{model}を作成"
     create_new: 新規作成
     created_model: "%{model}を作成しました"
@@ -36,36 +36,39 @@ ja:
       firstDay: 0
       isRTL: false
       showMonthAfterYear: false
-      weekHeader: Wk
+      weekHeader: 週
     datetime_picker_options:
-      closeText: 
-      currentText: 
-      timeText:
-      timezoneText: Timezone
-    days: Days
+      closeText: 閉じる
+      currentText: 現在時刻
+      timeText: 時間
+      timezoneText: 時間帯
+    days: 日分
     delete: 削除
     deleted_model: "%{model}を削除しました"
-    deleted_records: 
-    delimiter: Delimiter
+    deleted_records:
+    delimiter: 区切り文字
+    doesnt_begin_with:
+    doesnt_contain:
+    doesnt_end_with:
     download: ダウンロード
     edit: 編集
-    ends_with: Ends with
-    error_500: "（コード500: 内部エラー）"
+    ends_with: 終了時間
+    error_500: "（コード500：内部エラー）"
     errors:
       template:
-        body: 'There were problems with the following fields:'
+        body: 次のフィールドに問題がありました：
         header:
-          one: 1 error prohibited this %{model} from being saved.
-          other: "%{count} errors prohibited this %{model} from being saved"
-    export: Export
-    'false': 'False'
+          one: 1件のエラーにより、この%{model}が保存できませんでした
+          other: "%{count}件のエラーにより、この%{model}が保存できませんでした"
+    export: エクスポート
+    'false':
     filtered: "（フィルタ中）"
     found: 個ありました
-    future: Future
-    group_by: 
-    grouped_by: 
-    hide: "(隠す)"
-    hours: Hours
+    future: 未来
+    group_by:
+    grouped_by:
+    hide: "（隠す）"
+    hours: 時間分
     human_conditions:
       association: "%{column} = %{value}"
       boolean: "%{column} = %{value}"
@@ -73,76 +76,76 @@ ja:
     internal_error: リクエストが失敗しました
     live_search: その場で検索
     loading: 読み込み中…
-    mark_all_records: Mark all
-    maximum: Maximum
-    minimum: Minimum
-    minutes: Minutes
-    months: Months
+    mark_all_records: すべて選択
+    maximum: 最大値
+    minimum: 最小値
+    minutes: 分間
+    months: か月分
     nested_for_model: "%{parent_model}の%{nested_model}"
-    nested_of_model: "%{nested_model} of %{parent_model}"
+    nested_of_model:
     next: 次
-    next_month: Next Month
-    next_week: Next Week
-    next_year: Next Year
-    no_authorization_for_action: No Authorization for action %{action}
-    no_color: 
+    next_month: 来月
+    next_week: 来週
+    next_year: 来年
+    no_authorization_for_action:
+    no_color:
     no_entries: 見つかりませんでした
-    no_group: 
+    no_group:
     no_options: オプション無し
-    not_null: Not Null
-    'null': 'Null'
-    omit_header: Omit Header
-    optional_attributes: Further Options
+    not_null:
+    'null':
+    omit_header:
+    optional_attributes:
     options: オプション
-    past: Past
-    pdf: PDF
-    prev_month: Last Month
-    prev_week: Last Week
-    prev_year: Last Year
+    past: 過去
+    pdf:
+    prev_month: 先月
+    prev_week: 先週
+    prev_year: 去年
     previous: 前
     print: 印刷
-    range: Range
-    record_not_saved: Failed to save record cause of an unknown error
+    range: 範囲検索
+    record_not_saved: 不明なエラーによって保存できませんでした
     records_marked:
-      one: 1 marked %{model}
-      other: "%{count} marked %{model}"
-    refresh: Refresh
+      one: "%{model}を1件選択"
+      other: "%{model}を%{count}件選択"
+    refresh: 更新
     remove: 削除
     remove_file: ファイルを削除または置換
     remove_files: ファイルを削除または追加する
-    replace_existing: Replace existing
+    replace_existing:
     replace_with_new: 新しいもので置換
     reset: リセット
-    revisions_for_model: Revisions for %{model}
+    revisions_for_model:
     saving: 保存中…
     search: 検索
     search_terms: 検索単語
-    seconds: Seconds
+    seconds: 秒分
     show: 表示
-    show_block: "(表示)"
+    show_block: "（表示）"
     show_model: "%{model}を表示"
-    sum: Sum
-    this_month: This Month
-    this_week: This Week
-    this_year: This Year
-    today: Today
-    tomorrow: Tomorrow
-    'true': 'True'
+    sum: 合計値
+    this_month: 今月
+    this_week: 今週
+    this_year: 今年
+    today: 今日
+    tomorrow: 明日
+    'true':
     update: 更新
-    update_apply: 
+    update_apply:
     update_model: "%{model}を更新"
     updated_model: "%{model}を更新しました"
     version_inconsistency: バージョンが一致しません - あなたが編集している間にこのレコードが変更されました。
-    weeks: Weeks
-    years: Years
-    yesterday: Yesterday
+    weeks: 週間分
+    years: 年分
+    yesterday: 昨日
   date:
     formats:
-      month: 
-      quarter: 
-      week: 
-      year_month: 
-      year_quarter: 
+      month: "%m月"
+      quarter: 第%{quarter}四半期
+      week: 週
+      year_month: "%Y年%m月"
+      year_quarter: "%{year}年第%{quarter}四半期"
   time:
     formats:
-      picker: "%a, %d %b %Y %H:%M:%S"
+      picker: "%Y年%m月%d日（%a） %H:%M:%S"

data/config/locales/ru.yml

@@ -18,7 +18,7 @@ ru:
     between: В интервале
     cancel: Отмена
     cant_destroy_record: Запись %{record} не может быть удалена
-    changes: 
+    changes:
     click_to_edit: Нажмите для редактирования
     click_to_reset: Нажмите для сброса
     close: Закрыть
@@ -27,7 +27,7 @@ ru:
     contains: Содержит
     create: Создать
     create_another: "%{model}: Создать другую запись"
-    create_apply: 
+    create_apply:
     create_model: "%{model}: создать запись"
     create_new: Создать новую запись
     created_model: "%{model}: запись создана"
@@ -41,12 +41,15 @@ ru:
       closeText: Закрыть
       currentText: Текущее время
       timeText:
-      timezoneText: Timezone
+      timezoneText:
     days: дней
     delete: Удалить
     deleted_model: "%{model}: запись удалена"
-    deleted_records: 
+    deleted_records:
     delimiter: Разделитель
+    doesnt_begin_with:
+    doesnt_contain:
+    doesnt_end_with:
     download: Загрузить
     edit: Изменить
     ends_with: Оканчивается на
@@ -68,8 +71,8 @@ ru:
       one: запись
       other: записи
     future: Будущие
-    group_by: 
-    grouped_by: 
+    group_by:
+    grouped_by:
     hide: "(Скрыть)"
     hours: часов
     human_conditions:
@@ -91,9 +94,9 @@ ru:
     next_week: На следующей неделе
     next_year: В следующем году
     no_authorization_for_action: Нет прав на выполнение действия "%{action}"
-    no_color: 
+    no_color:
     no_entries: Нет записей
-    no_group: 
+    no_group:
     no_options: Нет вариантов
     not_null: Не пусто
     'null': Пусто
@@ -137,7 +140,7 @@ ru:
     tomorrow: Завтра
     'true': Да
     update: Обновить запись
-    update_apply: 
+    update_apply:
     update_model: "%{model}: обновить запись"
     updated_model: "%{model}: запись обновлена"
     version_inconsistency: Эта запись была обновлена с того момента, как вы начали ее редактировать
@@ -146,11 +149,11 @@ ru:
     yesterday: Вчера
   date:
     formats:
-      month: 
-      quarter: 
-      week: 
-      year_month: 
-      year_quarter: 
+      month:
+      quarter:
+      week:
+      year_month:
+      year_quarter:
   time:
     formats:
       picker: "%a, %d %b %Y %H:%M:%S"

data/lib/active_scaffold/actions/common_search.rb

@@ -31,11 +31,11 @@ module ActiveScaffold::Actions
         params_hash params[:search]
       end
 
-      def set_outer_joins_for_search(columns)
+      def set_outer_joins_for_search(columns) # rubocop:disable Naming/AccessorMethodName
         references = []
         outer_joins = []
         columns.each do |column|
-          next unless column.search_joins.present?
+          next if column.search_joins.blank?
           if column.includes.present? && list_columns.include?(column)
             references << (column.search_joins & column.includes)
             outer_joins << (column.search_joins - column.includes)

data/lib/active_scaffold/actions/core.rb

@@ -6,6 +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 :dl_cookie
         around_action :clear_storage
         rescue_from ActiveScaffold::RecordNotAllowed, ActiveScaffold::ActionNotAllowed, :with => :deny_access
       end
@@ -22,7 +23,7 @@ module ActiveScaffold::Actions
     end
 
     def render_field
-      if request.get?
+      if request.get? || request.head?
         render_field_for_inplace_editing
         respond_to do |format|
           format.js { render :action => 'render_field_inplace', :layout => false }
@@ -61,14 +62,18 @@ module ActiveScaffold::Actions
       @source_id = params.delete(:source_id)
       @columns = @column.update_columns || []
       @scope = params.delete(:scope)
-      action = :subform if @scope
-      action ||= params[:id] ? :update : :create
-      @main_columns = active_scaffold_config.send(action).columns
+      if @scope
+        @form_action = :subform
+      elsif active_scaffold_config.actions.include? params[:form_action]&.to_sym
+        @form_action = params.delete(:form_action).to_sym
+      end
+      @form_action ||= params[:id] ? :update : :create
+      @main_columns = active_scaffold_config.send(@form_action).columns
       @columns << @column.name if @column.options[:refresh_link] && @columns.exclude?(@column.name)
 
       @record =
         if @column.send_form_on_update_column
-          updated_record_with_form(@main_columns, params[:record], @scope)
+          updated_record_with_form(@main_columns, params[:record] || params[:search], @scope)
         else
           updated_record_with_column(@column, params.delete(:value), @scope)
         end
@@ -100,7 +105,14 @@ module ActiveScaffold::Actions
       record = params[:id] ? copy_attributes(find_if_allowed(params[:id], :read)) : new_model
       apply_constraints_to_record(record) unless scope || params[:id]
       create_association_with_parent record, true if nested?
-      update_column_from_params(record, column, value, true)
+      if @form_action == :field_search && value.is_a?(Array) && column.association&.singular?
+        # don't assign value if it's an array and column is singular association,
+        # e.g. value came from multi-select on search form
+        # use instance variable so it's available in the view and helpers
+        @value = value
+      else
+        update_column_from_params(record, column, value, true)
+      end
       record.id = params[:id]
       record
     end
@@ -165,6 +177,10 @@ module ActiveScaffold::Actions
       flash.clear if request.xhr?
     end
 
+    def dl_cookie
+      cookies[params[:_dl_cookie]] = {value: Time.now.to_i, expires: 1.day.since} if params[:_dl_cookie]
+    end
+
     def each_marked_record(&block)
       active_scaffold_config.model.as_marked.each(&block)
     end
@@ -248,7 +264,7 @@ module ActiveScaffold::Actions
       @conditions_from_params ||= begin
         conditions = [{}]
         params.except(:controller, :action, :page, :sort, :sort_direction, :format, :id).each do |key, value|
-          distinct = true if key =~ /!$/
+          distinct = true if key.match?(/!$/)
           column = active_scaffold_config._columns_hash[key.to_s[0..(distinct ? -2 : -1)]]
           next unless column
           key = column.name.to_sym
@@ -321,7 +337,8 @@ module ActiveScaffold::Actions
 
     def check_input_device
       return unless session[:input_device_type].nil?
-      if request.env['HTTP_USER_AGENT'] =~ /(iPhone|iPod|iPad)/i
+      return if request.env['HTTP_USER_AGENT'].nil?
+      if request.env['HTTP_USER_AGENT'].match?(/(iPhone|iPod|iPad)/i)
         session[:input_device_type] = 'TOUCH'
         session[:hover_supported] = false
       else
@@ -362,14 +379,14 @@ module ActiveScaffold::Actions
     #   flash[:info] = 'Player fired'
     # end
     def process_action_link_action(render_action = :action_update, crud_type_or_security_options = nil)
-      if request.get?
+      if request.get? || request.head?
         # someone has disabled javascript, we have to show confirmation form first
         @record = find_if_allowed(params[:id], :read) if params[:id]
         respond_to_action(:action_confirmation)
       else
         @action_link = active_scaffold_config.action_links[action_name]
         if params[:id]
-          crud_type_or_security_options ||= {:crud_type => request.post? || request.put? ? :update : :delete, :action => action_name}
+          crud_type_or_security_options ||= {:crud_type => request.delete? ? :delete : :update, :action => action_name}
           get_row(crud_type_or_security_options)
           if @record.nil?
             self.successful = false
@@ -378,6 +395,9 @@ module ActiveScaffold::Actions
             yield @record
           end
         else
+          if @action_link && respond_to?(@action_link.security_method, true) && !send(@action_link.security_method)
+            raise ActiveScaffold::ActionNotAllowed
+          end
           yield
         end
         respond_to_action(render_action)

data/lib/active_scaffold/actions/field_search.rb

@@ -154,7 +154,6 @@ module ActiveScaffold::Actions
         filtered_columns = []
         text_search = active_scaffold_config.field_search.text_search
         columns = active_scaffold_config.field_search.columns
-        count_includes = active_scaffold_config.list.user.count_includes
         search_params.each do |key, value|
           next unless columns.include? key
           column = active_scaffold_config.columns[key]
@@ -164,11 +163,7 @@ module ActiveScaffold::Actions
           active_scaffold_conditions << search_condition
           filtered_columns << column
         end
-        if grouped_search? || active_scaffold_config.list.user.count_includes.present?
-          active_scaffold_outer_joins.concat filtered_columns.map(&:search_joins).flatten.uniq.compact
-        else
-          set_outer_joins_for_search filtered_columns
-        end
+        setup_joins_for_filtered_columns(filtered_columns)
         if filtered_columns.present? || grouped_search?
           @filtered = active_scaffold_config.field_search.human_conditions ? filtered_columns : true
         end
@@ -182,6 +177,14 @@ module ActiveScaffold::Actions
 
       private
 
+      def setup_joins_for_filtered_columns(filtered_columns)
+        if grouped_search? || active_scaffold_config.list.user.count_includes.present?
+          active_scaffold_outer_joins.concat filtered_columns.map(&:search_joins).flatten.uniq.compact
+        else
+          set_outer_joins_for_search filtered_columns
+        end
+      end
+
       def field_search_formats
         (default_formats + active_scaffold_config.formats + active_scaffold_config.field_search.formats).uniq
       end

data/lib/active_scaffold/actions/nested.rb

@@ -8,7 +8,7 @@ module ActiveScaffold::Actions
       base.module_eval do
         before_action :set_nested
         before_action :configure_nested
-        include ActiveScaffold::Actions::Nested::ChildMethods if active_scaffold_config.model.reflect_on_all_associations.any? { |a| a.macro == :has_and_belongs_to_many }
+        include ActiveScaffold::Actions::Nested::ChildMethods if active_scaffold_config.columns.map(&:association).compact.any?(&:habtm?)
       end
       base.before_action :include_habtm_actions
       base.helper_method :nested
@@ -120,9 +120,9 @@ module ActiveScaffold::Actions
 
     def create_association_with_parent?(check_match = false)
       # has_many is done by beginning_of_chain and rails if direct association, not in through associations
-      return false if nested.has_many? && !nested.association.through?
+      return false unless nested.create_with_parent?
       return false if check_match && !nested.match_model?(active_scaffold_config.model)
-      (nested.child_association || nested.create_through_singular?) && nested_parent_record
+      nested_parent_record.present?
     end
 
     def create_association_with_parent(record, check_match = false)
@@ -131,7 +131,7 @@ module ActiveScaffold::Actions
         record.send("#{nested.child_association.name}=", nested_parent_record)
       elsif nested.create_through_singular?
         through = nested_parent_record.send(nested.association.through_reflection.name) ||
-          nested_parent_record.send("build_#{nested.association.through_reflection.name}")
+                  nested_parent_record.send("build_#{nested.association.through_reflection.name}")
         if nested.source_reflection.reverse_association.collection?
           record.send(nested.source_reflection.reverse) << through
         else
@@ -167,7 +167,7 @@ module ActiveScaffold::Actions::Nested
     end
 
     def destroy_existing
-      return redirect_to(params.merge(:action => :delete, :only_path => true)) if request.get?
+      return redirect_to(params.merge(:action => :delete, :only_path => true)) if request.get? || request.head?
       do_destroy_existing
       respond_to_action(:destroy_existing)
     end
@@ -247,8 +247,8 @@ module ActiveScaffold::Actions::Nested
       parent_record = nested_parent_record(:update)
       @record = active_scaffold_config.model.find(params[:associated_id])
       if parent_record && @record
-        parent_record.send(nested.association.name) << @record
-        parent_record.save
+        self.successful = false unless parent_record.send(nested.association.name) << @record
+        parent_record.save if successful?
       else
         false
       end

data/lib/active_scaffold/actions/update.rb

@@ -185,11 +185,11 @@ module ActiveScaffold::Actions
 
     def value_for_update_column(param_value, column, record)
       unless param_value
-        param_value = ActiveScaffold::Core.column_type_cast @column.default_for_empty_value, @column.column
+        param_value = ActiveScaffold::Core.column_type_cast column.default_for_empty_value, column.column
         param_value = false if param_value == true
       end
-      value = column_value_from_param_value(record, @column, param_value)
-      value = [] if value.nil? && @column.form_ui && @column.association&.collection?
+      value = column_value_from_param_value(record, column, param_value)
+      value = [] if value.nil? && column.form_ui && column.association&.collection?
       value
     end