active_scaffold 3.2.11 → 3.2.12

data/CHANGELOG

@@ -1,8 +1,29 @@
-= 3.2.10 (not released yet)
+= 3.2.12 (not released yet)
+- improve support for tableless models, add support for count
+- fix div id for nested scaffolds
+- add config.timestamped_messages and config.highlight_messages
+- Improve performance using class to check authorization for plural associations which are not loaded, and avoiding to load associations if it's not needed
+- Fix using a scope in main form, it wasn't working for associations (for create multiple from active_scaffold_batch)
+- Fix searches with no results, it was loading first page without conditions
+- Allow to change highlight options with ActiveScaffold.js_config
+- allow to override column count calculation for colspan
+- Remove conditions_from_params from nested links
+- Fix nested forms for singular associations
+- enable to get constraints in helpers, so can be used in options_for_association_conditions, for example
+- Allow to edit has_one :through association in nested forms
+- Fix cancan bridge broken in a previous release
+- Fix mark action
+
+= 3.2.11
+- improve support for tableless models and active_scaffold_batch
+- fix count includes which were broken in 3.2.9
+- remove duplicated conditions in nested scaffolds, added by conditions_from_params
+
+= 3.2.10
 - fix nested scaffolds with update action disabled
 - initial work for tableless support (index with limited options)
 - fix scrolling on closing nested scaffolds
-- fix calculations and count includes which were broken in 3.2.9
+- fix calculations which were broken in 3.2.9
 
 = 3.2.9
 - remove duplicated conditions with constraints

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

@@ -1,7 +1,7 @@
 jQuery(document).ready(function() {
   jQuery('form.as_form').live('ajax:beforeSend', function(event) {
     var as_form = jQuery(this).closest("form");
-    if (as_form && as_form.attr('data-loading') == 'true') {
+    if (as_form.attr('data-loading') == 'true') {
       ActiveScaffold.disable_form(as_form);
     }
     return true;
@@ -9,19 +9,19 @@ jQuery(document).ready(function() {
   
   jQuery('form.as_form').live('ajax:complete', function(event) {
     var as_form = jQuery(this).closest("form");
-    if (as_form && as_form.attr('data-loading') == 'true') {
+    if (as_form.attr('data-loading') == 'true') {
       ActiveScaffold.enable_form(as_form);
     }
   });
   jQuery('form.as_form').live('ajax:error', function(event, xhr, status, error) {
     var as_div = jQuery(this).closest("div.active-scaffold");
-    if (as_div) {
-      ActiveScaffold.report_500_response(as_div)
+    if (as_div.length) {
+      ActiveScaffold.report_500_response(as_div);
     }
   });
   jQuery('form.as_form.as_remote_upload').live('submit', function(event) {
     var as_form = jQuery(this).closest("form");
-    if (as_form && as_form.attr('data-loading') == 'true') {
+    if (as_form.attr('data-loading') == 'true') {
       setTimeout("ActiveScaffold.disable_form('" + as_form.attr('id') + "')", 10);
     }
     return true;
@@ -122,7 +122,7 @@ jQuery(document).ready(function() {
     }
     return true;
   });
-  jQuery('td.in_place_editor_field').live('click', function(event) {
+  jQuery('td.in_place_editor_field, th.as_marked-column_heading').live('click', function(event) {
     var span = jQuery(this).find('span.in_place_editor_field');
     span.data('addEmptyOnCancel', jQuery(this).hasClass('empty'));
     jQuery(this).removeClass('empty');
@@ -418,12 +418,10 @@ var ActiveScaffold = {
   replace: function(element, html) {
     if (typeof(element) == 'string') element = '#' + element; 
     element = jQuery(element);
-    element.replaceWith(html);
-    if (element.attr('id')) {
-      element = jQuery('#' + element.attr('id'));
-    }
-    element.trigger('as:element_updated');
-    return element;
+    var new_element = jQuery(html);
+    element.replaceWith(new_element);
+    new_element.trigger('as:element_updated');
+    return new_element;
   },
   
   replace_html: function(element, html) {
@@ -541,8 +539,10 @@ var ActiveScaffold = {
   },
 
   report_500_response: function(active_scaffold_id) {
-    server_error = jQuery(active_scaffold_id).find('td.messages-container p.server-error');
-    if (!jQuery(server_error).is(':visible')) {
+    var server_error = jQuery(active_scaffold_id).find('td.messages-container p.server-error').first();
+    if (server_error.is(':visible')) {
+      ActiveScaffold.highlight(server_error);
+    } else {
       server_error.show();
     }
   },
@@ -585,13 +585,13 @@ var ActiveScaffold = {
   },
   
   read_inplace_edit_heading_attributes: function(column_heading, options) {
-    if (column_heading.attr('data-ie_cancel_text')) options.cancel_button = '<button class="inplace_cancel">' + column_heading.attr('data-ie_cancel_text') + "</button>";
-    if (column_heading.attr('data-ie_loading_text')) options.loading_text = column_heading.attr('data-ie_loading_text');
-    if (column_heading.attr('data-ie_saving_text')) options.saving_text = column_heading.attr('data-ie_saving_text');
-    if (column_heading.attr('data-ie_save_text')) options.save_button = '<button class="inplace_save">' + column_heading.attr('data-ie_save_text') + "</button>";
-    if (column_heading.attr('data-ie_rows')) options.textarea_rows = column_heading.attr('data-ie_rows');
-    if (column_heading.attr('data-ie_cols')) options.textarea_cols = column_heading.attr('data-ie_cols');
-    if (column_heading.attr('data-ie_size')) options.text_size = column_heading.attr('data-ie_size');
+    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');
+    if (column_heading.data('ie-saving-text')) options.saving_text = column_heading.data('ie-saving-text');
+    if (column_heading.data('ie-save-text')) options.save_button = '<button class="inplace_save">' + column_heading.data('ie-save-text') + "</button>";
+    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) {
@@ -603,7 +603,7 @@ var ActiveScaffold = {
   highlight: function(element) {
     if (typeof(element) == 'string') element = jQuery('#' + element);
     if (typeof(element.effect) == 'function') {
-      element.effect("highlight", {}, 3000);
+      element.effect("highlight", jQuery.extend({}, ActiveScaffold.config.highlight), 3000);
     }
   },
   
@@ -659,7 +659,7 @@ var ActiveScaffold = {
   sortable: function(element, controller, options, url_params) {
     if (typeof(element) == 'string') element = '#' + element;
     var element = jQuery(element);
-    var sortable_options = {};
+    var sortable_options = jQuery.extend({}, options);
     if (options.update === true) {
       url_params.authenticity_token = jQuery('meta[name=csrf-param]').attr('content');
       sortable_options.update = function(event, ui) {
@@ -684,19 +684,21 @@ var ActiveScaffold = {
   mark_records: function(element, options) {
     if (typeof(element) == 'string') element = '#' + element;
     var element = jQuery(element);
-    var mark_checkboxes = jQuery('#' + element.attr('id') + ' > tr.record td.marked-column input[type="checkbox"]');
-    mark_checkboxes.each(function (index) {
-      var item = jQuery(this);
-     if(options.checked === true) {
-       item.attr('checked', 'checked');
-     } else {
-       item.removeAttr('checked');
-     }
-     item.attr('value', ('' + !options.checked));
-    });
-    if(options.include_mark_all === true) {
-      var mark_all_checkbox = element.prev('thead').find('th.marked-column_heading span input[type="checkbox"]');
-      if(options.checked === true) {
+    if (options.include_checkboxes) {
+      var mark_checkboxes = jQuery('#' + element.attr('id') + ' > tr.record td.as_marked-column input[type="checkbox"]');
+      mark_checkboxes.each(function (index) {
+        var item = jQuery(this);
+        if(options.checked) {
+          item.attr('checked', 'checked');
+        } else {
+          item.removeAttr('checked');
+        }
+        item.attr('value', ('' + !options.checked));
+      });
+    }
+    if(options.include_mark_all) {
+      var mark_all_checkbox = element.prevAll('thead').find('th.as_marked-column_heading span input[type="checkbox"]');
+      if(options.checked) {
         mark_all_checkbox.attr('checked', 'checked');
       } else {
         mark_all_checkbox.removeAttr('checked');
@@ -735,16 +737,16 @@ var ActiveScaffold = {
         column_heading = my_parent;
       }
 
-      var render_url = column_heading.attr('data-ie_render_url'),
-          mode = column_heading.attr('data-ie_mode'),
-          record_id = span.attr('data-ie_id');
+      var render_url = column_heading.data('ie-render-url'),
+          mode = column_heading.data('ie-mode'),
+          record_id = span.data('ie-id') || '';
 
       ActiveScaffold.read_inplace_edit_heading_attributes(column_heading, options);
 
-      if (span.attr('data-ie_url')) {
-        options.url = span.attr('data-ie_url').replace(/__id__/, record_id);
+      if (span.data('ie-url')) {
+        options.url = span.data('ie-url').replace(/__id__/, record_id);
       } else {
-        options.url = column_heading.attr('data-ie_url').replace(/__id__/, record_id);
+        options.url = column_heading.data('ie-url').replace(/__id__/, record_id);
       }
 
       if (csrf_param) options['params'] = csrf_param.attr('content') + '=' + csrf_token.attr('content');
@@ -764,7 +766,7 @@ var ActiveScaffold = {
 
       if (render_url) {
         var plural = false;
-        if (column_heading.attr('data-ie_plural')) plural = true;
+        if (column_heading.data('ie-plural')) plural = true;
         options.field_type = 'remote';
         options.editor_url = render_url.replace(/__id__/, record_id)
       }
@@ -1024,10 +1026,17 @@ ActiveScaffold.ActionLink.Record = ActiveScaffold.ActionLink.Abstract.extend({
     ActiveScaffold.highlight(this.adapter.find('td'));
   },
 
-  close: function(refreshed_content) {
+  close: function(refreshed_content_or_reload) {
     this._super();
-    if (refreshed_content) {
-      ActiveScaffold.update_row(this.target, refreshed_content);
+    if (refreshed_content_or_reload) {
+      if (typeof refreshed_content_or_reload == 'string') {
+        ActiveScaffold.update_row(this.target, refreshed_content_or_reload);
+      } else if (this.refresh_url) {
+        var target = this.target;
+        jQuery.get(this.refresh_url, function(e, status, response) {
+          ActiveScaffold.update_row(target, response.responseText);
+        });
+      }
     }
   },
 

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

@@ -170,18 +170,18 @@ document.observe("dom:loaded", function() {
         column_heading = my_parent;
       }
           
-      var render_url = column_heading.readAttribute('data-ie_render_url'),
-          mode = column_heading.readAttribute('data-ie_mode'),
-          record_id = span.readAttribute('data-ie_id');
+      var render_url = column_heading.readAttribute('data-ie-render-url'),
+          mode = column_heading.readAttribute('data-ie-mode'),
+          record_id = span.readAttribute('data-ie-id') || '';
         
       ActiveScaffold.read_inplace_edit_heading_attributes(column_heading, options);
       
-      if (span.readAttribute('data-ie_url')) {
-        options.url = span.readAttribute('data-ie_url');
+      if (span.readAttribute('data-ie-url')) {
+        options.url = span.readAttribute('data-ie-url');
       } else {
-        options.url = column_heading.readAttribute('data-ie_url');
+        options.url = column_heading.readAttribute('data-ie-url');
       }
-      if (record_id) options.url = options.url.sub('__id__', record_id);
+      options.url = options.url.sub('__id__', record_id);
        
       if (csrf_param) options['params'] = csrf_param.readAttribute('content') + '=' + csrf_token.readAttribute('content');
 
@@ -200,7 +200,7 @@ document.observe("dom:loaded", function() {
       
       if (render_url) {
         var plural = false;
-        if (column_heading.readAttribute('data-ie_plural')) plural = true;
+        if (column_heading.readAttribute('data-ie-plural')) plural = true;
         options['onFormCustomization'] = new Function('element', 'form', 'element.setFieldFromAjax(' + "'" + render_url.sub('__id__', record_id) + "', {plural: " + plural + '});');
       }
       
@@ -375,7 +375,7 @@ var ActiveScaffold = {
     row = $(row);
     var new_row = this.replace(row, html)
     if (row.hasClassName('even-record')) new_row.addClassName('even-record');
-    new_row.highlight();
+    ActiveScaffold.highlight(new_row);
   },
   
   replace: function(element, html) {
@@ -451,7 +451,7 @@ var ActiveScaffold = {
     this.stripe(tbody);
     this.hide_empty_message(tbody);
     this.increment_record_count(tbody.up('div.active-scaffold'));
-    new_row.highlight();
+    ActiveScaffold.highlight(new_row);
   },
   
   delete_record_row: function(row, page_reload_url) {
@@ -488,9 +488,9 @@ var ActiveScaffold = {
   },
 
   report_500_response: function(active_scaffold_id) {
-    server_error = $(active_scaffold_id).down('td.messages-container p.server-error');
+    var server_error = $(active_scaffold_id).down('td.messages-container p.server-error');
     if (server_error.visible()) {
-      server_error.highlight();
+      ActiveScaffold.highlight(server_error);
     } else {
       server_error.show();
     }
@@ -530,13 +530,13 @@ var ActiveScaffold = {
   },
   
   read_inplace_edit_heading_attributes: function(column_heading, options) {
-    if (column_heading.readAttribute('data-ie_cancel_text')) options.cancelText = column_heading.readAttribute('data-ie_cancel_text');
-    if (column_heading.readAttribute('data-ie_loading_text')) options.loadingText = column_heading.readAttribute('data-ie_loading_text');
-    if (column_heading.readAttribute('data-ie_saving_text')) options.savingText = column_heading.readAttribute('data-ie_saving_text');
-    if (column_heading.readAttribute('data-ie_save_text')) options.okText = column_heading.readAttribute('data-ie_save_text');
-    if (column_heading.readAttribute('data-ie_rows')) options.rows = column_heading.readAttribute('data-ie_rows');
-    if (column_heading.readAttribute('data-ie_cols')) options.cols = column_heading.readAttribute('data-ie_cols');
-    if (column_heading.readAttribute('data-ie_size')) options.size = column_heading.readAttribute('data-ie_size');
+    if (column_heading.readAttribute('data-ie-cancel-text')) options.cancelText = column_heading.readAttribute('data-ie-cancel-text');
+    if (column_heading.readAttribute('data-ie-loading-text')) options.loadingText = column_heading.readAttribute('data-ie-loading-text');
+    if (column_heading.readAttribute('data-ie-saving-text')) options.savingText = column_heading.readAttribute('data-ie-saving-text');
+    if (column_heading.readAttribute('data-ie-save-text')) options.okText = column_heading.readAttribute('data-ie-save-text');
+    if (column_heading.readAttribute('data-ie-rows')) options.rows = column-heading.readAttribute('data-ie-rows');
+    if (column_heading.readAttribute('data-ie-cols')) options.cols = column-heading.readAttribute('data-ie-cols');
+    if (column_heading.readAttribute('data-ie-size')) options.size = column-heading.readAttribute('data-ie-size');
   }, 
   
   create_inplace_editor: function(span, options) {
@@ -610,18 +610,20 @@ var ActiveScaffold = {
   // element is tbody id
   mark_records: function(element, options) {
     var element = $(element);
-    var mark_checkboxes = $$('#' + element.readAttribute('id') + ' > tr.record td.marked-column input[type="checkbox"]');
-    mark_checkboxes.each(function(item) {
-     if(options.checked === true) {
-       item.writeAttribute({ checked: 'checked' });
-     } else {
-       item.removeAttribute('checked');
-     }
-     item.writeAttribute('value', ('' + !options.checked));
-    });
-    if(options.include_mark_all === true) {
+    if (options.include_checkboxes) {
+      var mark_checkboxes = $$('#' + element.readAttribute('id') + ' > tr.record td.marked-column input[type="checkbox"]');
+      mark_checkboxes.each(function(item) {
+       if(options.checked) {
+         item.writeAttribute({ checked: 'checked' });
+       } else {
+         item.removeAttribute('checked');
+       }
+       item.writeAttribute('value', ('' + !options.checked));
+      });
+    }
+    if(options.include_mark_all) {
       var mark_all_checkbox = element.previous('thead').down('th.marked-column_heading span input[type="checkbox"]');
-      if(options.checked === true) {
+      if(options.checked) {
         mark_all_checkbox.writeAttribute({ checked: 'checked' }); 
       } else {
         mark_all_checkbox.removeAttribute('checked');
@@ -668,6 +670,13 @@ var ActiveScaffold = {
   
   draggable_lists: function(element) {
     new DraggableLists(element);
+  },
+
+  highlight: function(element) {
+    element = $(element);
+    if (typeof(element.highlight) == 'function') {
+      element.highlight(Object.extend({duration: 3}, ActiveScaffold.config.highlight));
+    }
   }
 }
 
@@ -907,13 +916,23 @@ ActiveScaffold.ActionLink.Record = Class.create(ActiveScaffold.ActionLink.Abstra
     else {
       return false;
     }
-    this.adapter.down('td').down().highlight();
+    ActiveScaffold.highlight(this.adapter.down('td').down());
   },
 
-  close: function($super, refreshed_content) {
+  close: function($super, refreshed_content_or_reload) {
     $super();
-    if (refreshed_content) {
-      ActiveScaffold.update_row(this.target, refreshed_content);
+    if (refreshed_content_or_reload) {
+      if (typeof refreshed_content_or_reload == 'string') {
+        ActiveScaffold.update_row(this.target, refreshed_content_or_update);
+      } else if (this.refresh_url) {
+        var target = this.target;
+        new Ajax.Request(this.refresh_url, {
+          method: 'get',
+          onComplete: function(response) {
+            ActiveScaffold.update_row(target, response.responseText);
+          }
+        });
+      }
     }
   },
 
@@ -965,7 +984,7 @@ ActiveScaffold.ActionLink.Table = Class.create(ActiveScaffold.ActionLink.Abstrac
     else {
       throw 'Unknown position "' + this.position + '"'
     }
-    this.adapter.down('td').down().highlight();
+    ActiveScaffold.highlight(this.adapter.down('td').down());
   },
 
   reload: function() {

data/app/assets/stylesheets/active_scaffold_layout.css

@@ -450,6 +450,10 @@ position: relative;
 margin: 2px 7px;
 line-height: 12px;
 }
+.active-scaffold .message .timestamp,
+.active-scaffold .message .message-content {
+display: inline;
+}
 
 .active-scaffold .filtered-message .reset {
 position: absolute;

data/config/locales/de.yml

@@ -31,8 +31,10 @@ de:
     filtered: '(Gefiltert)'
     found: 'Gefunden'
     hide: 'Verstecken'
+    inplace_edit_handle: '--'
     live_search: 'Live-Suche'
     loading: 'Lade…'
+    mark_all_records: "Mark all"
     next: 'Vor'
     no_entries: 'Keine Einträge'
     no_options: 'Keine Optionen'
@@ -41,6 +43,9 @@ de:
     pdf: 'PDF'
     previous: 'Zurück'
     print: 'Drucken'
+    records_marked:
+      one: "1 marked %{model}"
+      other: "%{count} marked %{model}"
     refresh: 'Neu laden'
     remove: 'Entfernen'
     remove_file: 'Entferne oder Ersetze Datei'

data/config/locales/en.yml

@@ -31,8 +31,10 @@ en:
     filtered: '(Filtered)'
     found: 'Found'
     hide: 'Hide'
+    inplace_edit_handle: '--'
     live_search: 'Live Search'
     loading: 'Loading…'
+    mark_all_records: "Mark all"
     next: 'Next'
     no_entries: 'No Entries'
     no_options: 'no options'
@@ -41,6 +43,9 @@ en:
     pdf: 'PDF'
     previous: 'Previous'
     print: 'Print'
+    records_marked:
+      one: "1 marked %{model}"
+      other: "%{count} marked %{model}"
     refresh: 'Refresh'
     remove: 'Remove'
     remove_file: 'Remove or Replace file'

data/config/locales/es.yml

@@ -31,8 +31,10 @@ es:
       one: 'encontrado'
       other: 'encontrados'
     hide: 'Ocultar'
+    inplace_edit_handle: '--'
     live_search: 'Buscar en Vivo'
     loading: 'Cargando…'
+    mark_all_records: "Seleccionar todos"
     nested_for_model: '%{nested_model} de %{parent_model}'
     nested_of_model: '%{nested_model} de %{parent_model}'
     next: 'Siguiente'
@@ -43,6 +45,9 @@ es:
     pdf: 'PDF'
     previous: 'Anterior'
     print: 'Imprimir'
+    records_marked:
+      one: "1 %{model} seleccionado"
+      other: "%{count} %{model} seleccionados"
     refresh: 'Recargar'
     remove: 'Eliminar'
     remove_file: 'Eliminar o Reemplazar archivo'