active_scaffold 3.4.17 → 3.4.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b1be864fa28fa3a7caca50a268de1ecd1070426
-  data.tar.gz: db83b56413734d2fdc7aab465efa47b89dd3edfe
+  metadata.gz: e5240d9cb10131fb335065071e8a786e745e9bce
+  data.tar.gz: a1493ba2efd6d6a58deaece8b630b6ba4a729e3a
 SHA512:
-  metadata.gz: f98c93d4d03d4347e73dd18793629c1bc8cb16ee6b0ee900a130b86f9c7e27f6aec751d67cf2abd255d74a087bab3af16f54466ddcbf17d2ec5cab568b947171
-  data.tar.gz: 36e97b6c0e09d2aecb3f27d63690e0bcbea16239d371ccd6711820de75ab059b43796e2a3af63b69c206143e25e7efc9e43d3cbc374ea6ba7743c9f0fb8181c7
+  metadata.gz: 8b846bb4dc8ac8bbe018429b8b7fcd8a3ba77dc0a2edf68fd128fb009f335c82412ad772594e34197efffed7d420ce7b9f8962b5bc9f2ae54e7d466cd23ba754
+  data.tar.gz: e901b88edfec58dae9bbc69eba15a3457ca19aac7faa66c213fcfeab87f8bd2ede76c136f27b429020e6e5bcffc8d3b60f3dc80d43ce1e0504e62a058e9ed1e9

data/CHANGELOG

@@ -1,3 +1,14 @@
+= 3.4.18
+- Fix paper_trail bridge on development
+- Allow to set :data hash in :html_options for action links
+- unscope(:order) in calculate_query (for rails >= 4)
+- clean code and follow ruby style guide
+- deny_access (rescue method for ActiveScaffold::RecordNotAllowed, ActiveScaffold::ActionNotAllowed) render with status :forbidden (403) instead of 401
+- allow to load nested scaffold with nested through associations, even with inplace edit enabled
+- disable create on nested through associations
+- Allow to config live_search delay with ActiveScaffold.js_config
+- Warn when form is changed (ignores search forms), this featured must be enabled with ActiveScaffold.js_config[:warn_changes]
+
 = 3.4.17
 - Fix deprecation warning "Extra .css in SCSS file is unnecessary"
 - Improve support for namespaced models on namespaced controllers with different namespace
@@ -271,7 +282,7 @@
 - Add some classes to forms to improve CSS customization
 - Fix nested links for STI controllers with common configuration in a base controller
 - Fix adding routes twice in active_scaffold generator
-- Restore old behavior for action_link's security_method, ignore_method already hides the link 
+- Restore old behavior for action_link's security_method, ignore_method already hides the link
 - Add data-cancel-refresh to action links, so nested scaffold's behaviour can be applied to other action links and when adapter is closed row will be refreshed.
 - fix support for tableless models in rails >= 3.2.5
 

data/README.md

@@ -1,6 +1,10 @@
 Overview
 ========
-[![travis tests](https://travis-ci.org/activescaffold/active_scaffold.png)](https://travis-ci.org/activescaffold/active_scaffold)
+[![Build status](https://travis-ci.org/activescaffold/active_scaffold.svg?branch=master)](https://travis-ci.org/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)
+[![Gem Version](https://badge.fury.io/rb/active_scaffold.svg)](https://badge.fury.io/rb/active_scaffold)
 
 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 3.2 and 4.x are supported, ruby >= 1.9 required. For rails 4 is recommended >= 4.0.5.
 
@@ -49,7 +53,7 @@ Credits
 -------
 ActiveScaffold grew out of a project named Ajaxscaffold dating back to 2006. It has had numerous contributors including:
 
-ActiveScaffold Gem/Plugin by Scott Rutherford (scott@caronsoftware.com), Richard White (rrwhite@gmail.com), Lance Ivy (lance@cainlevy.net), Ed Moss, Tim Harper and Sergio Cambra (sergio@entrecables.com)
+ActiveScaffold Gem/Plugin by Scott Rutherford (scott@caronsoftware.com), Richard White (rrwhite@gmail.com), Lance Ivy (lance@cainlevy.net), Ed Moss, Tim Harper and Sergio Cambra (sergio@programatica.es)
 
 Uses DhtmlHistory by Brad Neuberg (bkn3@columbia.edu)
 http://codinginparadise.org
@@ -60,8 +64,8 @@ http://adamv.com/dev/javascript/querystring
 Uses Paginator by Bruce Williams
 http://paginator.rubyforge.org/
 
-Supports RecordSelect by Lance Ivy
-http://code.google.com/p/recordselect/
+Supports RecordSelect by Lance Ivy and Sergio Cambra
+http://github.com/scambra/recordselect/
 
 
 License

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

@@ -47,7 +47,7 @@ jQuery(document).ready(function($) {
     }
     return true;
   });
-  
+
   jQuery(document).on('ajax:complete', 'form.as_form', function(event) {
     var as_form = jQuery(this).closest("form");
     if (as_form.data('loading') == true) {
@@ -96,7 +96,7 @@ jQuery(document).ready(function($) {
         action_link.enable();
       }
       jQuery(this).trigger('as:action_success', action_link);
-      if (action_link.loading_indicator) action_link.loading_indicator.css('visibility','hidden');  
+      if (action_link.loading_indicator) action_link.loading_indicator.css('visibility','hidden');
     }
     return true;
   });
@@ -110,8 +110,8 @@ jQuery(document).ready(function($) {
   });
   jQuery(document).on('ajax:before', 'a.as_cancel', function(event) {
     var as_cancel = jQuery(this);
-    var action_link = ActiveScaffold.find_action_link(as_cancel);  
-    
+    var action_link = ActiveScaffold.find_action_link(as_cancel);
+
     if (action_link) {
       var cancel_url = as_cancel.attr('href');
       var refresh_data = action_link.tag.data('cancel-refresh') || as_cancel.data('refresh');
@@ -199,7 +199,7 @@ jQuery(document).ready(function($) {
   });
   jQuery(document).on('ajax:complete', '.action_group.dyn > ul a', function(event) {
     var action_link = ActiveScaffold.find_action_link(event.target);
-    if (action_link.loading_indicator) action_link.loading_indicator.css('visibility','hidden');  
+    if (action_link.loading_indicator) action_link.loading_indicator.css('visibility','hidden');
     jQuery(event.target).closest('.action_group.dyn > ul').remove();
   });
 
@@ -240,14 +240,14 @@ jQuery(document).ready(function($) {
     ActiveScaffold.update_column(element, element.data('update_url'), element.data('update_send_form'), element.attr('id'), id);
     return true;
   });
-  
+
   jQuery(document).on('change', 'select.as_search_range_option', function(event) {
     var element = jQuery(this);
     ActiveScaffold[element.val() == 'BETWEEN' ? 'show' : 'hide'](element.closest('dd').find('.as_search_range_between'));
     ActiveScaffold[(element.val() == 'null' || element.val() == 'not_null') ? 'hide' : 'show'](element.attr('id').replace(/_opt/, '_numeric'));
     return true;
   });
-  
+
   jQuery(document).on('change', 'select.as_search_date_time_option', function(event) {
     var element = jQuery(this);
     ActiveScaffold[!(element.val() == 'PAST' || element.val() == 'FUTURE' || element.val() == 'RANGE') ? 'show' : 'hide'](element.attr('id').replace(/_opt/, '_numeric'));
@@ -261,7 +261,7 @@ jQuery(document).ready(function($) {
     ActiveScaffold[jQuery(this).val() == 'REPLACE' ? 'hide' : 'show'](jQuery(this).next().next());
     return true;
   });
-  
+
   jQuery(document).on('click', '.active-scaffold .sub-form a.destroy', function(event) {
     event.preventDefault();
     ActiveScaffold.delete_subform_record($(this).data('delete-id'));
@@ -289,13 +289,14 @@ jQuery(document).ready(function($) {
     ActiveScaffold.hide(jQuery(this).closest('.message'));
     e.preventDefault();
   });
-  
+
   /* setup some elements on page/form load */
   ActiveScaffold.load_embedded(document);
   ActiveScaffold.enable_js_form_buttons(document);
   ActiveScaffold.live_search(document);
   ActiveScaffold.auto_paginate(document);
   ActiveScaffold.draggable_lists('.draggable-lists', document);
+  if (ActiveScaffold.warn_changes) ActiveScaffold.setup_warn_changes();
   jQuery(document).on('as:element_updated', function(e) {
     ActiveScaffold.load_embedded(e.target);
     ActiveScaffold.enable_js_form_buttons(e.target);
@@ -320,17 +321,17 @@ jQuery(document).ready(function($) {
 
   // The base Class implementation (does nothing)
   this.Class = function(){};
- 
+
   // Create a new Class that inherits from this class
   Class.extend = function(prop) {
     var _super = this.prototype;
-   
+
     // Instantiate a base class (but only create the instance,
     // don't run the init constructor)
     initializing = true;
     var prototype = new this();
     initializing = false;
-   
+
     // Copy the properties over onto the new prototype
     for (var name in prop) {
       // Check if we're overwriting an existing function
@@ -339,38 +340,38 @@ jQuery(document).ready(function($) {
         (function(name, fn){
           return function() {
             var tmp = this._super;
-           
+
             // Add a new ._super() method that is the same method
             // but on the super-class
             this._super = _super[name];
-           
+
             // The method only need to be bound temporarily, so we
             // remove it when we're done executing
-            var ret = fn.apply(this, arguments);       
+            var ret = fn.apply(this, arguments);
             this._super = tmp;
-           
+
             return ret;
           };
         })(name, prop[name]) :
         prop[name];
     }
-   
+
     // The dummy class constructor
     function Class() {
       // All construction is actually done in the init method
       if ( !initializing && this.init )
         this.init.apply(this, arguments);
     }
-   
+
     // Populate our constructed prototype object
     Class.prototype = prototype;
-   
+
     // Enforce the constructor to be what we expect
     Class.constructor = Class;
 
     // And make this class extendable
     Class.extend = arguments.callee;
-   
+
     return Class;
   };
 })();
@@ -378,9 +379,9 @@ jQuery(document).ready(function($) {
 /*
  $ delayed observer
  (c) 2007 - Maxime Haineault (max@centdessin.com)
- 
+
  Special thanks to Stephen Goguen & Tane Piper.
- 
+
  Slight modifications by Elliot Winkler
 */
 
@@ -422,7 +423,7 @@ var ActiveScaffold = {
   live_search: function(element) {
     jQuery('form.search.live input[type=search]', element).delayedObserver(function() {
      jQuery(this).parent().trigger("submit");
-    }, 0.5);
+    }, ActiveScaffold.config.live_search_delay || 0.5);
   },
   auto_paginate: function(element) {
     var paginate_link = jQuery('.active-scaffold-pagination.auto-paginate a:first', element);
@@ -453,7 +454,7 @@ var ActiveScaffold = {
   stripe: function(tbody_id) {
     var even = false;
     var rows = this.records_for(tbody_id);
-    
+
     rows.each(function (index, row_node) {
       row = jQuery(row_node);
       if (row_node.tagName != 'SCRIPT'
@@ -466,7 +467,7 @@ var ActiveScaffold = {
         else row.removeClass("even-record");
 
         even = !even;
-      }  
+      }
     });
   },
   hide_empty_message: function(tbody) {
@@ -497,7 +498,7 @@ var ActiveScaffold = {
   },
   decrement_record_count: function(scaffold) {
     // decrement the last record count, firsts record count are in nested lists
-    if (typeof(scaffold) == 'string') scaffold = '#' + scaffold; 
+    if (typeof(scaffold) == 'string') scaffold = '#' + scaffold;
     scaffold = jQuery(scaffold);
     count = scaffold.find('span.active-scaffold-records').last();
     if (count) count.html(parseInt(count.html(), 10) - 1);
@@ -512,7 +513,7 @@ var ActiveScaffold = {
   update_row: function(row, html) {
     var even_row = false;
     var replaced = null;
-    if (typeof(row) == 'string') row = '#' + row; 
+    if (typeof(row) == 'string') row = '#' + row;
     row = jQuery(row);
     if (row.hasClass('even-record')) even_row = true;
 
@@ -522,9 +523,9 @@ var ActiveScaffold = {
       ActiveScaffold.highlight(replaced);
     }
   },
-  
+
   replace: function(element, html) {
-    if (typeof(element) == 'string') element = '#' + element; 
+    if (typeof(element) == 'string') element = '#' + element;
     element = jQuery(element);
     var new_element = typeof(html) == 'string' ? jQuery.parseHTML(jQuery.trim(html), true) : html;
     new_element = jQuery(new_element);
@@ -534,9 +535,9 @@ var ActiveScaffold = {
       return new_element;
     } else return null;
   },
-  
+
   replace_html: function(element, html) {
-    if (typeof(element) == 'string') element = '#' + element; 
+    if (typeof(element) == 'string') element = '#' + element;
     element = jQuery(element);
     if (element.length) {
       element.html(html);
@@ -546,15 +547,15 @@ var ActiveScaffold = {
   },
 
   append: function(element, html) {
-    if (typeof(element) == 'string') element = '#' + element; 
+    if (typeof(element) == 'string') element = '#' + element;
     element = jQuery(element);
     element.append(html);
     element.trigger('as:element_updated');
     return element;
   },
-  
+
   remove: function(element, callback) {
-    if (typeof(element) == 'string') element = '#' + element; 
+    if (typeof(element) == 'string') element = '#' + element;
     jQuery(element).trigger('as:element_removed').remove();
     if (callback) callback();
   },
@@ -564,22 +565,22 @@ var ActiveScaffold = {
     this.replace_html(jQuery(element), value);
     jQuery(element).closest('td')[empty ? 'addClass' : 'removeClass']('empty');
   },
-  
+
   hide: function(element) {
     if (typeof(element) == 'string') element = '#' + element;
     jQuery(element).hide();
   },
-  
+
   show: function(element) {
     if (typeof(element) == 'string') element = '#' + element;
     jQuery(element).show();
   },
-  
+
   reset_form: function(element) {
     if (typeof(element) == 'string') element = '#' + element;
     jQuery(element).get(0).reset();
   },
-  
+
   disable_form: function(as_form, skip_loading_indicator) {
     if (typeof(as_form) == 'string') as_form = '#' + as_form;
     as_form = jQuery(as_form)
@@ -591,7 +592,7 @@ var ActiveScaffold = {
     // data-remote-disabled attr instead of set data because is used to in selector later
     jQuery("input:enabled,select:enabled,textarea:enabled", as_form).attr('disabled', 'disabled').attr('data-remove-disabled', true);
   },
-  
+
   enable_form: function(as_form, skip_loading_indicator) {
     if (typeof(as_form) == 'string') as_form = '#' + as_form;
     as_form = jQuery(as_form)
@@ -601,19 +602,19 @@ var ActiveScaffold = {
     jQuery('.sub-form a.destroy.disabled', as_form).removeClass('disabled');
     if (jQuery.fn.droppable) jQuery('.draggable-list', as_form).sortable('enable');
     jQuery("input[data-remove-disabled],select[data-remove-disabled],textarea[data-remove-disabled]", as_form).removeAttr('disabled data-remove-disabled');
-  },  
-  
+  },
+
   focus_first_element_of_form: function(form_element, form_selector) {
     if (typeof(form_element) == 'string') form_element = '#' + form_element;
     if (typeof(form_selector) == 'undefined') form_selector = jQuery(form_element).is('form') ? '' : 'form ';
     jQuery(form_selector + ":input:visible:first", jQuery(form_element)).focus();
   },
-    
+
   create_record_row: function(active_scaffold_id, html, options) {
     if (typeof(active_scaffold_id) == 'string') active_scaffold_id = '#' + active_scaffold_id;
     tbody = jQuery(active_scaffold_id).find('tbody.records').first();
     var new_row;
-    
+
     if (options.insert_at == 'top') {
       tbody.prepend(html);
       new_row = tbody.children('tr.record:first-child');
@@ -644,24 +645,24 @@ var ActiveScaffold = {
     this.highlight(new_row);
     new_row.trigger('as:element_created');
   },
-    
+
   create_record_row_from_url: function(action_link, url, options) {
     jQuery.get(url, function(row) {
       ActiveScaffold.create_record_row(action_link.scaffold(), row, options);
       action_link.close();
     });
   },
-  
+
   delete_record_row: function(row, page_reload_url) {
     if (typeof(row) == 'string') row = '#' + row;
     row = jQuery(row);
     var tbody = row.closest('tbody.records');
-    
+
     row.find('a.disabled').each(function() {;
       var action_link = ActiveScaffold.ActionLink.get(this);
       if (action_link) action_link.close();
     });
-    
+
     ActiveScaffold.remove(row, function() {
       ActiveScaffold.stripe(tbody);
       ActiveScaffold.decrement_record_count(tbody.closest('div.active-scaffold'));
@@ -685,7 +686,7 @@ var ActiveScaffold = {
     if (xhr) server_error.find('.error-500')[xhr.status < 500 ? 'hide' : 'show']();
     ActiveScaffold.scroll_to(server_error, ActiveScaffold.config.scroll_on_close == 'checkInViewport');
   },
-  
+
   find_action_link: function(element) {
     if (typeof(element) == 'string') element = '#' + element;
     element = jQuery(element);
@@ -704,7 +705,7 @@ var ActiveScaffold = {
     container.find('> ul').remove();
     container.append(html);
   },
-  
+
   scroll_to: function(element, checkInViewport) {
     if (typeof checkInViewport == 'undefined') checkInViewport = true;
     if (typeof(element) == 'string') element = '#' + element;
@@ -715,10 +716,10 @@ var ActiveScaffold = {
         // If it's in viewport , don't scroll;
         if (form_offset + jQuery(element).height() <= docViewBottom && form_offset >= docViewTop) return;
     }
-    
+
     jQuery(document).scrollTop(form_offset);
   },
-  
+
   process_checkbox_inplace_edit: function(checkbox, options) {
     var checked = checkbox.is(':checked'), td = checkbox.closest('td');
     if (checked === true) options['params'] += '&value=1';
@@ -740,7 +741,7 @@ var ActiveScaffold = {
       }
     });
   },
-  
+
   read_inplace_edit_heading_attributes: function(column_heading, options) {
     if (column_heading.data('ie-cancel-text')) options.cancel_button = '<button class="inplace_cancel">' + column_heading.data('ie-cancel-text') + "</button>";
     if (column_heading.data('ie-loading-text')) options.loading_text = column_heading.data('ie-loading-text');
@@ -749,21 +750,21 @@ var ActiveScaffold = {
     if (column_heading.data('ie-rows')) options.textarea_rows = column_heading.data('ie-rows');
     if (column_heading.data('ie-cols')) options.textarea_cols = column_heading.data('ie-cols');
     if (column_heading.data('ie-size')) options.text_size = column_heading.data('ie-size');
-  }, 
-  
+  },
+
   create_inplace_editor: function(span, options) {
     span.removeClass('hover');
     span.editInPlace(options);
     span.trigger('click.editInPlace');
   },
-  
+
   highlight: function(element) {
     if (typeof(element) == 'string') element = jQuery('#' + element);
     if (typeof(element.effect) == 'function') {
       element.effect("highlight", jQuery.extend({}, ActiveScaffold.config.highlight), 3000);
     }
   },
-  
+
   create_associated_record_form: function(element, content, options) {
     if (typeof(element) == 'string') element = '#' + element;
     var element = jQuery(element);
@@ -785,7 +786,7 @@ var ActiveScaffold = {
     ActiveScaffold.focus_first_element_of_form(content, '');
     content.trigger('as:element_created');
   },
-  
+
   render_form_field: function(source, content, options) {
     if (typeof(source) == 'string') source = '#' + source;
     var source = jQuery(source);
@@ -806,7 +807,7 @@ var ActiveScaffold = {
       }
     }
   },
-  
+
   record_select_onselect: function(edit_associated_url, active_scaffold_id, id){
     jQuery.ajax({
       url: edit_associated_url.replace('--ID--', id),
@@ -925,7 +926,7 @@ var ActiveScaffold = {
       }
     }
   },
-  
+
   update_column: function(element, url, send_form, source_id, val, additional_params) {
     if (!element) element = jQuery('#' + source_id);
     var as_form = element.closest('form.as_form');
@@ -975,13 +976,27 @@ var ActiveScaffold = {
       }
     });
   },
-  
+
   draggable_lists: function(selector_or_elements, parent) {
     var elements;
     if (!jQuery.fn.draggableLists) return;
     if (typeof(selector_or_elements) == 'string') elements = jQuery(selector_or_elements, parent);
     else elements = jQuery(selector_or_elements);
     elements.draggableLists();
+  },
+
+  setup_warn_changes: function() {
+    var need_confirm = false;
+    var unload_message = $('meta[name=unload-message]').val() || ActiveScaffold.config.unload_message || "Are you sure you want to navigate away? Any unsaved data will be lost.";
+    $(document).on('change input', '.active-scaffold form:not(.search) input, .active-scaffold form:not(.search) textarea, .active-scaffold form:not(.search) select', function() {
+      $(this).closest('form').addClass('need-confirm');
+    });
+    $(document).on('click', '.active-scaffold .as_cancel:not([data-remote])', function() {
+      $(this).closest('form').removeClass('need-confirm');
+    });
+    window.onbeforeunload = function() {
+      if ($('form.need-confirm').length) return unload_message;
+    }
   }
 }
 
@@ -1010,8 +1025,8 @@ String.prototype.append_params = function(params) {
   for(var key in params) {
     if (key) url += (key + '=' + params[key] + '&');
   }
-  
-  // the loop leaves a comma dangling at the end of string, chop it off 
+
+  // the loop leaves a comma dangling at the end of string, chop it off
   url = url.substring(0, url.length-1);
   return url;
 };
@@ -1026,7 +1041,7 @@ ActiveScaffold.Actions.Abstract = Class.extend({
     this.target = jQuery(target);
     this.loading_indicator = jQuery(loading_indicator);
     this.options = options;
-    var _this = this; 
+    var _this = this;
     this.links = jQuery.map(links, function(link) {
       var my_link = _this.instantiate_link(link);
       return my_link;
@@ -1090,7 +1105,7 @@ ActiveScaffold.ActionLink.Abstract = Class.extend({
   open: function(event) {
     this.tag.click();
   },
-  
+
   insert: function(content) {
     throw 'unimplemented'
   },
@@ -1137,7 +1152,7 @@ ActiveScaffold.ActionLink.Abstract = Class.extend({
   scaffold: function() {
     return this.tag.closest('div.active-scaffold');
   },
-  
+
   update_flash_messages: function(messages) {
     message_node = jQuery(this.scaffold_id().replace(/-active-scaffold/, '-messages'));
     if (message_node) message_node.html(messages);
@@ -1161,7 +1176,7 @@ ActiveScaffold.Actions.Record = ActiveScaffold.Actions.Abstract.extend({
     var l = new ActiveScaffold.ActionLink.Record(link, this.target, this.loading_indicator);
     var refresh = this.target.data('refresh');
     if (refresh) l.refresh_url = this.target.closest('.records').data('refresh-record').replace('--ID--', refresh);
-    
+
     if (l.position) {
       l.url = l.url.append_params({adapter: '_list_inline_adapter'});
       l.tag.attr('href', l.url);
@@ -1238,7 +1253,7 @@ ActiveScaffold.ActionLink.Record = ActiveScaffold.ActionLink.Abstract.extend({
       item.tag.addClass('disabled');
     });
   },
-  
+
   set_opened: function() {
     if (this.position == 'after') {
       this.set_adapter(this.target.next());