active_scaffold 3.2.7 → 3.2.8

data/CHANGELOG

@@ -1,4 +1,19 @@
-= 3.2.7 (not released)
+= 3.2.8 (not released)
+- add deprecation for update_column, update_columns should be used instead
+- fix constraints with hide_nested_column disabled in list and embedded scaffolds which are nested too
+- fix setting a hash as includes, cannot be concat in finder
+- add option to scroll on close only if element is not visible in viewport (default now)
+- fix create and edit singular associations without render_component
+- messages go across all table
+- display readonly associations in forms, it was ready to display them but it was skipping them
+- Some fixes for inplace editors (cloning form overrides, ajax and radiobuttons). Add handlers for empty columns
+- add wrap_tag to list so cells content can be wrapped in a tag for better styling
+- fix date picker parsing for datetime fields when jquery is used
+- add as:element_updated js event when replace or replace_html is called
+- rescue database exceptions so you get error messages for it insted of error 500, for example in case you forgot to check uniqueness for a unique index
+- add class attribute for displayed unauthorized columns in forms, so they get same styling
+
+= 3.2.7
 - restore missing update.persistent feature
 - fix create.persistent
 - add new record in first scaffold, not in all nested scaffolds

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

@@ -111,18 +111,23 @@ jQuery(document).ready(function() {
     ActiveScaffold.report_500_response(as_scaffold);
     return true;
   });
-  jQuery('span.in_place_editor_field').live('hover', function(event) {
-    jQuery(this).data(); // $ 1.4.2 workaround
+  jQuery('td.in_place_editor_field').live('hover', function(event) {
+    var td = jQuery(this), span = td.find('span.in_place_editor_field');
+    span.data(); // $ 1.4.2 workaround
     if (event.type == 'mouseenter') {
-      if (typeof(jQuery(this).data('editInPlace')) === 'undefined') jQuery(this).addClass("hover");
+      if (td.hasClass('empty') || typeof(span.data('editInPlace')) === 'undefined') td.find('span').addClass("hover");
      }
     if (event.type == 'mouseleave') {
-      if (typeof(jQuery(this).data('editInPlace')) === 'undefined') jQuery(this).removeClass("hover");
+      if (td.hasClass('empty') || typeof(span.data('editInPlace')) === 'undefined') td.find('span').removeClass("hover");
     }
     return true;
   });
-  jQuery('span.in_place_editor_field').live('click', function(event) {
-    ActiveScaffold.in_place_editor_field_clicked(jQuery(this));
+  jQuery('td.in_place_editor_field').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');
+    if (span.data('editInPlace')) span.trigger('click.editInPlace');
+    else ActiveScaffold.in_place_editor_field_clicked(span);
   });
   jQuery('a.as_paginate').live('ajax:before',function(event) {
     var as_paginate = jQuery(this);
@@ -201,6 +206,11 @@ jQuery(document).ready(function() {
     }
     return true;
   });
+
+  jQuery('.message a.close').live('click', function(e) {
+    ActiveScaffold.hide(jQuery(this).closest('.message'));
+    e.preventDefault();
+  });
 });
 
 /* Simple Inheritance
@@ -361,9 +371,12 @@ var ActiveScaffold = {
   },
   reload_if_empty: function(tbody, url) {
     if (this.records_for(tbody).length == 0) {
-      jQuery.getScript(url);
+      this.reload(url);
     }
   },
+  reload: function(url) {
+    jQuery.getScript(url);
+  },
   removeSortClasses: function(scaffold) {
     if (typeof(scaffold) == 'string') scaffold = '#' + scaffold;
     scaffold = jQuery(scaffold)
@@ -409,6 +422,7 @@ var ActiveScaffold = {
     if (element.attr('id')) {
       element = jQuery('#' + element.attr('id'));
     }
+    element.trigger('as:element_updated');
     return element;
   },
   
@@ -416,6 +430,7 @@ var ActiveScaffold = {
     if (typeof(element) == 'string') element = '#' + element; 
     element = jQuery(element);
     element.html(html);
+    element.trigger('as:element_updated');
     return element;
   },
   
@@ -423,6 +438,12 @@ var ActiveScaffold = {
     if (typeof(element) == 'string') element = '#' + element; 
     jQuery(element).remove();
   },
+
+  update_inplace_edit: function(element, value, empty) {
+    if (typeof(element) == 'string') element = '#' + element;
+    this.replace_html(jQuery(element), value);
+    if (empty) jQuery(element).closest('td').addClass('empty');
+  },
   
   hide: function(element) {
     if (typeof(element) == 'string') element = '#' + element;
@@ -528,15 +549,22 @@ var ActiveScaffold = {
   
   find_action_link: function(element) {
     if (typeof(element) == 'string') element = '#' + element;
-    var as_adapter = jQuery(element).closest('.as_adapter');
-    return ActiveScaffold.ActionLink.get(as_adapter);
+    element = jQuery(element);
+    return ActiveScaffold.ActionLink.get(element.is('.actions a') ? element : element.closest('.as_adapter'));
   },
   
-  scroll_to: function(element) {
+  scroll_to: function(element, checkInViewport) {
+    if (typeof checkInViewport == 'undefined') checkInViewport = true;
     if (typeof(element) == 'string') element = '#' + element;
-    var form_offset = jQuery(element).offset(),
-        destination = form_offset.top;
-    jQuery(document).scrollTop(destination);    
+    var form_offset = jQuery(element).offset().top;
+    if (checkInViewport) {
+        var docViewTop = jQuery(window).scrollTop(),
+            docViewBottom = docViewTop + jQuery(window).height();
+        // 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) {
@@ -679,11 +707,17 @@ var ActiveScaffold = {
 
   in_place_editor_field_clicked: function(span) {
     span.data(); // $ 1.4.2 workaround
+    // 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, enteredText) {
+                         if (span.data('addEmptyOnCancel')) span.closest('td').addClass('empty');
+                       }
+                     },
                      update_value: 'value'},
           csrf_param = jQuery('meta[name=csrf-param]').first(),
           csrf_token = jQuery('meta[name=csrf-token]').first(),
@@ -691,7 +725,7 @@ var ActiveScaffold = {
           column_heading = null;
 
       if(!(my_parent.is('td') || my_parent.is('th'))){
-          my_parent = span.parents('td').eq(0);
+        my_parent = span.parents('td').eq(0);
       }
 
       if (my_parent.is('td')) {
@@ -897,7 +931,7 @@ ActiveScaffold.ActionLink.Abstract = Class.extend({
     this.enable();
     this.adapter.remove();
     if (this.hide_target) this.target.show();
-    if (ActiveScaffold.config.scroll_on_close) ActiveScaffold.scroll_to(this.target);
+    if (ActiveScaffold.config.scroll_on_close) ActiveScaffold.scroll_to(this.target, ActiveScaffold.config.scroll_on_close == 'checkInViewport');
   },
 
   get_new_adapter_id: function() {
@@ -991,10 +1025,10 @@ ActiveScaffold.ActionLink.Record = ActiveScaffold.ActionLink.Abstract.extend({
   },
 
   close: function(refreshed_content) {
+    this._super();
     if (refreshed_content) {
       ActiveScaffold.update_row(this.target, refreshed_content);
     }
-    this._super();
   },
 
   enable: function() {

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

@@ -285,6 +285,7 @@ $.extend(InlineEditor.prototype, {
 	},
 	
   setInitialValue: function() {
+    if (this.settings.field_type == 'remote') return; // remote generated editor doesn't need initial value
     var initialValue = this.triggerDelegateCall('willOpenEditInPlace', this.originalValue);
     var editor = this.dom.find(':input');
     editor.val(initialValue);
@@ -312,7 +313,7 @@ $.extend(InlineEditor.prototype, {
 
     var editorNode = patternNodes.editNode.clone();
     var clonedNodes = null;
-    if (editorNode.attr('id').length > 0) editorNode.attr('id', editorNode.attr('id') + this.settings.clone_id_suffix);
+    if (editorNode.attr('id')) editorNode.attr('id', editorNode.attr('id') + this.settings.clone_id_suffix);
     editorNode.attr('name', 'inplace_value');
     editorNode.addClass('editor_field');
     this.setValue(editorNode, this.originalValue);
@@ -321,7 +322,7 @@ $.extend(InlineEditor.prototype, {
     if (patternNodes.additionalNodes) {
       patternNodes.additionalNodes.each(function (index, node) {
         var patternNode = $(node).clone();
-        if (patternNode.attr('id').length > 0) {
+        if (patternNode.attr('id')) {
           patternNode.attr('id', patternNode.attr('id') + this.settings.clone_id_suffix);
         }
         clonedNodes = clonedNodes.after(patternNode);
@@ -342,8 +343,7 @@ $.extend(InlineEditor.prototype, {
         selectedNodes = firstNode.children();
       }
       nodes.editNode = selectedNodes.first();
-      // buggy...
-      //nodes.additionalNodes = selectedNodes.find(':gt(0)');
+      nodes.additionalNodes = selectedNodes.slice(1);
     }
     return nodes;
   },
@@ -470,10 +470,10 @@ $.extend(InlineEditor.prototype, {
 		if (false === this.triggerDelegateCall('shouldCloseEditInPlace', true, anEvent))
 			return;
 
-    var editor = this.dom.find(':input:not(:button)');
+    var editor = this.dom.find(':input:not(:button)').not('input:checkbox:not(:checked)').not('input:radio:not(:checked)');
     var enteredText = '';
     if (editor.length > 1) {
-      enteredText = jQuery.map(editor.not('input:checkbox:not(:checked)'), function(item, index) {
+      enteredText = jQuery.map(editor, function(item, index) {
         return $(item).val();
       });
     } else {

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

@@ -135,14 +135,16 @@ document.observe("dom:loaded", function() {
     ActiveScaffold.report_500_response(as_scaffold);
     return true;
   });
-  document.on('mouseover', 'span.in_place_editor_field', function(event) {
-      event.findElement().addClassName('hover');
+  document.on('mouseover', 'td.in_place_editor_field', function(event) {
+      event.findElement('td.in_place_editor_field').select('span').invoke('addClassName', 'hover');
   });
-  document.on('mouseout', 'span.in_place_editor_field', function(event) {
-      event.findElement().removeClassName('hover');
+  document.on('mouseout', 'td.in_place_editor_field', function(event) {
+      event.findElement('td.in_place_editor_field').select('span').invoke('removeClassName', 'hover');
   });
-  document.on('click', 'span.in_place_editor_field', function(event) {
-    var span = event.findElement('span.in_place_editor_field');
+  document.on('click', 'td.in_place_editor_field', function(event) {
+    var td = event.findElement('td.in_place_editor_field'),
+        span = td.down('span.in_place_editor_field');
+    td.removeClassName('empty');
     
     if (typeof(span.inplace_edit) === 'undefined') {
       var options = {htmlResponse: false,
@@ -150,6 +152,7 @@ document.observe("dom:loaded", function() {
                      onLeaveHover: null,
                      onComplete: null,
                      params: '',
+                     externalControl: td.down('.handle'),
                      ajaxOptions: {method: 'post'}},
           csrf_param = $$('meta[name=csrf-param]')[0],
           csrf_token = $$('meta[name=csrf-token]')[0],
@@ -287,6 +290,10 @@ document.observe("dom:loaded", function() {
     }
     return true;
   });
+  document.on('click', '.messages a.close', function(event, element) {
+    ActiveScaffold.hide(element.up('.message'));
+    event.stop();
+  });
 });
 
 
@@ -331,13 +338,16 @@ var ActiveScaffold = {
   },
   reload_if_empty: function(tbody, url) {
     if (this.records_for(tbody).length == 0) {
-      new Ajax.Request(url, {
-        method: 'get',
-        asynchronous: true,
-        evalScripts: true
-      });
+      this.reload(url);
     }
   },
+  reload: function(url) {
+    new Ajax.Request(url, {
+      method: 'get',
+      asynchronous: true,
+      evalScripts: true
+    });
+  },
   removeSortClasses: function(scaffold) {
     scaffold = $(scaffold)
     scaffold.select('td.sorted').each(function(element) {
@@ -385,6 +395,11 @@ var ActiveScaffold = {
     $(element).remove();
   },
   
+  update_inplace_edit: function(element, value, empty) {
+    this.replace_html(element, value);
+    if (empty) $(element).up('td').addClassName('empty');
+  },
+  
   hide: function(element) {
     $(element).hide();
   },
@@ -482,10 +497,19 @@ var ActiveScaffold = {
   },
   
   find_action_link: function(element) {
-    return ActiveScaffold.ActionLink.get($(element).up('.as_adapter')); 
+    element = $(element);
+    return ActiveScaffold.ActionLink.get(element.match('.actions a') ? element : element.up('.as_adapter')); 
   },
   
-  scroll_to: function(element) {
+  scroll_to: function(element, checkInViewport) {
+    if (typeof checkInViewport == 'undefined') checkInViewport = true;
+    var form_offset = $(element).viewportOffset().top;
+    if (checkInViewport) {
+        var docViewTop = document.viewport.getScrollOffsets().top,
+            docViewBottom = docViewTop + document.viewport.getHeight();
+        // If it's in viewport , don't scroll;
+        if (form_offset + $(element).getHeight() <= docViewBottom && form_offset >= docViewTop) return;
+    }
     $(element).scrollTo();
   },
   
@@ -795,7 +819,7 @@ ActiveScaffold.ActionLink.Abstract = Class.create({
     this.enable();
     this.adapter.remove();
     if (this.hide_target) this.target.show();
-    if (ActiveScaffold.config.scroll_on_close) ActiveScaffold.scroll_to(this.target);
+    if (ActiveScaffold.config.scroll_on_close) ActiveScaffold.scroll_to(this.target, ActiveScaffold.config.scroll_on_close == 'checkInViewport');
   },
 
   get_new_adapter_id: function() {
@@ -887,10 +911,10 @@ ActiveScaffold.ActionLink.Record = Class.create(ActiveScaffold.ActionLink.Abstra
   },
 
   close: function($super, refreshed_content) {
+    $super();
     if (refreshed_content) {
       ActiveScaffold.update_row(this.target, refreshed_content);
     }
-    $super();
   },
 
   enable: function() {

data/app/assets/stylesheets/active_scaffold_layout.css

@@ -203,6 +203,12 @@ padding: 0px;
 .active-scaffold tbody.records td.empty {
 text-align: center;
 }
+.active-scaffold tbody.records td.in_place_editor_field .handle {
+display:none;
+}
+.active-scaffold tbody.records td.in_place_editor_field.empty .handle {
+display:inline;
+}
 
 .active-scaffold td.numeric,
 .active-scaffold-calculations td {
@@ -433,6 +439,7 @@ border: none;
 .active-scaffold .empty-message, .active-scaffold .filtered-message {
 padding: 4px;
 text-align: center;
+position: relative;
 }
 
 .active-scaffold .message {
@@ -444,7 +451,15 @@ margin: 2px 7px;
 line-height: 12px;
 }
 
-.active-scaffold .message a {
+.active-scaffold .filtered-message .reset {
+position: absolute;
+display: inline;
+right: 10px;
+top: 4px;
+padding: 0;
+}
+
+.active-scaffold .message a.close {
 position: absolute;
 right: 10px;
 top: 4px;
@@ -594,6 +609,14 @@ padding: 2px;
 margin-left: 5px;
 list-style: none;
 }
+.active-scaffold ol:after {
+content: '.';
+visibility: hidden;
+line-height: 0;
+height: 0;
+display: block;
+clear: both;
+}
 
 .active-scaffold p.form-footer {
 clear: both;

data/frontends/default/views/_base_form.html.erb

@@ -1,4 +1,6 @@
-<% url_options ||= params_for(:action => form_action)
+<% scope ||= nil
+   footer_extension ||= nil
+   url_options ||= params_for(:action => form_action)
    xhr = request.xhr? if xhr.nil?
    if active_scaffold_config.actions.include? form_action
      multipart ||= active_scaffold_config.send(form_action).multipart?
@@ -7,6 +9,9 @@
      multipart ||= false
      columns ||= nil
    end
+   method ||= :post
+   cancel_link = true if cancel_link.nil?
+   submit_text ||= form_action
    body_partial ||= 'form' %>
 <%=
 options = {:onsubmit => onsubmit,
@@ -29,22 +34,16 @@ end
   <h4><%= headline -%></h4>
 
   <div id="<%= element_messages_id(:action => form_action) %>" class="messages-container">
-<% if request.xhr? -%>
-    <% records = @error_records || Array(@record)
-       records.each do |record| %>
-       <%= active_scaffold_error_messages_for record, :object_name => "#{record.class.model_name.human.downcase}#{record.new_record? ? '' : ": #{record.to_label}"}" %>
-    <% end   %>
-<% else -%>
     <%= render :partial => 'form_messages' %>
-<% end -%>
   </div>
 
-  <%= render :partial => body_partial, :locals => { :columns => columns, :form_action => form_action } %>
+  <%= render :partial => body_partial, :locals => { :columns => columns, :form_action => form_action, :scope => scope } %>
 
   <p class="form-footer">
-    <%= submit_tag as_(form_action), :class => "submit" %>
+    <%= submit_tag as_(submit_text), :class => "submit" %>
     <%= link_to(as_(:cancel), main_path_to_return, cancel_options) if cancel_link %>
     <%= loading_indicator_tag(:action => form_action, :id => params[:id]) %>
+    <%= render :partial => footer_extension, :locals => { :form_action => form_action } if footer_extension %>
   </p>
 
 </form>

data/frontends/default/views/_form.html.erb

@@ -1,5 +1,8 @@
-<% subsection_id ||= nil %>
-<% show_unauthorized_columns = active_scaffold_config.send(form_action).show_unauthorized_columns %>
+<%
+  scope ||= nil
+  subsection_id ||= nil
+  show_unauthorized_columns = active_scaffold_config.send(form_action).show_unauthorized_columns
+%>
 <ol class="form" <%= "id=#{subsection_id}" unless subsection_id.nil? %> <%= "style=\"display: none;\"".html_safe if columns.collapsed %>>
   <% columns.each :for => @record, :crud_type => (:read if show_unauthorized_columns) do |column| %>
   <% authorized = show_unauthorized_columns ? @record.authorized_for?(:crud_type => form_action, :column => column.name) : true %>
@@ -8,18 +11,16 @@
     <% subsection_id = sub_section_id(:sub_section => column.label) %>
   <li class="sub-section <%= column.css_class %>">
     <h5><%= column.label %></h5>
-    <%= render :partial => 'form', :locals => { :columns => column, :subsection_id => subsection_id, :form_action => form_action } %>
+    <%= render :partial => 'form', :locals => { :columns => column, :subsection_id => subsection_id, :form_action => form_action, :scope => scope } %>
     <%= link_to_visibility_toggle(subsection_id, {:default_visible => !column.collapsed}) -%>
   </li>
-  <% elsif column.readonly_association?
-    next %>
   <% elsif renders_as == :subform and !override_form_field?(column) and authorized -%>
   <li class="sub-form <%= active_scaffold_config_for(column.association.klass).subform.layout %>-sub-form <%= column.css_class unless column.css_class.nil? || column.css_class.is_a?(Proc) %> <%=column.name%>-sub-form" id="<%= sub_form_id(:association => column.name) %>">
-    <%=raw render :partial => form_partial_for_column(column, renders_as), :locals => { :column => column } -%>
+    <%=raw render :partial => form_partial_for_column(column, renders_as), :locals => { :column => column, :scope => scope } -%>
   </li>
   <% else -%>
   <li class="form-element <%= 'required' if column.required? %> <%= column.css_class unless column.css_class.nil? || column.css_class.is_a?(Proc) %>">
-    <%=raw render :partial => form_partial_for_column(column, renders_as), :locals => { :column => column, :only_value => !authorized } -%>
+    <%=raw render :partial => form_partial_for_column(column, renders_as), :locals => { :column => column, :only_value => !authorized, :scope => scope } -%>
   </li>
   <% end -%>
   <% end -%>