active_scaffold 3.5.5 → 3.6.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55227fba8c77ac9fa4c3c93fb5b482cc92dd767d07f57611863a98f8e8488e54
-  data.tar.gz: ac8a1a22b165658cacb056d56bf3646ce94d93765059f1f113ad3bd68ee37997
+  metadata.gz: 089ef264fed67a42513f1317c4db56ccd736fdf9f57aeffcc469e9c672987c10
+  data.tar.gz: 7c2a738e0396d7644e873424e529543df14ea8336fbb26c6297670232dfa6903
 SHA512:
-  metadata.gz: 49048946d6223c2f8d15ff44d990856ca3c4bb24660abf45170ecd66f0a4f95687f94e0a13f393914d08d4220556da7ff598210a8570dfd70840e68f325e8793
-  data.tar.gz: 91ebe94b8625eae16f22dc705e14fbfaf58723845ba1f3264a89ebfa30d6cc4eb121203d659e226f55d6747c8812318c59ba535629beb3f9c6cafcc896f7b38a
+  metadata.gz: a23bf85f720e929a7da5ad87a92c6140ec584346f24a9d2a94db1a0bf82033cd556ec971ec2dfe50346cdb9d248e1b34c0675003c224a6a0ab29185008f4bb92
+  data.tar.gz: a72a0ad55518d03a44ae9f98cca0f9236369c55e5e2924673597712b0cadbddf9bea7a4424d9248215b32e51366845962469dce775ec7db7a903d6e73790037b

data/CHANGELOG

@@ -1,5 +1,20 @@
-= 3.5.5
-- Fix creating new records, when using cancan and allowing access based on id (fixes #617)
+= 3.6.0.pre
+- Added threadsafety as tech preview, enabled with ActiveScaffold.threadsafe! in initializer.
+- Added active_scaffold_config.build_action_columns method to easily create action columns for custom form actions.
+- Replaced each(options) with each_column(options) in ActionColumns
+- Replaced collect_visible(options, &proc) with visible_columns(options).map(&proc) in ActionColumns
+- Replaced names with visible_columns_names in ActionColumns
+- Replaced names_without_auth_check with to_a in ActionColumns
+- Support rails 5.2, drop support for 4.0 and 4.1
+- Require ruby 2.3.1, drop support for 2.0, 2.1 and 2.2.
+- Fix has_one/belongs_to nested for polymorphic associations, leave rails to build conditions from {assoc_name: record} hash
+- Cast blank into nil for null string columns in conditions_from_params
+- Support multipart with iframe in process_action_link_action default response
+- Fix hidding and showing columns based on permissions with update_columns on subforms
+- Fix subform crud in subform subgroup, when form is on nested scaffold
+- Fix JS when rails-ujs is used instead of jquery_ujs (rails >= 5.1)
+- Display flash messages only inside create form, when conf.list.always_show_create is enabled, instead of displaying twice (in form and above list).
+- Fix default autocomplete value for password form_ui, new-password has to be used because off is ignored by browsers in password fields now
 
 = 3.5.4
 - Fix chosen form_ui for plural associations
@@ -57,6 +72,7 @@
 - fix display of association in list when association_limit is nil
 - fix conversion of i18n date and datetime value, some abbr day and month may be equal in some languages
 - fix hidden form_ui for collection associations (has_many, habtm)
+- Drop rails 3.2.x and ruby 1.9 support
 
 = 3.4.43
 - Fix human conditions for date and datetime columns, not using date picker

data/README.md

@@ -8,10 +8,11 @@ Overview
 [![Inline docs](https://inch-ci.org/github/activescaffold/active_scaffold.svg?branch=master)](https://inch-ci.org/github/activescaffold/active_scaffold)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 
-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 >= 4.0.5 and < 5.2 is supported, ruby >= 2.1 supported, although it should work with ruby >= 2.0.0, it's too old and not tested. Ruby < 2.0.0 won't work.
+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 >= 4.2.0 is supported, ruby >= 2.3 required.
 
 Branch Details
 --------------
+3-5-stable supports rails >= 4.0.x and ruby >= 2.0.0  
 3-4-stable supports rails >= 3.2.x and ruby >= 1.9.3  
 3-3-stable supports rails >= 3.2.x and ruby >= 1.8  
 rails-3.2 supports Rails 3.1 & 3.2, and is the current source of the 3.2.x line of gems.
@@ -24,28 +25,37 @@ Added to Gemfile
 
     gem 'active_scaffold'
 
-For rails >= 5.1, add
+For rails >= 5.1, add jquery to application.js before rails-ujs (with jquery-rails), or load jquery in your layout before application.js using CDN (e.g. jquery-rails-cdn). You can replace rails-ujs with jquery_ujs, although rails-ujs should work (never load both).
+
+    //= require jquery
 
     gem 'jquery-rails'
 
-Run the following commands
+Run the following commands, for rails 4.2
 
     bundle install
     rails g active_scaffold:install
     bundle exec rake db:create
-    rails g active_scaffold:resource User name:string
+    rails g active_scaffold:resource Model [attrs]
     bundle exec rake db:migrate
     
-Commands for Rails 5
+Or run the following commands, for rails 5
 
     bundle install
     rails g active_scaffold:install
     rails db:create
-    rails g active_scaffold:resource User name:string
+    rails g active_scaffold:resource Model [attrs]
     rails db:migrate
     
 
-Run the app and visit localhost:3000/users
+Run the app and visit localhost:3000/<plural_model>
+
+Threadsafe
+----------
+
+Threadsafe can be enabled calling ActiveScaffold.threadsafe! in an initializer.
+ It should be enabled on app start and it can't be disabled. Threadsafety is a
+ new feature and not well tested yet.  
 
 Configuration
 -------------

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

@@ -61,6 +61,11 @@ jQuery(document).ready(function($) {
     if (e.keyCode == 13) e.preventDefault();
   });
   jQuery(document).on('ajax:error', 'form.as_form', function(event, xhr, status, error) {
+    if (event.detail && !xhr) {
+      error = event.detail[0];
+      status = event.detail[1];
+      xhr = event.detail[2];
+    }
     var as_div = jQuery(this).closest("div.active-scaffold");
     if (as_div.length) {
       ActiveScaffold.report_500_response(as_div, xhr);
@@ -86,6 +91,7 @@ jQuery(document).ready(function($) {
     return true;
   });
   jQuery(document).on('ajax:success', 'a.as_action', function(event, response) {
+    if (event.detail && !response) response = event.detail[0];
     var action_link = ActiveScaffold.ActionLink.get(jQuery(this));
     if (action_link) {
       if (action_link.position) {
@@ -105,6 +111,11 @@ jQuery(document).ready(function($) {
     return true;
   });
   jQuery(document).on('ajax:error', 'a.as_action', function(event, xhr, status, error) {
+    if (event.detail && !xhr) {
+      error = event.detail[0];
+      status = event.detail[1];
+      xhr = event.detail[2];
+    }
     var action_link = ActiveScaffold.ActionLink.get(jQuery(this));
     if (action_link) {
       ActiveScaffold.report_500_response(action_link.scaffold_id(), xhr);
@@ -139,6 +150,11 @@ jQuery(document).ready(function($) {
     return true;
   });
   jQuery(document).on('ajax:error', 'a.as_cancel', function(event, xhr, status, error) {
+    if (event.detail && !xhr) {
+      error = event.detail[0];
+      status = event.detail[1];
+      xhr = event.detail[2];
+    }
     var action_link = ActiveScaffold.find_action_link(jQuery(this));
     if (action_link) {
       ActiveScaffold.report_500_response(action_link.scaffold_id(), xhr);
@@ -151,6 +167,11 @@ jQuery(document).ready(function($) {
     return true;
   });
   jQuery(document).on('ajax:error', 'a.as_sort', function(event, xhr, status, error) {
+    if (event.detail && !xhr) {
+      error = event.detail[0];
+      status = event.detail[1];
+      xhr = event.detail[2];
+    }
     var as_scaffold = jQuery(this).closest('.active-scaffold');
     ActiveScaffold.report_500_response(as_scaffold, xhr);
     jQuery(this).closest('th').removeClass('loading');
@@ -179,6 +200,11 @@ jQuery(document).ready(function($) {
     return true;
   });
   jQuery(document).on('ajax:error', 'a.as_paginate', function(event, xhr, status, error) {
+    if (event.detail && !xhr) {
+      error = event.detail[0];
+      status = event.detail[1];
+      xhr = event.detail[2];
+    }
     var as_scaffold = jQuery(this).closest('.active-scaffold');
     ActiveScaffold.report_500_response(as_scaffold, xhr);
     return true;
@@ -1311,8 +1337,8 @@ ActiveScaffold.ActionLink.Record = ActiveScaffold.ActionLink.Abstract.extend({
         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);
+        jQuery.get(this.refresh_url, function(e, status, xhr) {
+          ActiveScaffold.update_row(target, xhr.responseText);
         });
       }
     }

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

@@ -17,7 +17,7 @@
    submit_text ||= form_action
    apply_text ||= :"#{form_action}_apply"
    body_partial ||= 'form'
-   form_id = element_form_id(:action => form_action, :id => @record.try(:id))
+   form_id = element_form_id(action: form_action, id: @record&.id)
 %>
 <%=
 options = {:id => form_id,
@@ -54,7 +54,7 @@ end
     <%= submit_tag as_(submit_text), :class => "submit" if !persistent || persistent == :optional %>
     <%= submit_tag as_(apply_text), :class => "submit", :name => 'dont_close' if persistent %>
     <%= link_to(as_(:cancel), main_path_to_return, cancel_options) if cancel_link %>
-    <%= loading_indicator_tag(:action => form_action, :id => @record.try(:id)) %>
+    <%= loading_indicator_tag(action: form_action, id: @record&.id) %>
     <%= render :partial => footer_extension, :locals => { :form_action => form_action } if footer_extension %>
   </p>
 

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

@@ -4,7 +4,7 @@
   show_unauthorized_columns = active_scaffold_config.send(form_action).show_unauthorized_columns if active_scaffold_config.actions.include? form_action
 %>
 <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| %>
+  <% columns.each_column(for: @record, crud_type: (:read if show_unauthorized_columns)) do |column| %>
   <% column_css_class = column.css_class unless column.css_class.nil? || column.css_class.is_a?(Proc) %>
   <% renders_as = column_renders_as(column) %>
   <% authorized = show_unauthorized_columns || renders_as == :subsection ? @record.authorized_for?(:crud_type => form_action, :column => column.name) : true %>

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

@@ -13,8 +13,9 @@ return unless show_add_new or show_add_existing
 temporary_id = generated_id(parent_record) if parent_record.new_record?
 controller_path = active_scaffold_controller_for(parent_record.class).controller_path
 parent_controller = (main_form_controller || controller).controller_path
-edit_associated_url = params_for(:controller => controller_path, :action => 'edit_associated', :child_association => column.name, :associated_id => '--ID--', :scope => scope, :id => parent_record.to_param, :generated_id => temporary_id, :parent_controller => parent_controller) if show_add_existing
-add_new_url = params_for(:controller => controller_path, :action => 'edit_associated', :child_association => column.name, :scope => scope, :id => parent_record.to_param, :generated_id => temporary_id, :parent_controller => parent_controller) if show_add_new
+url_options = {:controller => controller_path, :action => 'edit_associated', :child_association => column.name, :scope => scope, :id => parent_record.to_param, :generated_id => temporary_id, :parent_controller => parent_controller}
+edit_associated_url = params_for(url_options.merge(:associated_id => '--ID--')) if show_add_existing
+add_new_url = params_for(url_options) if show_add_new
 
 -%>
 <div class="footer-wrapper">

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

@@ -40,9 +40,9 @@
   <% end %>
   <% end %>
   <%= content_tag row_tag, :id => tr_id, :class => "association-record#{' association-record-new' if record.new_record?}#{' locked' if locked}" do %>
-  <% config.subform.columns.each :for => record.class, :crud_type => :read, :flatten => flatten do |column| %>
+  <% config.subform.columns.each_column(for: record.class, crud_type: :read, flatten: flatten) do |column| %>
   <%
-    if column.respond_to? :each
+    if column.respond_to? :each_column
       columns_groups << column
       next
     end
@@ -51,8 +51,8 @@
     columns_length += 1
     show_actions = true
     if column.association && column.form_ui.nil?
-      column = column.clone
-      column.form_ui ||= :select
+      column = column.dup unless ActiveScaffold.threadsafe
+      column.form_ui = :select
     end
 
     col_class = default_col_class.clone
@@ -80,10 +80,10 @@
   <% end -%>
   <% end %>
 
-  <% columns_groups.each do |column| %>
+  <% columns_groups.each do |columns_group| %>
   <%= content_tag row_tag, :class => 'associated-record' do %>
     <%= content_tag column_tag, :colspan => (columns_length if column_tag == :td) do %>
-    <% column.each :for => record.class, :crud_type => :read, :flatten => true do |col| %>
+    <% columns_group.each_column(for: record.class, crud_type: :read, flatten: true) do |col| %>
       <%= active_scaffold_render_subform_column(col, scope, crud_type, readonly, true, record) %>
     <% end %>
     <% end %>

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

@@ -1,4 +1,4 @@
-<table id="<%= sub_form_list_id(:association => column.name, :id => parent_record.try(:id) || generated_id(parent_record) || 99999999999) %>">
+<table id="<%= sub_form_list_id(association: column.name, id: parent_record&.id || generated_id(parent_record) || 99999999999) %>">
 <%
   header_record_class = (show_blank_record && show_blank_record.class) || column.association.klass
 -%>

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

@@ -1,7 +1,7 @@
 <thead>
   <tr>
     <%
-    active_scaffold_config_for(record_class).subform.columns.each :for => record_class, :crud_type => :read do |column|
+    active_scaffold_config_for(record_class).subform.columns.each_column(for: record_class, crud_type: :read) do |column|
       next unless column.is_a? ActiveScaffold::DataStructures::Column
       next unless in_subform?(column, parent_record, parent_column)
       hidden = column_renders_as(column) == :hidden

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

@@ -4,7 +4,8 @@
     <tr>
       <td class="messages-container">
         <p class="error-message message server-error" style="display:none;">
-          <%= as_(:internal_error).html_safe %><span class="error-500"><%= as_(:error_500).html_safe %></span>
+          <%= as_(:internal_error).html_safe %>
+          <span class="error-500"><%= as_(:error_500).html_safe %></span>
           <a href="#" class="close" title="<%= as_(:close).html_safe %>"><%= as_(:close).html_safe %></a>
         </p>
         <div id="<%= active_scaffold_messages_id -%>" class="action-messages">

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

@@ -5,6 +5,7 @@
 <% unless active_scaffold_config.list.messages_above_header %>
       <p class="error-message message server-error" style="display:none;">
         <%= as_(:internal_error).html_safe %>
+        <span class="error-500"><%= as_(:error_500).html_safe %></span>
         <a href="#" class="close" title="<%= as_(:close).html_safe %>"><%= as_(:close).html_safe %></a>
       </p>
       <div id="<%= active_scaffold_messages_id -%>" class="action-messages">

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

@@ -2,6 +2,7 @@
   <% if flash[name].present? %>
     <div class="<%= "#{name}-message message" %>">
       <%= display_message flash[name] %>
+      <% flash.delete name %>
       <% if request.xhr? %>
         <a href="#" class="close" title="<%= as_(:close) %>"><%= as_(:close) %></a>
       <% end %>

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

@@ -17,7 +17,8 @@
   html = if scope
     readonly = @record.readonly? || !@record.authorized_for?(:crud_type => :update)
     crud_type = @record.new_record? ? :create : (readonly ? :read : :update)
-    active_scaffold_render_subform_column(column, scope, crud_type, readonly, !active_scaffold_config.subform.columns.names_without_auth_check.include?(column.name), @record)
+    # subform.columns.to_a.include? so it doesn't check inside subgroups
+    active_scaffold_render_subform_column(column, scope, crud_type, readonly, !active_scaffold_config.subform.columns.to_a.include?(column.name), @record)
   else
     render_column(column, @record, renders_as, scope)
   end

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

@@ -1,10 +1,11 @@
 <%
   columns_hash = {}
+  heading_columns = show_columns_for(associated.first, column, columns_hash)
 %>
 <table>
   <thead>
     <tr>
-<% show_columns_for(associated.first, column, columns_hash).each(:skip_groups => true) do |column| -%>
+<% heading_columns.each_column(skip_groups: true) do |column| -%>
       <th><%= show_label(column) %></th>
 <% end -%>
     </tr>

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

@@ -1,7 +1,7 @@
 <dl>
-<% columns.each :for => record do |column| %>
+<% columns.each_column(for: record) do |column| %>
   <dt><%= show_label(column) -%></dt>
-<% if column.respond_to? :each -%>
+<% if column.respond_to? :each_column -%>
   <dd>
     <%= render :partial => 'show_columns', :locals => {:columns => column, :record => record} %>
 <% else -%>

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

@@ -3,9 +3,9 @@
   columns_groups = []
 %>
 <tr>
-<% columns.each :for => record do |column| -%>
+<% columns.each_column(for: record) do |column| -%>
   <%
-    if column.respond_to? :each
+    if column.respond_to? :each_column
       columns_groups << column
       next
     end
@@ -14,10 +14,10 @@
   <%= content_tag :td, content_tag(:span, show_column_value(record, column)), :class => "#{column.name}-column #{:numeric if column.number?}" %>
 <% end -%>
 </tr>
-<% columns_groups.each do |columns| %>
+<% columns_groups.each do |columns_group| %>
 <tr>
   <td colspan="<%= columns_length %>">
-<% columns.each do |column| %>
+<% columns_group.each_column do |column| %>
     <%= show_column_value(record, column) %>
 <% end %>
   </td>

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

@@ -1,5 +1,5 @@
 <% calculations_id ||= active_scaffold_calculations_id -%>
-<% if active_scaffold_config.actions.include?(:list) && active_scaffold_config.list.columns.any? {|c| c.calculation?} %>
+<% if active_scaffold_config.actions.include?(:list) && list_columns.any? {|c| c.calculation?} %>
 <% params.delete(:id) %>
   ActiveScaffold.replace('<%= calculations_id %>', '<%= escape_javascript(render(:partial => 'list_calculations')) %>');
 <% end %>

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

@@ -11,6 +11,6 @@
 <% if @record.authorized_for?(:crud_type => :read, :column => column.name) -%>
   ActiveScaffold.replace_html('<%= row_id %> .<%= column.name %>-column','<%= escape_javascript(render_list_column(get_column_value(@record, column), column, @record)) %>');
 <% end -%>
-<% if column.update_columns && !column.update_columns.empty? %>
-  <%=  render(:partial => 'update_column', :collection => column.update_columns & active_scaffold_config.list.columns.names, :locals => {:row_id => row_id})%>
+<% if column.update_columns&.present? %>
+  <%=  render(:partial => 'update_column', :collection => column.update_columns & active_scaffold_config.list.columns.visible_columns_names, :locals => {:row_id => row_id})%>
 <% end %>

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

@@ -1,7 +1,7 @@
 <div class="active-scaffold">
   <div class="delete-view view">
     <%= form_tag params_for(:action => link.action, :id => params[:id]), { :method => link.method } %>
-      <h4><%= link.confirm(h(record.try(:to_label))) -%></h4>
+      <h4><%= link.confirm(h(record&.to_label)) -%></h4>
 
       <p class="form-footer">
         <%= submit_tag as_(link.label), :class => 'submit' %>
@@ -10,4 +10,4 @@
 
     </form>
   </div>
-</div>
+</div>

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

@@ -1,7 +1,7 @@
 <div class="active-scaffold">
   <div class="delete-view view">
     <%= form_tag params_for(:action => :destroy, :id => params[:id]), { :method => :delete } %>
-      <h4><%= as_(:are_you_sure_to_delete, :label => h(@record.try(:to_label))) -%></h4>
+      <h4><%= as_(:are_you_sure_to_delete, :label => h(@record&.to_label)) -%></h4>
 
       <p class="form-footer">
         <%= submit_tag as_(:delete), :class => 'submit' %>
@@ -10,4 +10,4 @@
 
     </form>
   </div>
-</div>
+</div>

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

@@ -1,9 +1,12 @@
+var link;
+<% if @action_link&.position %>
+link = ActiveScaffold.find_action_link('<%= element_form_id(:action => action_name) %>');
+<% end %>
 <% if successful? %>
   <% if @record %>
     <%= render :partial => 'update_messages' %>
     <% row = escape_javascript(render(:partial => 'list_record', :locals => {:record => @record})) -%>
-    <% if @action_link.try(:position) %>
-var link = ActiveScaffold.find_action_link('<%= element_form_id(:action => action_name) %>');
+    <% if @action_link&.position %>
 if (link) link.close('<%= row %>');
     <% else %>
       ActiveScaffold.update_row('<%= element_row_id(:action => :list, :id => @record.id) %>', '<%= row %>');
@@ -11,14 +14,21 @@ if (link) link.close('<%= row %>');
     <% end %>
     <%= render :partial => 'update_calculations', :formats => [:js] %>
   <% else %>
-    <% if @action_link.try(:position) %>
-var link = ActiveScaffold.find_action_link('<%= element_form_id(:action => action_name) %>');
+    <% if @action_link&.position %>
 if (link) link.close();
     <% end %>
     <%= render 'refresh_list', no_history: true %>
   <% end %>
 <% else %>
-  <% flash[:error] = active_scaffold_error_messages_for(@record, :object_name => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :header_message => '', :message => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :container_tag => nil, :list_type => :br) if @record.try(:errors).present? %>
-  ActiveScaffold.replace_html('<%= active_scaffold_messages_id %>','<%= escape_javascript(render(:partial => 'messages')) %>');
+  <% flash[:error] = active_scaffold_error_messages_for(@record, :object_name => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :header_message => '', :message => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :container_tag => nil, :list_type => :br) if @record&.errors.present? %>
+  <% messages = escape_javascript(render(:partial => 'messages')) %>
+  <% if @action_link&.position %>
+if (link) {
+  link.update_flash_messages('<%= messages %>');
+  ActiveScaffold.enable_form(link.adapter.find('form'));
+}
+  <% else %>
+  ActiveScaffold.replace_html('<%= active_scaffold_messages_id %>', '<%= messages %>');
   ActiveScaffold.scroll_to('<%= active_scaffold_messages_id %>', true);
+  <% end %>
 <% end %>