active_scaffold 3.6.20 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a6a07cc017cbfdb8a278a7297ac61d6e6d4f3802240a157a366b2829cf3661e
-  data.tar.gz: 00d4f1bcbacca4e2a04f87db162be697ebd82f73aae9b23dbd1ffd3e43614610
+  metadata.gz: 26ce6ce8562249c43e685b6b8bbdf14f7ecb13d245b83431145e7cae5c56ac37
+  data.tar.gz: 51e9f055da4ebda5bb2c91ece952095dcb179d263218e510abc94029bc2cc47b
 SHA512:
-  metadata.gz: 78f5e7472c1cbb36fd40c6f0a3b06f797e87e2969127d5506eee6f7b25d1f2b794c35684f477b1204e08d9c2c696b78c3c849b481d3b43c169ecf16b7f99c0f6
-  data.tar.gz: 98f6fed6e5ac8512b74e27155285c0b81f0cd422e0cfbab3f0a01ba5e4a9e92a32cb8f4a199ef8118e71aceb188f9137e5d8bed48bc9ee0903ad420b92e771b5
+  metadata.gz: 4f93b85f2714ce8f6d845c704a455de9c3d0fa70aa5225d02d106cf190d75942030804cc2a1f13268e658270ca9a6b734fb2c9c2fdb550bf3ef933ae207d8c55
+  data.tar.gz: 7a6b39eaf2b2b0f83a809c5bbb98884d9e39373a69fef9a28faf29eeb29d30632cd0fc887024d95d76902a87521edb0289201bcf2014d289d4289087bd235b85

data/CHANGELOG.rdoc

@@ -1,3 +1,30 @@
+= 3.7.0
+- Drop support for rails < 5.2 and ruby < 2.5
+- Support adding settings for chosen and tinyMCE in initializer (ActiveScaffold.js_config) or JavaScript code (ActiveScaffold.config, needed for callbacks)
+- Support ruby 3.0 and 3.1
+- Check action link security method in process_action_link_action with no id
+- Add thumbnail_variant setting to ActiveStorage bridge
+- Support Postgres citext column type
+- Fix date picker bridge for ruby >= 2.7
+- Fix keeping_errors for rails >= 6.1
+- Fix usage of field_error_proc on record_select bridge for rails 7
+- Support TinyMCE 6
+- Add hide_form_column_if to columns
+- Re-enable form which is sent to iframe when response is received, e.g. if form is downloading a file
+- Use hash order for bitfields value instead of bit order, so options can be re-ordered as `2**1 => opt1, 2**0 => opt0, 2**2 => opt2`
+- Remove delayed_setup, as it didn't work since rails 5.2
+- Support Turbo
+- Fix detecting when form submit to iframe has ended, for downloads too (using cookie)
+- Fix list deleted records on nested listings using JSON column or serializer in PaperTrail versions table
+- Support procs in description of columns, passing record, column, and scope to the proc
+- Fix displaying errors in forms in rails 7.1
+- Support for mongoid 7
+- Support update_columns in field_search, so cascading behaviour is available to field search as in create or update forms
+- Support floating footer in field_search, create and update, so footer may float to keep it visible when form is too long to fit
+- Support hide/show link in form columns with option :collapsible
+- Improve support for three-state boolean (nullable boolean columns), allowing to change the label for NULL
+- Improve support for nullable boolean columns in field search, allowing to search for NULL
+
 = 3.6.20
 - Fix numeric search on field search for rails >= 5.0
 

data/README.md

@@ -1,7 +1,7 @@
 
 Overview
 ========
-[![Build status](https://travis-ci.com/activescaffold/active_scaffold.svg?branch=master)](https://travis-ci.com/activescaffold/active_scaffold)
+[![Build status](https://api.travis-ci.com/activescaffold/active_scaffold.svg?branch=master)](https://app.travis-ci.com/activescaffold/active_scaffold)
 [![Code Climate](https://codeclimate.com/github/activescaffold/active_scaffold/badges/gpa.svg)](https://codeclimate.com/github/activescaffold/active_scaffold)
 [![Test Coverage](https://codeclimate.com/github/activescaffold/active_scaffold/badges/coverage.svg)](https://codeclimate.com/github/activescaffold/active_scaffold)
 [![Dependency Status](https://gemnasium.com/activescaffold/active_scaffold.svg)](https://gemnasium.com/activescaffold/active_scaffold)
@@ -9,10 +9,14 @@ Overview
 [![Inline docs](https://inch-ci.org/github/activescaffold/active_scaffold.svg?branch=master)](https://inch-ci.org/github/activescaffold/active_scaffold)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 
-ActiveScaffold provides a quick and powerful user interfaces for CRUD (create, read, update, delete) operations for Rails applications. It offers additonal features including searching, pagination & layout control.  Rails >= 4.2.0 and Rails <= 6.1 is supported, ruby >= 2.3 required.
+ActiveScaffold provides a quick and powerful user interfaces for CRUD (create, read, update, delete) operations for Rails applications. It offers additonal features including searching, pagination & layout control.  Rails >= 5.2.0 is supported, ruby >= 2.5 required.
 
 Branch Details
 --------------
+3-7-stable supports rails >= 5.2.x and <= 7.1.x, and ruby >= 2.5.0
+
+These versions are not supported anymore:  
+3-6-stable supports rails >= 4.2.x and <= 6.1.x, and ruby >= 2.3.0
 3-5-stable supports rails >= 4.0.x and <= 5.1.x, and ruby >= 2.0.0  
 3-4-stable supports rails >= 3.2.x and <= 4.2.x, and ruby >= 1.9.3  
 3-3-stable supports rails 3.2.x and ruby >= 1.8  
@@ -24,30 +28,37 @@ To get started with a new Rails project
 
 Added to Gemfile
 
-    gem 'active_scaffold'
+```ruby
+gem 'active_scaffold'
+```
 
 For rails >= 5.1, add jquery-rails to Gemfile, and install generator will jquery to application.js before rails-ujs. Also it's possible to load jquery in your layout before application.js using CDN (e.g. jquery-rails-cdn). You can replace rails-ujs with jquery_ujs, although rails-ujs should work (never load both).
 
-    gem 'jquery-rails'
+```ruby
+gem 'jquery-rails'
+```
 
 For rails >= 6.0, installer generator will create app/assets/javascripts/application.js, add it to assets.precompile array and add javascript_include_tag in layout, as ActiveScaffold doesn't work with webpack yet. Jquery may be loaded by packs or assets pipeline.
 
 Run the following commands, for rails 4.2
 
-    bundle install
-    rails g active_scaffold:install
-    bundle exec rake db:create
-    rails g active_scaffold:resource Model [attrs]
-    bundle exec rake db:migrate
-    
+```console
+bundle install
+rails g active_scaffold:install
+bundle exec rake db:create
+rails g active_scaffold:resource Model [attrs]
+bundle exec rake db:migrate
+```
+
 Or run the following commands, for rails >= 5
 
-    bundle install
-    rails g active_scaffold:install
-    rails db:create
-    rails g active_scaffold:resource Model [attrs]
-    rails db:migrate
-    
+```console
+bundle install
+rails g active_scaffold:install
+rails db:create
+rails g active_scaffold:resource Model [attrs]
+rails db:migrate
+```    
 
 Run the app and visit localhost:3000/<plural_model>
 

data/app/assets/javascripts/jquery/active_scaffold.js

@@ -72,9 +72,26 @@ jQuery(document).ready(function($) {
     }
   });
   jQuery(document).on('submit', 'form.as_form:not([data-remote])', function(event) {
-    var as_form = jQuery(this).closest("form");
+    var as_form = jQuery(this).closest("form"), form_id = as_form.attr('id'), iframe, interval, doc, cookie;
     if (as_form.data('loading') == true) {
-      setTimeout("ActiveScaffold.disable_form('" + as_form.attr('id') + "')", 10);
+      setTimeout(function() { ActiveScaffold.disable_form(form_id); }, 10);
+      if (as_form.attr('target')) {
+        cookie = 'as_dl_' + new Date().getTime();
+        as_form.append($('<input>', {type: 'hidden', name: '_dl_cookie', value: cookie}));
+        iframe = jQuery('iframe[name="' + jQuery(this).attr('target') + '"]')[0];
+        interval = setInterval(function() {
+          doc = iframe.contentDocument || (iframe.contentWindow && iframe.contentWindow.document);
+          if (doc && doc.readyState !== 'loading' && (doc.location.href !== 'about:blank' || document.cookie.split(cookie+'=').length == 2)) {
+            ActiveScaffold.enable_form(form_id);
+            clearInterval(interval);
+            doc.location.replace('about:blank');
+            document.cookie = cookie + '=; path=/; expires=' + new Date().toUTCString();
+          } else if (!doc) {
+            clearInterval(interval);
+            document.cookie = cookie + '=; path=/; expires=' + new Date().toUTCString();
+          }
+        }, 1000);
+      }
     }
     return true;
   });
@@ -358,7 +375,7 @@ jQuery(document).ready(function($) {
     jQuery(this).parent().find('[type=submit]').click();
   }));
 
-  jQuery(document).on('turbolinks:before-visit', function() {
+  jQuery(document).on('turbolinks:before-visit turbo:before-visit', function() {
     if (history.state.active_scaffold) {
       history.replaceState({turbolinks: true, url: document.location.href}, '', document.location.href);
     }
@@ -377,7 +394,7 @@ jQuery(document).ready(function($) {
   });
 
   // call setup on document.ready if Turbolinks not enabled
-  if (typeof(Turbolinks) == 'undefined' || !Turbolinks.supported) {
+  if ((typeof(Turbolinks) == 'undefined' || !Turbolinks.supported) && typeof(Turbo) == 'undefined') {
     ActiveScaffold.setup_history_state();
     ActiveScaffold.setup(document);
   }
@@ -385,6 +402,9 @@ jQuery(document).ready(function($) {
   jQuery(document).on('as:element_updated as:element_created', function(e, action_link) {
       ActiveScaffold.setup(e.target);
   });
+  jQuery(document).on('as:element_removed', function(e, action_link) {
+    setTimeout(ActiveScaffold.update_floating_form_footer); // delay so form is already removed
+  });
   jQuery(document).on('as:action_success', 'a.as_action', function(e, action_link) {
     ActiveScaffold.setup(action_link.adapter);
   });
@@ -395,7 +415,7 @@ jQuery(document).ready(function($) {
   });
 });
 
-jQuery(document).on('turbolinks:load', function($) {
+jQuery(document).on('turbolinks:load turbo:load', function($) {
   ActiveScaffold.setup(document);
 });
 
@@ -477,6 +497,7 @@ var ActiveScaffold = {
     ActiveScaffold.draggable_lists('.draggable-lists', container);
     ActiveScaffold.sliders(container);
     ActiveScaffold.disable_optional_subforms(container);
+    ActiveScaffold.update_floating_form_footer(); // check other forms too, state may change
   },
   setup_history_state: function() {
     if (!jQuery('.active-scaffold').length) return;
@@ -1134,15 +1155,26 @@ var ActiveScaffold = {
     window.onbeforeunload = function() {
       if (jQuery('form.need-confirm').length) return unload_message;
     };
-    jQuery(document).on('turbolinks:before-visit', function(e) {
+    jQuery(document).on('turbolinks:before-visit turbolinks:before-visit', function(e) {
       if (jQuery('form.need-confirm').length) {
         if (!window.confirm(unload_message)) e.preventDefault();
       }
     });
+  },
+
+  update_floating_form_footer: function() {
+    jQuery('.active-scaffold form.floating-footer .form-footer').each(function () {
+      var $footer = jQuery(this), $form = $footer.closest('form.floating-footer');
+      $footer.removeClass('floating');
+      if ($form.visible(true) && !$footer.visible(true)) $footer.addClass('floating');
+    });
   }
+
 }
 
 
+jQuery(window).on('scroll resize', ActiveScaffold.update_floating_form_footer);
+
 /*
  * URL modification support. Incomplete functionality.
  */

data/app/assets/javascripts/jquery/active_scaffold_chosen.js

@@ -1,14 +1,15 @@
 jQuery(document).ready(function() {
+  var chosen_options = ActiveScaffold.config.chosen_options || {};
   jQuery(document).on('as:element_updated as:element_created', function(event) {
-    jQuery('select.chosen', event.target).chosen();
+    jQuery('select.chosen', event.target).chosen(chosen_options);
   });
   jQuery(document).on('as:action_success', 'a.as_action', function(event, action_link) {
     if (action_link.adapter) {
-      jQuery('select.chosen', action_link.adapter).chosen();
+      jQuery('select.chosen', action_link.adapter).chosen(chosen_options);
     }
   });
-  jQuery('select.chosen').chosen();
-  jQuery(document).on('turbolinks:load', function($) {
-      jQuery('select.chosen').chosen();
+  jQuery('select.chosen').chosen(chosen_options);
+  jQuery(document).on('turbolinks:load turbo:load', function($) {
+    jQuery('select.chosen').chosen(chosen_options);
   });
 });

data/app/assets/javascripts/jquery/tiny_mce_bridge.js

@@ -8,9 +8,23 @@
   };
 
   function loadTinyMCE() {
-    var settings = jQuery(this).data('tinymce');
-    if (settings) tinyMCE.settings = settings;
-    tinyMCE.execCommand('mceAddEditor', false, jQuery(this).attr('id'));
+    var global_settings = ActiveScaffold.config.tiny_mce_settings || {};
+    var local_settings = jQuery(this).data('tinymce');
+    var settings = {};
+    for (key in global_settings) {
+      settings[key] = global_settings[key];
+    }
+    for (key in local_settings) {
+      settings[key] = local_settings[key];
+    }
+    var id = jQuery(this).attr('id');
+    if (tinymce && tinymce.majorVersion >= 6) {
+      settings.selector = '#' + id;
+      tinymce.init(settings);
+    } else { // tinyMCE.majorVersion < 6
+      tinyMCE.settings = settings;
+      tinyMCE.execCommand('mceAddEditor', false, id);
+    }
   }
 
   jQuery(document).on('submit', 'form.as_form', function() {
@@ -28,4 +42,4 @@
       jQuery(action_link.adapter).find('textarea.mceEditor').each(loadTinyMCE);
     }
   });
-})();
+})();

data/app/assets/stylesheets/active_scaffold_layout.css

@@ -672,6 +672,17 @@ clear: both;
 .active-scaffold p.form-footer {
 clear: both;
 }
+.active-scaffold .form-footer.floating {
+position: fixed;
+bottom: 10px;
+z-index: 10;
+top: auto;
+left: auto;
+border: none;
+padding: 10px;
+background: white;
+}
+
 
 .active-scaffold a.as_cancel,
 .active-scaffold p.form-footer a {
@@ -694,7 +705,7 @@ letter-spacing: 0;
 clear: both;
 }
 
-.active-scaffold label {
+.active-scaffold label, .active-scaffold label + a.visibility-toggle {
 font-weight: normal;
 font-size: 11px;
 }

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

@@ -7,11 +7,15 @@
      multipart ||= action_config.multipart? unless local_assigns.has_key? :multipart
      columns ||= action_config.columns unless local_assigns.has_key? :columns
      persistent ||= action_config.persistent unless local_assigns.has_key? :persistent
+     unless local_assigns.has_key? :floating_footer
+       floating_footer ||= action_config.floating_footer if action_config.respond_to? :floating_footer
+     end
    else
      multipart ||= false
      columns ||= nil
      persistent ||= false
    end
+   floating_footer ||= false
    method ||= :post
    cancel_link = true if cancel_link.nil?
    submit_text ||= form_action
@@ -26,7 +30,7 @@ options = {:id => form_id,
            :method => method,
            'data-loading' => defined?(loading) ? loading : true}
 cancel_options = {:class => 'as_cancel'}
-
+options[:class] << ' floating-footer' if floating_footer
 cancel_options[:remote] = true if xhr #cancel link does nt have to care about multipart forms
 if xhr && multipart # file_uploads
   form_remote_upload_tag url_options.merge({:iframe => true}), options

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

@@ -9,6 +9,7 @@
     data: {loading: true},
     method: :get
   }
+  options[:class] << ' floating-footer' if active_scaffold_config.field_search.floating_footer
   
   hidden_params = url_options.except(:controller, :action, :id, :search).to_query.split(Rack::Utils::DEFAULT_SEP)
 -%>

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

@@ -8,23 +8,31 @@
   @rendered ||= Set.new
   return if @rendered.include? column.name
   @rendered << column.name
-  renders_as = column_renders_as(column)
-  if renders_as == :subform
-    options = {:is_subform => true, :field_class => "#{column.name}-sub-form"}
+  if @form_action == :field_search
+    form_ui = column.search_ui
   else
-    options = {:is_subform => false, :field_class => "#{column.name}-input", :hidden => column.form_ui == :hidden}
+    renders_as = column_renders_as(column)
+    form_ui = column.form_ui
   end
-  html = if scope
-    readonly = @record.readonly? || !@record.authorized_for?(:crud_type => :update)
-    crud_type = @record.new_record? ? :create : (readonly ? :read : :update)
-    # subform.columns.to_a.include? so it doesn't check inside subgroups
-    active_scaffold_render_subform_column(column, scope, crud_type, readonly, !active_scaffold_config.subform.columns.to_a.include?(column.name), @record)
+  if renders_as == :subform
+    options = {is_subform: true, field_class: "#{column.name}-sub-form"}
   else
-    render_column(column, @record, renders_as, scope)
+    options = {is_subform: false, field_class: "#{column.name}-input", hidden: form_ui == :hidden}
   end
+  html =
+    if scope
+      readonly = @record.readonly? || !@record.authorized_for?(:crud_type => :update)
+      crud_type = @record.new_record? ? :create : (readonly ? :read : :update)
+      # subform.columns.to_a.include? so it doesn't check inside subgroups
+      active_scaffold_render_subform_column(column, scope, crud_type, readonly, !active_scaffold_config.subform.columns.to_a.include?(column.name), @record)
+    elsif @form_action == :field_search
+      search_attribute(column, @record)
+    else
+      render_column(column, @record, renders_as, scope)
+    end
 -%>
 
 ActiveScaffold.render_form_field('<%= source_id %>','<%= escape_javascript(html) %>', <%= options.to_json.html_safe %>);
 <%if column.update_columns && !column.update_columns.empty?%>
-  <%=  render(:partial => "render_field", :collection => column.update_columns, :locals => {:source_id => source_id, :scope => scope})%>
+  <%=  render(partial: "render_field", collection: column.update_columns, locals: {source_id: source_id, scope: scope})%>
 <%end%>

data/config/locales/ja.yml

@@ -11,20 +11,20 @@ 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
+    contains: 部分一致検索
     create: 作成
     create_another: Create Another %{model}
     create_apply: 
@@ -36,36 +36,36 @@ 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
+    delimiter: 区切り文字
     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
+          one: 1件のエラーにより、この%{model}が保存できませんでした
+          other: "%{count}件のエラーにより、この%{model}が保存できませんでした"
+    export: エクスポート
     'false': 'False'
     filtered: "（フィルタ中）"
     found: 個ありました
-    future: Future
+    future: 未来
     group_by: 
     grouped_by: 
-    hide: "(隠す)"
-    hours: Hours
+    hide: "（隠す）"
+    hours: 時間分
     human_conditions:
       association: "%{column} = %{value}"
       boolean: "%{column} = %{value}"
@@ -73,17 +73,17 @@ 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}"
     next: 次
-    next_month: Next Month
-    next_week: Next Week
-    next_year: Next Year
+    next_month: 来月
+    next_week: 来週
+    next_year: 来年
     no_authorization_for_action: No Authorization for action %{action}
     no_color: 
     no_entries: 見つかりませんでした
@@ -94,19 +94,19 @@ ja:
     omit_header: Omit Header
     optional_attributes: Further Options
     options: オプション
-    past: Past
+    past: 過去
     pdf: PDF
-    prev_month: Last Month
-    prev_week: Last Week
-    prev_year: Last Year
+    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: ファイルを削除または追加する
@@ -117,32 +117,32 @@ ja:
     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
+    sum: 合計値
+    this_month: 今月
+    this_week: 今週
+    this_year: 今年
+    today: 今日
+    tomorrow: 明日
     'true': 'True'
     update: 更新
     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/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)