active_scaffold 4.0.13 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fd3e750e0fb36959f8ac173dbb8f9ef3cffadaa1c4b7c7b66698ae97ae0da4e
-  data.tar.gz: 73ac2a464d935b187982282547440f450761d580cfd9e202601da5768670940a
+  metadata.gz: 62db7d77ad1a708491a2fa940bcfdedddc975805429f79a21a2690a20c358ea0
+  data.tar.gz: e4151358418239cd47c699ac0de98bf6456ff54a289311713245f3b55818c9e3
 SHA512:
-  metadata.gz: 5587b3cede0b77dfbc0194860fa7116f0f6e79ccc6647aa6e2a7f1a256bd107d19909c3b71d717497f7e0562fc6850ec3b829a7d27bc88ff4d24692125571639
-  data.tar.gz: a2d8672b60eb934851a1df4b57fb6928d1662e5924d6d78b1e06714db9e15ded2c48287d87382c4af2a1f1db0762b7e7d9b063ecfabc368ab4c66e322d246598
+  metadata.gz: bcb79b9cb7b68c2bc2ed427e1a98c387332095c981a63b92a8f43247593a4428cb51d0b18330fe22cb0a88d8237ad437a1906c09df65d46594d3a59a82e149f9
+  data.tar.gz: d6b7065e4e5300aceef33757a0973c6517caaf3c0e4d08a1326ec30801a3ca9feed4e75fbbf94dc36561d8866446d7b26da0aa19d38911fa29f85cbd09b93ba7

data/CHANGELOG.rdoc

@@ -1,3 +1,22 @@
+- Replace sassc-rails with dartsass-sprockets, as it's a compatible replacement, to ease migration to dartsass
+- Use lowercase response headers as required by rack 3
+- Add filters to list action
+- Add prompt option to action link
+- Support tabbed_by in show action too
+- Support options hash for :add_new option, with mode: :popup to open create new form in a JS popup, and other options to change link texts
+- Support setup option in tinymce config with function
+- Support multiple values in constraints for columns
+- Improve grouped search supporting to change the columns used with group clause
+- Improve grouped search to support using virtual columns for calculations, defining which DB column use to calculate
+- Improve grouped search supporting other SQL functions for calculate in grouped search, ignoring it in bottom search if rails don't support them in calculate (only sum, count, minimum, maximum average)
+- Improve grouped search supporting using group_by with multiple columns or sql code
+- Add disable_on_update_column setting to column to allow skipping disabling the form when a column changes and a request is sent to refresh other fields
+- Rename active_scaffold_habtm_joins to active_scaffold_joins, active_scaffold_habtm_joins is now deprecated
+- Support sorted_association_options_find with model name prefix
+- Support empty_field_text per column
+- Fix using nested with habtm association, shallow_delete enabled, delete action added but delete link removed
+- Fix for jquery-ui-rails 8.0 (jQuery UI 14)
+
 = 4.0.13
 - Fix security_methods on destroy_existing
 

data/README.md

@@ -12,10 +12,11 @@ ActiveScaffold provides a quick and powerful user interfaces for CRUD (create, r
 
 Branch Details
 --------------
-master supports rails >= 6.1.x and <= 7.2.x, and ruby >= 3.0.0  
-3-7-stable supports rails >= 5.2.x and <= 7.1.x, and ruby >= 2.5.0
+master supports rails >= 7.0.x and <= 7.2.x, and ruby >= 3.1.0  
+4-0-stable supports rails >= 6.1.x and <= 7.2.x, and ruby >= 3.0.0
 
 These versions are not supported anymore:  
+3-7-stable supports rails >= 5.2.x and <= 7.1.x, and ruby >= 2.5.0
 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  
@@ -38,9 +39,9 @@ Add jquery-rails to Gemfile, or handle jquery with other tools like webpack or i
 gem 'jquery-rails'
 ```
 
-For rails 7.x, install generator will add active_scaffold to config/importmap.rb, app/javascript/application.js, and active_scaffold/manifest.js to app/assets/config/manifest.js. It will add jquery and jquery_ujs to all the 3 files if jquery-rails gem is available.
+For rails 7.x, install generator will add `active_scaffold` to `config/importmap.rb`, `app/javascript/application.js`, and `active_scaffold/manifest.js` to `app/assets/config/manifest.js`. It will add `jquery` and `jquery_ujs` to all the 3 files if jquery-rails gem is available.
 
-For rails 6.1, install generator will create app/assets/javascripts/application.js, add it, and active_scaffold/manifest.js, to app/assets/config/manifest.js and add javascript_include_tag in layout, as ActiveScaffold doesn't work with webpack. It will add jquery to app/assets/javascripts/application.js too if query-rails gem is available, although Jquery may be loaded by packs too and it will work, it won't add jquery_ujs or @rails/ujs as it's added to app/javascript/packs/application.js by default.
+For rails 6.1, install generator will create `app/assets/javascripts/application.js`, add it, and `active_scaffold/manifest.js`, to `app/assets/config/manifest.js` and add `javascript_include_tag` in the layout, as ActiveScaffold doesn't work with webpack. It will add `jquery` to `app/assets/javascripts/application.js` too if query-rails gem is available, although Jquery may be loaded by packs too and it will work, it won't add `jquery_ujs` or `@rails/ujs` as it's added to `app/javascript/packs/application.js` by default.
 
 Run the following commands
 
@@ -64,6 +65,8 @@ Threadsafe is enabled always since 4.0, and it can't be disabled.
 Breaking Changes
 ----------------
 
+When upgrading from 3.x, add `active_scaffold/manifest.js` to `app/assets/config/manifest.js` to prevent issues with assets.
+
 Changing column settings on a request has changed, it must use `active_scaffold_config.columns.override(:name)` at least the first time. After calling `columns.override(:name)`, calling it again or calling `columns[:name]` will return the overrided column. It also supports a block. See [Per Request Configuration](https://github.com/activescaffold/active_scaffold/wiki/Per-Request-Configuration) for examples and more comprehensive explanation.
 
 Changing columns for an action (e.g. add or exclude) on a request must use active_scaffold_config.actions.override_columns, the first time, or use assignment.
@@ -103,10 +106,13 @@ Released under the MIT license (included)
 
 A ruby translation project managed on [Locale](http://www.localeapp.com/) that's open to all!
 
-## Contributing to active_scaffold
+## Contributing to ActiveScaffold
 
 - Edit the translations directly on the [active_scaffold](http://www.localeapp.com/projects/public?search=active_scaffold) project on Locale.
 - **That's it!**
 - The maintainer will then pull translations from the Locale project and push to Github.
 
 Happy translating!
+
+### Powered by
+[![RubyMine logo](https://resources.jetbrains.com/storage/products/company/brand/logos/RubyMine.png)](https://jb.gg/OpenSource)

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

@@ -6,7 +6,7 @@
     elsif Jquery.const_defined? :Ui
       jquery_ui_prefix = Jquery::Ui::Rails::VERSION < '5.0.0' ? 'jquery.ui.' : 'jquery-ui/'
       jquery_ui_widgets_prefix = Jquery::Ui::Rails::VERSION >= '6.0.0' ? 'widgets/' : ''
-      require_asset "#{jquery_ui_prefix}core"
+      require_asset "#{jquery_ui_prefix}core" unless Jquery::Ui::Rails::VERSION >= '8.0.0'
       require_asset "#{jquery_ui_prefix}effect"
       require_asset "#{jquery_ui_prefix}effects/effect-highlight" if Jquery::Ui::Rails::VERSION >= '6.0.0'
       require_asset "#{jquery_ui_prefix}#{jquery_ui_widgets_prefix}sortable"

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

@@ -45,7 +45,7 @@
       jQuery(document).on('ajax:beforeSend', 'form.as_form', function(event) {
         var as_form = jQuery(this).closest("form");
         if (as_form.data('loading') == true) {
-          ActiveScaffold.disable_form(as_form);
+          if (!jQuery(event.target).data('skip-disable-form')) ActiveScaffold.disable_form(as_form);
         }
         return true;
       });
@@ -79,7 +79,7 @@
           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}));
+            as_form.append(jQuery('<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);
@@ -97,6 +97,18 @@
         }
         return true;
       });
+      jQuery(document).on('ajax:before', 'a.as_action[data-prompt]', function(e, xhr, settings){
+        var link = jQuery(this), value = prompt(link.data('prompt'));
+        if (value) {
+          link.data('params', jQuery.param({value: value}));
+        } else if (jQuery(this).data('prompt-required')) {
+          e.stopImmediatePropagation();
+          return false;
+        } else {
+          link.removeData('params');
+        }
+        return true;
+      });
       jQuery(document).on('ajax:before', 'a.as_action', function(event) {
         var action_link = ActiveScaffold.ActionLink.get(jQuery(this));
         if (action_link) {
@@ -142,6 +154,22 @@
         }
         return true;
       });
+      jQuery(document).on({
+        'ajax:before': function () {
+          var $this = jQuery(this), indicator_id = $this.data('loading-indicator-id'),
+            $indicator = indicator_id ? jQuery('#' + indicator_id) : jQuery();
+          if (!$indicator.length) $indicator = $this.parent().find('.loading-indicator');
+          if (!$indicator.length) $indicator = $this.closest('.active-scaffold-header').find('.loading-indicator:first');
+          $indicator.css('visibility', 'visible');
+          $this.data('url', jQuery('option:selected', this).data('url'));
+        }, 'ajax:complete': function () {
+          var $this = jQuery(this), indicator_id = $this.data('loading-indicator-id'),
+            $indicator = indicator_id ? jQuery('#' + indicator_id) : jQuery();
+          if (!$indicator.length) $indicator = $this.parent().find('.loading-indicator');
+          if (!$indicator.length) $indicator = $this.closest('.active-scaffold-header').find('.loading-indicator');
+          $indicator.css('visibility', 'hidden');
+        }
+      }, ':input[data-remote="url"]:not(data-url)');
       jQuery(document).on('ajax:before', 'a.as_cancel', function(event) {
         var as_cancel = jQuery(this);
         var action_link = ActiveScaffold.find_action_link(as_cancel);
@@ -255,7 +283,7 @@
         if (element.is(".checkbox-list input:checkbox")) {
           form_element = element.closest('.checkbox-list');
           if (form_element.is('.draggable-list')) form_element = form_element.closest('.draggable-lists-container').find('.checkbox-list') // draggable lists will have 2 lists
-          value = form_element.find(':checked').map(function(item){return $(this).val();}).toArray();
+          value = form_element.find(':checked').map(function(item) { return jQuery(this).val(); }).toArray();
           if (!additional_params) additional_params = (element.is(':checked') ? '_added=' : '_removed=') + element.val();
         } else {
           value = element.is("input:checkbox:not(:checked)") ? null : element.val();
@@ -271,7 +299,7 @@
         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();
+          value = form_element.find(':checked').map(function(item) { return jQuery(this).val(); }).toArray();
           form_element = form_element.parent().find("input:checkbox"); // parent is needed for draggable-list, checked list may be empty
         } else value = form_element.is("input:checkbox:not(:checked)") ? null : form_element.val();
         ActiveScaffold.update_column(form_element, element.attr('href'), element.data('update_send_form'), form_element.attr('id'), value);
@@ -306,7 +334,7 @@
 
       jQuery(document).on('click', '.active-scaffold .sub-form a.destroy', function(event) {
         event.preventDefault();
-        ActiveScaffold.delete_subform_record($(this).data('delete-id'));
+        ActiveScaffold.delete_subform_record(jQuery(this).data('delete-id'));
       });
 
       jQuery(document).on("click", '.hover_click', function(event) {
@@ -339,7 +367,7 @@
       });
 
       jQuery(document).on('click', '.hide-new-subform, .show-new-subform', function(e) {
-        var $this = jQuery(this), line = $this.closest('.form-element'),
+        var $this = jQuery(this), line = $this.closest('.form-element, td'),
           subform = line.find('#' + $this.data('subform-id')), radio = false, hide, select;
         if ($this.is('[type=radio]')) {
           radio = true;
@@ -380,12 +408,12 @@
           'input:not([type=button]):not([type=submit]):not([type=reset]):not([type=hidden]),' +
           'textarea, select:has(option[value=""])'
         ).val('');
-        form.find('select.as_search_range_option').each(function() { $(this).val($(this).find('option:first').val()) });
+        form.find('select.as_search_range_option').each(function() { jQuery(this).val(jQuery(this).find('option:first').val()) });
         form.find('select.as_search_date_time_option').val('BETWEEN');
       });
 
       jQuery(document).on('click', '.active-scaffold .tabbed .nav-tabs a', function(e) {
-        if (typeof $().tab == 'function') return; // bootstrap tab plugin is loaded and will handle tabs
+        if (typeof jQuery().tab == 'function') return; // bootstrap tab plugin is loaded and will handle tabs
         e.preventDefault();
         var tab_ctrl = jQuery(this), tabbed = tab_ctrl.closest('.tabbed')
         tabbed.find('.nav-tabs .active').removeClass('active');
@@ -425,20 +453,20 @@
         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);
+        if (action_link.adapter) ActiveScaffold.setup(action_link.adapter);
       });
       jQuery(document).on('as:element_updated', '.active-scaffold', function(e) {
         if (e.target != this) return;
-        var search = $(this).find('form.search');
+        var search = jQuery(this).find('form.search');
         if (search.length) ActiveScaffold.focus_first_element_of_form(search);
       });
       jQuery(document).on('click', '.active-scaffold form .check-all', function(e) {
         e.preventDefault();
-        ActiveScaffold.update_all_checkboxes($(this), true);
+        ActiveScaffold.update_all_checkboxes(jQuery(this), true);
       });
       jQuery(document).on('click', '.active-scaffold form .uncheck-all', function(e) {
         e.preventDefault();
-        ActiveScaffold.update_all_checkboxes($(this), false);
+        ActiveScaffold.update_all_checkboxes(jQuery(this), false);
       });
     });
 
@@ -591,7 +619,7 @@
       },
       sliders: function(element) {
         jQuery('.as-slider', element).each(function() {
-          var opts = $(this).data('slider');
+          var opts = jQuery(this).data('slider');
           jQuery(this).slider(opts);
           if (opts.disabled) jQuery(this).find('.ui-slider-handle').hide();
         });
@@ -604,7 +632,7 @@
           item.closest('.active-scaffold-component').load(item.attr('href'), function(response, status, xhr) {
             if (status == 'error') {
               indicator.css({visibility: 'hidden'});
-              indicator.after($('<p>').html(item.data('error-msg')).addClass("error-message message server-error"));
+              indicator.after(jQuery('<p>').html(item.data('error-msg')).addClass("error-message message server-error"));
             } else jQuery(this).trigger('as:element_updated');
           });
         });
@@ -979,8 +1007,8 @@
         // find without entering new subforms
         element = container.find(selector + ':not(.sub-form) .' + options.field_class);
         if (container.is('.sub-form-record'))
-          element = element.filter(function() { return $(this).closest('.sub-form-record').get(0) === container.get(0); });
-        else element = element.filter(function() { return $(this).closest('.sub-form-record').length === 0; });
+          element = element.filter(function() { return jQuery(this).closest('.sub-form-record').get(0) === container.get(0); });
+        else element = element.filter(function() { return jQuery(this).closest('.sub-form-record').length === 0; });
         if (element.length)
           element = element.first().closest('dl');
         else if (options.subform_class)
@@ -1187,7 +1215,7 @@
       update_all_checkboxes: function(button, state) {
         var lists = button.closest('.check-buttons').parent().find('.checkbox-list'),
           checkboxes = lists.find(':checkbox'), key = state ? '_added' : '_removed', params;
-        params = checkboxes.filter(state ? ':not(:checked)' : ':checked').map(function() { return key + '[]=' + $(this).val(); }).toArray().join('&');
+        params = checkboxes.filter(state ? ':not(:checked)' : ':checked').map(function() { return key + '[]=' + jQuery(this).val(); }).toArray().join('&');
         checkboxes.prop('checked', state);
         if (lists.filter('.draggable-list').length) {
           var parent = state ? lists.filter('.selected') : lists.filter(':not(.selected)');
@@ -1300,6 +1328,7 @@
           if (typeof(element.data('action_link')) === 'undefined' && !element.hasClass('as_adapter')) {
             var parent = element.parent().closest('.record');
             if (parent.length === 0) parent = element.parent().closest('.actions');
+            if (parent.length === 0) parent = element.parent().closest('form.as_form');
             if (parent.is('.record')) {
               // record action
               var target = parent.find('a.as_action');
@@ -1309,6 +1338,9 @@
             } else if (parent.is('.active-scaffold-header .actions')) {
               //table action
               new ActiveScaffold.Actions.Table(parent.find('a.as_action'), parent.closest('div.active-scaffold').find('tbody.before-header').first(), parent.find('.loading-indicator').first());
+            } else if (parent.is('form.as_form')) {
+              //table action
+              new ActiveScaffold.Actions.Table(parent.find('a.as_action').filter(function() { return !jQuery(this).data('action_link'); }), parent.closest('div.active-scaffold').find('tbody.before-header').first(), parent.find('.form-footer .loading-indicator').first());
             }
             element = jQuery(element);
           }
@@ -1383,23 +1415,38 @@
       },
 
       scaffold_id: function() {
-        return '#' + this.tag.closest('div.active-scaffold').attr('id');
+        const div_id = this.scaffold().attr('id');
+        if (div_id) return '#' + div_id;
       },
 
       scaffold: function() {
         return this.tag.closest('div.active-scaffold');
       },
 
+      messages: function() {
+        const re = /-active-scaffold$/, div_id = this.scaffold_id();
+
+        if (re.test(div_id)) {
+          return jQuery(div_id.replace(re, '-messages'));
+        } else {
+          var messages_container = this.scaffold().find('.messages-container'),
+            messages = messages_container.find('.action-messages');
+          if (!messages.length) messages = jQuery('<div class="action-messages"></div>').appendTo(messages_container);
+          return messages;
+        }
+      },
+
       update_flash_messages: function(messages) {
-        var message_node = jQuery(this.scaffold_id().replace(/-active-scaffold/, '-messages'));
-        if (message_node) message_node.html(messages);
+        this.messages().html(messages);
       },
+
       set_adapter: function(element) {
         this.adapter = element;
         this.adapter.addClass('as_adapter');
         this.adapter.data('action_link', this);
         if (this.refresh_url) jQuery('.as_cancel', this.adapter).attr('href', this.refresh_url);
       },
+
       keep_open: function() {
         return this.tag.data('keep-open');
       }

data/app/assets/javascripts/jquery/date_picker_bridge.js.erb

@@ -43,7 +43,7 @@ jQuery(document).on("focus", "input.datetime_picker", function(){
 });
 
 jQuery(document).on('change', 'input.datetime_picker', function(e) {
-  var $this = $(this);
+  var $this = jQuery(this);
   if ($this.data('first-event')) $this.removeData('first-event');
   else {
     $this.data('first-event', true);

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

@@ -11,7 +11,7 @@
       li.children('label').removeAttr('for');
       if (jQuery(item).is(':checked')) li.appendTo(list_selected);
     });
-    check_buttons.find('.check-all, .uncheck-all').attr('title', function() { return $(this).text() });
+    check_buttons.find('.check-all, .uncheck-all').attr('title', function() { return jQuery(this).text() });
     element.after(check_buttons);
     var options = {
       hoverClass: 'hover',

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

@@ -20,6 +20,7 @@
     var id = jQuery(this).attr('id');
     if (tinymce && tinymce.majorVersion >= 6) {
       settings.selector = '#' + id;
+      if (settings.setup) settings.setup = eval(settings.setup);
       tinymce.init(settings);
     } else { // tinyMCE.majorVersion < 6
       tinyMCE.settings = settings;