active_scaffold 3.7.0 → 3.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26ce6ce8562249c43e685b6b8bbdf14f7ecb13d245b83431145e7cae5c56ac37
-  data.tar.gz: 51e9f055da4ebda5bb2c91ece952095dcb179d263218e510abc94029bc2cc47b
+  metadata.gz: f1c01273f43a7214112a02b40bb586bba990baa0960e75977bd74263ef53d707
+  data.tar.gz: aa8a443eb2b4f64d368ebce26f1fa53667608dc9185fc2ef76ed365a11ee9224
 SHA512:
-  metadata.gz: 4f93b85f2714ce8f6d845c704a455de9c3d0fa70aa5225d02d106cf190d75942030804cc2a1f13268e658270ca9a6b734fb2c9c2fdb550bf3ef933ae207d8c55
-  data.tar.gz: 7a6b39eaf2b2b0f83a809c5bbb98884d9e39373a69fef9a28faf29eeb29d30632cd0fc887024d95d76902a87521edb0289201bcf2014d289d4289087bd235b85
+  metadata.gz: 187a8c7a33e53747b87035c156776b5d0a4318eb2937fd40e80e73fc4571ea0a4c7d514c8d7f6bbafd361311b55f1588470017465dae1ed534221767b04f328e
+  data.tar.gz: 50b05425009f23b58e53d2984aebe9e7e6b16909638ae48d20ae866137a99e5b83579783f30c40084cb9aadc176dc9f1dbb966b3de516298165ce926def47e60

data/CHANGELOG.rdoc

@@ -1,3 +1,27 @@
+= 3.7.2
+- Fix routes
+
+= 3.7.1
+- Nullable boolean columns default to use :boolean form_ui instead of :checkbox
+- Display the value set in options[:include_blank] for boolean columns when value is nil, to match the label in the form
+- Support :select_multiple in search_ui, and :draggable in form_ui and search_ui, as shorthands
+- Support assigning options next to the UI type in form_ui, list_ui, show_ui, search_ui, so they are used instead of common options
+- Support :refresh_link option in :select form_ui for non-association columns
+- Support using a hash in :refresh_link option instead of true, with html
+- Support select with multiple attribute for plural associations using :select form_ui, instead of checkboxes, using {html_options: {multiple: true}}, or :select_multiple
+- Support attributes= in column, to set multiple settings with a hash
+- Fix update_columns in type column of polymorphic association, when foreign key has value, it will look for old id with new type and may fail
+- Support changing between subform and form_ui with update_columns
+- Deprecate automatic :select form_ui for associations in subforms, set :select in the controller config to remove deprecation warning, or enable new behaviour of nested subforms with ActiveScaffold.nested_subforms = true
+- Some fixes for human conditions with some search UI
+- Add more string comparators in field search
+- Support date and datetime searches with operators using html5 inputs, as was supported when using date picker. The different bridges, date_picker and calendar_date_select, will just replace the input fields.
+- Support disabling default usage of jquery UI date picker, in case of sortable is wanted, so jquery-ui-rails is loaded, but wants to use HTML5 date input.
+- Support multiple id in constraints for polymorphic association, and don't register constrained field if value is an array.
+- Support subqueries in field_search, with new syntax for search_sql, so search in polymorphic associations is possible.
+- Better support for active model attributes
+- Load files on boot using initializer blocks and use hooks to patch rails classes, run hook :active_scaffold_routing when routing is loaded so other plugins can extend routes
+
 = 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)

data/README.md

@@ -62,6 +62,8 @@ rails db:migrate
 
 Run the app and visit localhost:3000/<plural_model>
 
+It's recommended to call `clear_helpers` in ApplicationController, as some helpers defined by ActiveScaffold, such as active_scaffold_enum_options, options_for_association_conditions, association_klass_scoped, are usually overrided for different controllers, and it may cause issues when all helper modules are available to every controller, specially when models have associations or columns with the same name but need different code for those overrided helper methods.
+
 Threadsafe
 ----------
 

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

@@ -1,34 +1,34 @@
 jQuery(document).ready(function($) {
-/* It should not be needed, latest chrome is caching by itself
-  if (ActiveScaffold.config.conditional_get) jQuery.ajaxSettings.ifModified = true;
-  jQuery(document).on('ajax:beforeSend', function(event, xhr, settings){
-    xhr.cacheUrl = settings.url;
-  });
-  jQuery(document).on('ajax:success', function(event, data, status, xhr){
-    var etag=xhr.getResponseHeader("etag");
-    if (etag && xhr.status==304) {
-      var key = etag + xhr.cacheUrl;
-      xhr.responseText=jQuery(document).data(key);
-      var conv = jQuery(document).data('type-'+key);
-      if (conv) conv(xhr.responseText);
-    }
-  });
-  jQuery(document).ajaxComplete(function(event, xhr, settings){
-    var etag=xhr.getResponseHeader("etag");
-    if (etag && settings.ifModified && xhr.responseText) {
-      var key = etag + xhr.cacheUrl;
-      jQuery(document).data(key, xhr.responseText);
-      var contentType = xhr.getResponseHeader('Content-Type');
-      for(s in settings.contents) {
-        if (settings.contents[s].test(contentType)) {
-          var conv = settings.converters['text '+s];
-          if (typeof conv == 'function') jQuery(document).data('type-'+key, conv);
-          break;
+  /* It should not be needed, latest chrome is caching by itself
+    if (ActiveScaffold.config.conditional_get) jQuery.ajaxSettings.ifModified = true;
+    jQuery(document).on('ajax:beforeSend', function(event, xhr, settings){
+      xhr.cacheUrl = settings.url;
+    });
+    jQuery(document).on('ajax:success', function(event, data, status, xhr){
+      var etag=xhr.getResponseHeader("etag");
+      if (etag && xhr.status==304) {
+        var key = etag + xhr.cacheUrl;
+        xhr.responseText=jQuery(document).data(key);
+        var conv = jQuery(document).data('type-'+key);
+        if (conv) conv(xhr.responseText);
+      }
+    });
+    jQuery(document).ajaxComplete(function(event, xhr, settings){
+      var etag=xhr.getResponseHeader("etag");
+      if (etag && settings.ifModified && xhr.responseText) {
+        var key = etag + xhr.cacheUrl;
+        jQuery(document).data(key, xhr.responseText);
+        var contentType = xhr.getResponseHeader('Content-Type');
+        for(s in settings.contents) {
+          if (settings.contents[s].test(contentType)) {
+            var conv = settings.converters['text '+s];
+            if (typeof conv == 'function') jQuery(document).data('type-'+key, conv);
+            break;
+          }
         }
       }
-    }
-  });
-*/
+    });
+  */
   if (/1\.[2-7]\..*/.test(jQuery().jquery)) {
     var error = 'ActiveScaffold requires jquery 1.8.0 or greater, please use jquery-rails 2.1.x gem or greater';
     if (typeof console != 'undefined') console.error(error);
@@ -198,7 +198,7 @@ jQuery(document).ready(function($) {
     var td = jQuery(this), span = td.find('span.in_place_editor_field');
     if (event.type == 'mouseenter') {
       if (td.hasClass('empty') || typeof(span.data('editInPlace')) === 'undefined') td.find('span').addClass("hover");
-     }
+    }
     if (event.type == 'mouseleave') {
       if (td.hasClass('empty') || typeof(span.data('editInPlace')) === 'undefined') td.find('span').removeClass("hover");
     }
@@ -266,6 +266,7 @@ jQuery(document).ready(function($) {
     var element = jQuery(this);
     var form_element = element.prev();
     var value;
+    if (form_element.is(".field_with_errors")) form_element = form_element.children().last();
     if (form_element.is(".checkbox-list")) {
       value = form_element.find(':checked').map(function(item){return $(this).val();}).toArray();
       form_element = form_element.parent().find("input:checkbox"); // parent is needed for draggable-list, checked list may be empty
@@ -400,7 +401,7 @@ jQuery(document).ready(function($) {
   }
   if (ActiveScaffold.config.warn_changes) ActiveScaffold.setup_warn_changes();
   jQuery(document).on('as:element_updated as:element_created', function(e, action_link) {
-      ActiveScaffold.setup(e.target);
+    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
@@ -443,7 +444,7 @@ jQuery(document).on('turbolinks:load turbo:load', function($) {
     for (var name in prop) {
       // Check if we're overwriting an existing function
       prototype[name] = typeof prop[name] == "function" &&
-        typeof _super[name] == "function" && fnTest.test(prop[name]) ?
+      typeof _super[name] == "function" && fnTest.test(prop[name]) ?
         (function(name, fn){
           return function() {
             var tmp = this._super;
@@ -930,25 +931,30 @@ var ActiveScaffold = {
   render_form_field: function(source, content, options) {
     if (typeof(source) == 'string') source = '#' + source;
     var source = jQuery(source);
-    var element = source.closest('.sub-form-record'), selector = '';
-    if (element.length == 0) {
-      element = source.closest('form > ol.form');
+    var element, container = source.closest('.sub-form-record'), selector = '';
+    if (container.length == 0) {
+      container = source.closest('form > ol.form');
       selector = 'li';
     }
     // find without entering new subforms
-    selector = options.is_subform ? '' : selector + ':not(.sub-form) ';
-    element = element.find(selector + '.' + options.field_class).first();
+    element = container.find(selector + ':not(.sub-form) .' + options.field_class).first();
+    if (element.length)
+      element = element.closest('dl');
+    else if (options.subform_class)
+      element = container.find(selector + '.' + options.subform_class).first();
 
     if (element.length) {
-      if (options.is_subform == false) {
-        if (typeof(options.hidden) != 'undefined') {
-          var li = element.closest('li');
-          li[options.hidden ? 'addClass' : 'removeClass'].call(li, 'hidden')
-        }
-        this.replace(element.closest('dl'), content);
-      } else {
+      var parent = element.is('li, td') ? element : element.parent('li, td');
+      if (element.is('li'))
         this.replace_html(element, content);
+      else
+        this.replace(element, content);
+      if (parent.is('li')) {
+        for (var attr in options.attrs)
+          parent.attr(attr, options.attrs[attr]);
       }
+      if (typeof(options.hidden) != 'undefined')
+        parent[options.hidden ? 'addClass' : 'removeClass'].call(parent, 'hidden')
     }
   },
 
@@ -981,23 +987,23 @@ var ActiveScaffold = {
     // test editor is open
     if (typeof(span.data('editInPlace')) === 'undefined') {
       var options = {show_buttons: true,
-                     hover_class: 'hover',
-                     element_id: 'editor_id',
-                     ajax_data_type: "script",
-                     delegate: {
-                       willCloseEditInPlace: function(span, options) {
-                         if (span.data('addEmptyOnCancel')) span.closest('td').addClass('empty');
-                         span.closest('tr').find('td.actions .loading-indicator').css('visibility','visible');
-                       },
-                       didCloseEditInPlace: function(span, options) {
-                         span.closest('tr').find('td.actions .loading-indicator').css('visibility','hidden');
-                       }
-                     },
-                     update_value: 'value'},
-          csrf_param = jQuery('meta[name=csrf-param]').first(),
-          csrf_token = jQuery('meta[name=csrf-token]').first(),
-          my_parent = span.parent(),
-          column_heading = null;
+          hover_class: 'hover',
+          element_id: 'editor_id',
+          ajax_data_type: "script",
+          delegate: {
+            willCloseEditInPlace: function(span, options) {
+              if (span.data('addEmptyOnCancel')) span.closest('td').addClass('empty');
+              span.closest('tr').find('td.actions .loading-indicator').css('visibility','visible');
+            },
+            didCloseEditInPlace: function(span, options) {
+              span.closest('tr').find('td.actions .loading-indicator').css('visibility','hidden');
+            }
+          },
+          update_value: 'value'},
+        csrf_param = jQuery('meta[name=csrf-param]').first(),
+        csrf_token = jQuery('meta[name=csrf-token]').first(),
+        my_parent = span.parent(),
+        column_heading = null;
 
       if(!(my_parent.is('td') || my_parent.is('th'))){
         my_parent = span.parents('td').eq(0);
@@ -1011,8 +1017,8 @@ var ActiveScaffold = {
       }
 
       var render_url = column_heading.data('ie-render-url'),
-          mode = column_heading.data('ie-mode'),
-          record_id = span.data('ie-id') || '';
+        mode = column_heading.data('ie-mode'),
+        record_id = span.data('ie-id') || '';
 
       ActiveScaffold.read_inplace_edit_heading_attributes(column_heading, options);
 

data/app/assets/stylesheets/active_scaffold_layout.css

@@ -855,7 +855,7 @@ padding-left: 5px;
 .active-scaffold .form-element .sub-form.optional {
 float: none;
 }
-.active-scaffold .form-element .show-new-subform {
+.active-scaffold .form-element a.show-new-subform {
 margin-left: 5px;
 }
 

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

@@ -52,7 +52,8 @@
     next unless in_subform?(column, parent_record, record_column)
     columns_length += 1
     show_actions = true
-    if column.association && column.form_ui.nil?
+    if !ActiveScaffold.nested_subforms && !readonly && column.association && column.form_ui.nil?
+      ActiveSupport::Deprecation.warn "Nested subforms are allowed now, set form_ui = :select for #{column.name} in controller for #{config.model.name}"
       column = column.dup unless ActiveScaffold.threadsafe
       column.form_ui = :select
     end

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

@@ -14,11 +14,14 @@
     renders_as = column_renders_as(column)
     form_ui = column.form_ui
   end
-  if renders_as == :subform
-    options = {is_subform: true, field_class: "#{column.name}-sub-form"}
-  else
-    options = {is_subform: false, field_class: "#{column.name}-input", hidden: form_ui == :hidden}
-  end
+  options = {field_class: "#{column.name}-input", hidden: form_ui == :hidden}
+  options[:subform_class] = "#{column.name}-sub-form" if column.association
+  options[:attrs] =
+    if renders_as == :subform
+      active_scaffold_subform_attributes(column, (column.css_class unless column.css_class.is_a?(Proc)))
+    else
+      {class: 'form-element', id: ''}
+    end
   html =
     if scope
       readonly = @record.readonly? || !@record.authorized_for?(:crud_type => :update)
@@ -34,5 +37,5 @@
 
 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/de.yml

@@ -47,6 +47,9 @@ de:
     deleted_model: "%{model} gelöscht"
     deleted_records: Gelöschte Records auflisten
     delimiter: Trennzeichen
+    doesnt_begin_with:
+    doesnt_contain:
+    doesnt_end_with:
     download: Herunterladen
     edit: Bearbeiten
     ends_with: Endet
@@ -138,10 +141,10 @@ de:
     yesterday: Gestern
   date:
     formats:
-      month: 
+      month: "%B"
       quarter: Quartal %{num}
-      week: 
-      year_month: 
+      week:
+      year_month: "%b %Y"
       year_quarter: Quartal %{quarter} %{year}
   time:
     formats:

data/config/locales/en.yml

@@ -47,6 +47,9 @@ en:
     deleted_model: Deleted %{model}
     deleted_records: List Deleted Records
     delimiter: Delimiter
+    doesnt_begin_with: Doesn't begin with
+    doesnt_contain: Doesn't contain
+    doesnt_end_with: Doesn't end with
     download: Download
     edit: Edit
     ends_with: Ends with

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

@@ -22,12 +22,12 @@ ja:
     click_to_edit: クリックして編集
     click_to_reset: クリックしてリセット
     close: 閉じる
-    config_list: Configure
-    config_list_model: Configure Columns for %{model}
+    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}を作成しました"
@@ -45,25 +45,28 @@ ja:
     days: 日分
     delete: 削除
     deleted_model: "%{model}を削除しました"
-    deleted_records: 
+    deleted_records:
     delimiter: 区切り文字
+    doesnt_begin_with:
+    doesnt_contain:
+    doesnt_end_with:
     download: ダウンロード
     edit: 編集
     ends_with: 終了時間
     error_500: "（コード500：内部エラー）"
     errors:
       template:
-        body: '次のフィールドに問題がありました：'
+        body: 次のフィールドに問題がありました：
         header:
           one: 1件のエラーにより、この%{model}が保存できませんでした
           other: "%{count}件のエラーにより、この%{model}が保存できませんでした"
     export: エクスポート
-    'false': 'False'
+    'false':
     filtered: "（フィルタ中）"
     found: 個ありました
     future: 未来
-    group_by: 
-    grouped_by: 
+    group_by:
+    grouped_by:
     hide: "（隠す）"
     hours: 時間分
     human_conditions:
@@ -79,23 +82,23 @@ ja:
     minutes: 分間
     months: か月分
     nested_for_model: "%{parent_model}の%{nested_model}"
-    nested_of_model: "%{nested_model} of %{parent_model}"
+    nested_of_model:
     next: 次
     next_month: 来月
     next_week: 来週
     next_year: 来年
-    no_authorization_for_action: No Authorization for action %{action}
-    no_color: 
+    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: 過去
-    pdf: PDF
+    pdf:
     prev_month: 先月
     prev_week: 先週
     prev_year: 去年
@@ -110,10 +113,10 @@ ja:
     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: 検索単語
@@ -127,9 +130,9 @@ ja:
     this_year: 今年
     today: 今日
     tomorrow: 明日
-    'true': 'True'
+    'true':
     update: 更新
-    update_apply: 
+    update_apply:
     update_model: "%{model}を更新"
     updated_model: "%{model}を更新しました"
     version_inconsistency: バージョンが一致しません - あなたが編集している間にこのレコードが変更されました。

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"