active_scaffold 3.3.0 → 3.3.1

data/CHANGELOG

@@ -1,3 +1,21 @@
+= 3.3.1
+- Set adapter colspan (nested lists and forms) using javascript, fixed issue when active_scaffold_config_list is used
+- Fix bug saving default values when get method is overrided on model to return default value
+- Fix close action_link without adapter
+- Fix update calculations after destroy a row
+- Fix count and calculate searching with count_includes
+- Fix action_after_create
+- Cache associations options (for :select form_ui on associations), it can be disabled with config.cache_association_options = false
+- Clean some code so we can stop changing @record in partials and using @record in helpers
+- Support jquery-rails 3 gem and jquery-ui-rails gem
+- Clean some invalid HTML
+- Add store_user_settings option to enable storing sort, page and search params into session (enabled by default for backwards compatibility)
+- Fix each_record_in_scope when conditions_for_collection needs some includes
+- Add method to override label in search fields (field_search)
+- Add method to override attributes for column headings on list
+- Support security_method and ignore_method in column's link
+- render :super should work for every render call (with partial and locals or with only one hash)
+
 = 3.3.0
 - Unify field overrides and list_ui method signatures
 - Improve performance removing some partials and adding some caching for helper overrides and UIs, and caching url generation for lists (caching url is optional)

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

@@ -1,7 +1,15 @@
 <% case ActiveScaffold.js_framework %>
 <% when :jquery %>
+<% require_asset "getprototypeof" %>
+<% if Jquery::Rails.const_defined? 'JQUERY_UI_VERSION' %>
 <% require_asset "jquery-ui" %>
 <% require_asset "jquery-ui-timepicker-addon" %>
+<% elsif Jquery.const_defined? 'Ui' %>
+<% require_asset "jquery.ui.core" %>
+<% require_asset "jquery.ui.sortable" %>
+<% require_asset "jquery.ui.datepicker" %>
+<% require_asset "jquery-ui-timepicker-addon" %>
+<% end %>
 <% require_asset "jquery/active_scaffold" %>
 <% require_asset "jquery/jquery.editinplace" %>
 <% require_asset "jquery/date_picker_bridge" %>

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

@@ -1,5 +1,5 @@
 jQuery(document).ready(function($) {
-  if (jQuery().jquery < '1.8.0') {
+  if (/1\.[2-7]\..*/.test(jQuery().jquery)) {
     var error = 'ActiveScaffold requires jquery 1.8.0 or greater, please use jquery-rails 2.1.x gem or greater';
     if (typeof console != 'undefined') console.error(error);
     else alert(error);
@@ -986,12 +986,14 @@ ActiveScaffold.ActionLink.Abstract = Class.extend({
   },
 
   close: function() {
-    var link = this;
-    ActiveScaffold.remove(this.adapter, function() {
-      link.enable();
-      if (link.hide_target) link.target.show();
-      if (ActiveScaffold.config.scroll_on_close) ActiveScaffold.scroll_to(link.target.attr('id'), ActiveScaffold.config.scroll_on_close == 'checkInViewport');
-    });
+    if (this.adapter) {
+      var link = this;
+      ActiveScaffold.remove(this.adapter, function() {
+        link.enable();
+        if (link.hide_target) link.target.show();
+        if (ActiveScaffold.config.scroll_on_close) ActiveScaffold.scroll_to(link.target.attr('id'), ActiveScaffold.config.scroll_on_close == 'checkInViewport');
+      });
+    }
   },
 
   reload: function() {
@@ -1077,6 +1079,7 @@ ActiveScaffold.ActionLink.Record = ActiveScaffold.ActionLink.Abstract.extend({
       this.hide_target = true;
     }
 
+    var colspan = this.target.children().length;
     if (this.position == 'after') {
       this.target.after(content);
       this.set_adapter(this.target.next());
@@ -1088,6 +1091,7 @@ ActiveScaffold.ActionLink.Record = ActiveScaffold.ActionLink.Abstract.extend({
     else {
       return false;
     }
+    this.adapter.find('.inline-adapter-cell:first').attr('colspan', colspan);
     ActiveScaffold.highlight(this.adapter.find('td'));
   },
 

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

@@ -1,5 +1,24 @@
 <%# encoding: utf-8 %>
 <%= ActiveScaffold::Bridges[:date_picker].localization %>
+Object.getPrototypeOf($.datepicker)._attachDatepicker_without_inlineSettings = Object.getPrototypeOf($.datepicker)._attachDatepicker;
+$.extend(Object.getPrototypeOf($.datepicker), {
+  _attachDatepicker: function(target, settings) {
+    var inlineSettings = {}, $target = $(target);
+    for (var attrName in this._defaults) {
+      if(this._defaults.hasOwnProperty(attrName)){
+        var attrValue = $target.data(attrName.toLowerCase());
+        if (attrValue) {
+          try {
+            inlineSettings[attrName] = eval(attrValue);
+          } catch (err) {
+            inlineSettings[attrName] = attrValue;
+          }
+        }
+      }
+    }
+    this._attachDatepicker_without_inlineSettings(target, $.extend({}, settings || {}, inlineSettings));
+  }
+});
 jQuery(document).on("focus", "input.date_picker", function(){
   var date_picker = jQuery(this);
   if (typeof(date_picker.datepicker) == 'function') {

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

@@ -969,6 +969,7 @@ ActiveScaffold.ActionLink.Record = Class.create(ActiveScaffold.ActionLink.Abstra
       this.hide_target = true;
     }
 
+    var colspan = this.target.childElements().length;
     if (this.position == 'after') {
       this.target.insert({after:content});
       this.set_adapter(this.target.next());
@@ -980,6 +981,7 @@ ActiveScaffold.ActionLink.Record = Class.create(ActiveScaffold.ActionLink.Abstra
     else {
       return false;
     }
+    this.adapter.down('.inline-adapter-cell').writeAttribute('colspan', colspan);
     ActiveScaffold.highlight(this.adapter.down('td').down());
   },
 

data/app/assets/stylesheets/active_scaffold_layout.css

@@ -13,8 +13,9 @@ margin: 5px 0;
 
 .active-scaffold table {
 width: 100%;
-border-collapse: separate;
+border-collapse: collapse;
 }
+.active-scaffold td, .active-scaffold th { padding: 0; }
 
 .active-scaffold a,
 .active-scaffold a:visited {
@@ -400,6 +401,9 @@ padding: 3px 0px 2px 0px;
 border-bottom: none;
 font: bold 12px arial, sans-serif;
 }
+.active-scaffold .active-scaffold-footer > br {
+clear: both;
+}
 
 .active-scaffold-footer .active-scaffold-pagination {
 float: right;

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

@@ -9,14 +9,14 @@ form_tag url_options, options %>
   <ol class="form">
    <% visibles, hiddens = visibles_and_hiddens(active_scaffold_config.field_search) %>
     <% visibles.each do |column| -%>
-      <%= render :partial => 'search_attribute', :locals => {:column => column} %>
+      <li class="form-element"><%= search_attribute(column, @record) %></li>
     <% end -%>
     <% unless hiddens.empty?  -%>
       <li class="sub-section">
       <h5><%= as_(:optional_attributes) %></h5>
       <ol id ="<%= sub_section_id(:sub_section => 'further_options') %>" class="form" style="display:none;">
       <% hiddens.each do |column| -%>
-        <%= render :partial => 'search_attribute', :locals => {:column => column} %>
+        <li class="form-element"><%= search_attribute(column, @record) %></li>
       <% end -%>
       </ol>
       <%= link_to_visibility_toggle(sub_section_id(:sub_section => 'further_options'), {:default_visible => false}) %>

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

@@ -1,12 +1,12 @@
 <%
-parent_record = @record
+parent_record ||= @record # save @record, some partial can change @record TODO remove when changing @record is removed
 associated = column.singular_association? ? [parent_record.send(column.name)].compact : parent_record.send(column.name).to_a
 associated = associated.sort_by {|r| r.new_record? ? 99999999999 : r.id} unless column.association.options.has_key?(:order)
-if show_blank_record = column.show_blank_record?(associated)
-  associated << build_associated(column, parent_record)
+if column.show_blank_record?(associated)
+  show_blank_record = build_associated(column, parent_record)
 end
 disable_required_for_new = @disable_required_for_new
-@disable_required_for_new = show_blank_record unless (column.singular_association? && column.required?)
+@disable_required_for_new = !!show_blank_record unless (column.singular_association? && column.required?)
 subform_div_id = "#{sub_form_id(:association => column.name, :id => parent_record.id || generated_id(parent_record) || 99999999999)}-div" 
 -%>
 <h5><%= column.label -%></h5>
@@ -18,6 +18,6 @@ subform_div_id = "#{sub_form_id(:association => column.name, :id => parent_recor
 </div>
 <%= link_to_visibility_toggle(subform_div_id, {:default_visible => !column.collapsed}) -%>
 <%
-  @record = parent_record
+  @record = parent_record # restore @record, some partials can change it TODO remove when changing @record is removed
   @disable_required_for_new = disable_required_for_new
 -%>

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

@@ -1,10 +1,15 @@
 <%
   record_column = column
-  readonly = (@record.readonly? or not @record.authorized_for?(:crud_type => :update))
-  crud_type = @record.new_record? ? :create : (readonly ? :read : :update)
+  Rails.logger.warn "Relying on @record to render form_asssociation_record partial with no :object is deprecated, called from #{caller(1).detect {|l| l =~ /\.erb:/ }.gsub(/(.*:\d+):.*/, '\1')}" unless local_assigns[:form_association_record]
+  record = form_association_record ||= @record # TODO remove me, backwards compatibility, no :collection neither object in render
+  @record = record # TODO remove me, backward compatibility, helpers using @record
+  readonly = (record.readonly? or not record.authorized_for?(:crud_type => :update))
+  crud_type = record.new_record? ? :create : (readonly ? :read : :update)
   show_actions = false
-  config = active_scaffold_config_for(@record.class)
-  options = active_scaffold_input_options(config.columns[@record.class.primary_key], scope)
+  locked ||= false
+  config = active_scaffold_config_for(record.class)
+  scope = column_scope(record_column, scope, record)
+  options = active_scaffold_input_options(config.columns[record.class.primary_key], scope)
   tr_id = "association-#{options[:id]}"
 
   if config.subform.layout == :vertical
@@ -24,20 +29,20 @@
     default_col_class = []
     flatten ||= false
   end
-  index ||= nil
+  index ||= form_association_record_counter ||= nil
 
   columns_length = 0
   columns_groups = []
 -%>
 <<%= record_tag %> class="sub-form-record">
-<% unless @record.errors.empty? -%>
-<%= content_tag error_tag, :class => "association-record-errors", :id => element_messages_id(:action => @record.class.name.underscore, :id => "#{parent_record.id}-#{index}") do %>
-  <% errors = active_scaffold_error_messages_for(:record, :object_name => @record.class.model_name.human.downcase) %>
-  <%= error_inner_tag ? content_tag(error_inner_tag, errors, :colspan => (active_scaffold_config_for(@record.class).subform.columns.length + 1 if error_inner_tag == :td)) : errors %>
+<% unless record.errors.empty? -%>
+<%= content_tag error_tag, :class => "association-record-errors", :id => element_messages_id(:action => record.class.name.underscore, :id => "#{parent_record.id}-#{index}") do %>
+  <% errors = active_scaffold_error_messages_for(:record, :object_name => record.class.model_name.human.downcase) %>
+  <%= error_inner_tag ? content_tag(error_inner_tag, errors, :colspan => (active_scaffold_config_for(record.class).subform.columns.length + 1 if error_inner_tag == :td)) : errors %>
 <% 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| %>
+<%= 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| %>
 <%
   if column.is_a? ActiveScaffold::DataStructures::ActionColumns
     columns_groups << column
@@ -56,16 +61,16 @@
   col_class << 'hidden' if column_renders_as(column) == :hidden
 -%>
   <%= content_tag column_tag, :class => col_class.join(' ') do %>
-    <%= active_scaffold_render_subform_column(column, scope, crud_type, readonly) %>
+    <%= active_scaffold_render_subform_column(column, scope, crud_type, readonly, false, record) %>
   <% end %>
 <% end -%>
 <% if show_actions -%>
   <%= content_tag column_tag, :class => "actions" do %>
-    <% if record_column.plural_association? and (@record.authorized_for?(:crud_type => :delete) or not [:destroy, :delete_all].include?(record_column.association.options[:dependent])) %>
+    <% if record_column.plural_association? and (record.authorized_for?(:crud_type => :delete) or not [:destroy, :delete_all].include?(record_column.association.options[:dependent])) %>
       <%= link_to as_(:remove), '#', :class => 'destroy', :id => "#{options[:id]}-destroy" , :data => {:delete_id => tr_id} unless locked %>
     <% end %>
-    <% unless @record.new_record? %>
-      <input type="hidden" name="<%= options[:name] -%>" id="<%= options[:id] -%>" value="<%= @record.id -%>" />
+    <% unless record.new_record? %>
+      <input type="hidden" name="<%= options[:name] -%>" id="<%= options[:id] -%>" value="<%= record.id -%>" />
     <% end -%>
   <% end %>
 <% end -%>
@@ -75,7 +80,7 @@
 <%= 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| %>
-    <%= active_scaffold_render_subform_column(col, scope, crud_type, readonly, true) %>
+    <%= active_scaffold_render_subform_column(col, scope, crud_type, readonly, true, record) %>
   <% end %>
   <% end %>
 <% end %>

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

@@ -1,12 +1,12 @@
-<table cellpadding="0" cellspacing="0" id="<%= sub_form_list_id(:association => column.name, :id => parent_record.try(:id) || generated_id(parent_record) || 99999999999) %>">
-  <% @record = associated.empty? ? build_associated(column, parent_record) : associated.last -%>
-  <%= render :partial => 'horizontal_subform_header', :locals => {:parent_record => parent_record, :record => @record} %>
+<table id="<%= sub_form_list_id(:association => column.name, :id => parent_record.try(:id) || generated_id(parent_record) || 99999999999) %>">
+<%
+  header_record_class = (show_blank_record && show_blank_record.class) || column.association.klass
+-%>
+  <%= render :partial => 'horizontal_subform_header', :locals => {:parent_record => parent_record, :record_class => header_record_class} %>
 
-  <% associated.each_index do |index| %>
-    <% @record = associated[index] -%>
-    <%= render :partial => 'form_association_record', :locals => {:scope => column_scope(column, scope), :parent_record => parent_record, :column => column, :locked => show_blank_record && @record.new_record? && @record == associated.last, :index => index} %>
-  <% end -%>
+  <%= render :partial => 'form_association_record', :collection => associated, :locals => {:scope => scope, :parent_record => parent_record, :column => column} %>
+  <%= render :partial => 'form_association_record', :object => show_blank_record, :locals => {:scope => scope, :parent_record => parent_record, :column => column, :locked => true, :index => associated.size} if show_blank_record %>
   <tfoot>
-    <%= render :partial => 'horizontal_subform_footer', :locals => {:scope => column_scope(column, scope), :parent_record => parent_record, :column => column} %>
+    <%= render :partial => 'horizontal_subform_footer', :locals => {:scope => scope, :parent_record => parent_record, :column => column} %>
   </tfoot>
 </table>

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 :for => record_class, :crud_type => :read do |column|
       next if column.is_a? ActiveScaffold::DataStructures::ActionColumns
       next unless in_subform?(column, parent_record)
       hidden = column_renders_as(column) == :hidden

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

@@ -15,7 +15,7 @@
   </tbody>
 </table>
 <% end %>
-<table cellpadding="0" cellspacing="0">
+<table>
   <thead>
     <tr>
       <% columns = list_columns %>

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

@@ -2,13 +2,11 @@
    columns ||= list_columns -%>
 <tr id="<%= active_scaffold_calculations_id %>" class="active-scaffold-calculations">
   <% columns.each do |column| -%>
-    <td <%= "id=#{active_scaffold_calculations_id(:column => column)}" if column.calculation? %>>
-      <% if column.calculation? -%>
-        <%= render_column_calculation(column) %>
-      <% else -%>
-        &nbsp;
-      <% end -%>
-    </td>
+    <% if column.calculation? %>
+    <td id="<%= active_scaffold_calculations_id(:column => column) %>"><%= render_column_calculation(column) %></td>
+    <% else %>
+    <td>&nbsp;</td>
+    <% end -%>
   <% end -%>
   <% unless active_scaffold_config.action_links.empty? -%>
     <td class="actions">&nbsp;</td>

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

@@ -1,17 +1,6 @@
-<%
-  column_count ||= begin
-    config = if nested? and (nested.singular_association? || action_name == 'index')
-      active_scaffold_config_for(nested.parent_model)
-    else
-      active_scaffold_config
-    end
-    # increment in 1 for self-associations, parent_model config will have constraints too
-    config.list.columns.count + 1 + (config == active_scaffold_config && action_name == 'index' ? 1 : 0)
-  end
-%>
 <%# nested_id, allows us to remove a nested scaffold programmatically %>
 <tr class="inline-adapter" id="<%= element_row_id :action => :nested %>">
-  <td colspan="<%= column_count %>" class="inline-adapter-cell">
+  <td class="inline-adapter-cell">
 <% if controller.send(:successful?) %>
     <div class="<%= "#{params[:action]}-view" if params[:action] %> <%= "#{nested? ? nested.name : id_from_controller(params[:controller])}-view" %> view">
       <%= link_to(as_(:close), '', :class => 'inline-adapter-close as_cancel', :remote => true, :title => as_(:close)) -%>

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

@@ -6,6 +6,6 @@
   <div class="active-scaffold-pagination">
     <%= render :partial => 'list_pagination_links', :locals => { :current_page => @page } if @page.pager.infinite? || @page.pager.number_of_pages > 1 %>
   </div>
-  <br clear="both" /><%# a hack for the Rico Corner problem %>
+  <br /><!-- to clear this block -->
 </div>
 <% end -%>

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

@@ -5,7 +5,7 @@ tr_class = cycle("", "even-record") + ' ' + list_row_class(record)
 action_links ||= active_scaffold_config.action_links.member
 data_refresh ||= url_for(params_for(:action => :row, :id => '--ID--', :_method => :get))
 -%>
-<tr class="record <%= tr_class %>" id="<%= element_row_id(:action => :list, :id => record.id) %>" data-refresh="<%= data_refresh.sub('--ID--', record.id.to_s).html_safe %>">
+<tr class="record <%= tr_class %>" id="<%= element_row_id(:action => :list, :id => record.id) %>" data-refresh="<%= data_refresh.sub('--ID--', record.id.to_s) %>">
   <% columns.each do |column| %>
     <% authorized = record.authorized_for?(:crud_type => :read, :column => column.name) -%>
     <% column_value = authorized ? get_column_value(record, column) : active_scaffold_config.list.empty_field_text -%>
@@ -15,7 +15,7 @@ data_refresh ||= url_for(params_for(:action => :row, :id => '--ID--', :_method =
     <% end %>
   <% end -%>
     
-  <td class="actions"><table cellpadding="0" cellspacing="0">
+  <td class="actions"><table>
     <tr>
       <td class="indicator-container">
         <%= loading_indicator_tag(:action => :record, :id => record.id) %>

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

@@ -2,7 +2,7 @@
   <div class="active-scaffold-header">
     <%= render :partial => 'list_header' %>
   </div>
-  <table cellpadding="0" cellspacing="0">
+  <table>
     <tbody class="before-header" id="<%= before_header_id -%>">
       <% if active_scaffold_config.list.always_show_search %>
       <% old_record, @record = @record, new_model %>

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

@@ -17,7 +17,7 @@
   html = if scope
     readonly = (@record.readonly? or not @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))
+    active_scaffold_render_subform_column(column, scope, crud_type, readonly, !active_scaffold_config.subform.columns.names_without_auth_check.include?(column.name), @record)
   else
     render_column(column, @record, renders_as, scope)
   end

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

@@ -1,4 +1,5 @@
 <% calculations_id ||= active_scaffold_calculations_id -%>
 <% if active_scaffold_config.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/_vertical_subform.html.erb

@@ -1,6 +1,4 @@
 <div id="<%= sub_form_list_id(:association => column.name, :id => parent_record.id || generated_id(parent_record) || 99999999999) %>">
-  <% associated.each_index do |index| %>
-  <% @record = associated[index] -%>
-  <%= render :partial => 'form_association_record', :locals => {:scope => column_scope(column, scope), :parent_record => parent_record, :column => column, :locked => show_blank_record && @record.new_record? && @record == associated.last, :index => index} %>
-  <% end -%>
+  <%= render :partial => 'form_association_record', :collection => associated, :locals => {:scope => scope, :parent_record => parent_record, :column => column} %>
+  <%= render :partial => 'form_association_record', :object => show_blank_record, :locals => {:scope => scope, :parent_record => parent_record, :column => column, :locked => true, :index => associated.size} if show_blank_record %>
 </div>

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

@@ -8,7 +8,7 @@
       <% messages_id = active_scaffold_messages_id(:controller_id => current_id) %>
       <%= render :partial => 'update_calculations', :locals => {:calculations_id => active_scaffold_calculations_id(:controller_id => current_id)}, :formats => [:js] %>
     <% elsif render_parent_action == :index %>
-      <% if controller.respond_to?(:render_component_into_view) %>
+      <% if controller.respond_to?(:render_component_into_view, true) %>
         <%= escape_javascript(controller.send(:render_component_into_view, render_parent_options)) %>
       <% else %>
         ActiveScaffold.reload('<%= url_for render_parent_options %>');

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

@@ -1,12 +1,12 @@
 <%
-associated_form = render :partial => "form_association_record", :locals => {:scope => @scope, :parent_record => @parent_record, :column => @column, :locked => @record.new_record? && @column.singular_association?}
+associated_form = render :partial => "form_association_record", :object => @record, :locals => {:scope => @scope, :parent_record => @parent_record, :column => @column, :locked => @record.new_record? && @column.singular_association?}
 options = {:singular => false}
 if @column.singular_association?
   options[:singular] = true
 else
   unless @record.new_record?
     column = active_scaffold_config_for(@record.class).columns[@record.class.primary_key]
-    options[:id] = active_scaffold_input_options(column, @scope)[:id]
+    options[:id] = active_scaffold_input_options(column, column_scope(@column, @scope, @record))[:id]
   end
 end %>
 ActiveScaffold.create_associated_record_form('<%=sub_form_list_id(:association => @column.name, :id => @parent_record.id || generated_id(@parent_record) || 99999999999)%>','<%=escape_javascript(associated_form)%>', <%= options.to_json.html_safe %>);

data/config/locales/de.yml

@@ -1,126 +1,126 @@
 de:
   time:
     formats:
-      picker: "%d.%m.%Y %H:%M"
+      picker: ! '%d.%m.%Y %H:%M'
   active_scaffold:
-    add: 'Hinzufügen'
-    add_existing: 'Existierenden Eintrag hinzufügen'
-    add_existing_model: 'Existierende %{model} hinzufügen'
-    apply: 'Apply'
-    are_you_sure_to_delete: 'Sind Sie sicher?'
-    cancel: 'Abbrechen'
-    click_to_edit: 'Zum Editieren anklicken'
-    click_to_reset: 'Reset'
-    close: 'Schließen'
-    config_list: 'Konfigurieren'
-    config_list_model: 'Konfiguriere Spalten für %{model}'
-    create: 'Anlegen'
-    create_model: 'Lege %{model} an'
-    create_another: 'Weitere anlegen'
-    created_model: '%{model} angelegt'
-    create_new: 'Neu anlegen'
-    customize: 'Anpassen'
-    delete: 'Löschen'
-    deleted_model: '%{model} gelöscht'
-    delimiter: 'Trennzeichen'
-    download: 'Download'
-    edit: 'Bearbeiten'
-    export: 'Exportieren'
-    nested_for_model: '%{nested_model} für %{parent_model}'
-    nested_of_model: '%{nested_model} von %{parent_model}'
+    add: Hinzufügen
+    add_existing: Existierenden Eintrag hinzufügen
+    add_existing_model: Existierende %{model} hinzufügen
+    apply: Apply
+    are_you_sure_to_delete: Sind Sie sicher?
+    cancel: Abbrechen
+    click_to_edit: Zum Editieren anklicken
+    click_to_reset: Reset
+    close: Schließen
+    config_list: Konfigurieren
+    config_list_model: Konfiguriere Spalten für %{model}
+    create: Anlegen
+    create_model: Lege %{model} an
+    create_another: Weitere anlegen
+    created_model: ! '%{model} angelegt'
+    create_new: Neu anlegen
+    customize: Anpassen
+    delete: Löschen
+    deleted_model: ! '%{model} gelöscht'
+    delimiter: Trennzeichen
+    download: Download
+    edit: Bearbeiten
+    export: Exportieren
+    nested_for_model: ! '%{nested_model} für %{parent_model}'
+    nested_of_model: ! '%{nested_model} von %{parent_model}'
     'false': 'False'
-    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'
-    omit_header: 'Lasse Header weg'
-    options: 'Optionen'
-    pdf: 'PDF'
-    previous: 'Zurück'
-    print: 'Drucken'
+    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
+    omit_header: Lasse Header weg
+    options: Optionen
+    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'
-    replace_existing: 'Existierenden ersetzen'
-    replace_with_new: 'Mit Neuer ersetzen'
-    revisions_for_model: 'Revisionen für %{model}'
-    reset: 'Zurücksetzen'
-    saving: 'Speichern…'
-    search: 'Suche'
-    search_terms: 'Suchbegriffe'
-    _select_: '- Auswählen -'
-    show: 'Anzeigen'
-    show_model: 'Zeige %{model} an'
-    _to_ : ' zu '
+      one: 1 marked %{model}
+      other: ! '%{count} marked %{model}'
+    refresh: Neu laden
+    remove: Entfernen
+    remove_file: Entferne oder Ersetze Datei
+    replace_existing: Existierenden ersetzen
+    replace_with_new: Mit Neuer ersetzen
+    revisions_for_model: Revisionen für %{model}
+    reset: Zurücksetzen
+    saving: Speichern…
+    search: Suche
+    search_terms: Suchbegriffe
+    _select_: ! '- Auswählen -'
+    show: Anzeigen
+    show_model: Zeige %{model} an
+    _to_: ! ' zu '
     'true': 'True'
-    update: 'Speichern'
-    update_model: 'Editiere %{model}'
-    updated_model: '%{model} aktualisiert'
-    '=': '='
-    '>=': '>='
-    '<=': '<='
-    '>': '>'
-    '<': '<'
-    '!=': '!='
-    between: 'Zwischen'
-    contains: 'Enthält'
-    begins_with: 'Beginnt'
-    ends_with: 'Endet'
-    today: 'Heute'
-    yesterday: 'Gestern'
-    tomorrow: 'Morgen'
-    this_week: 'Diese Woche'
-    prev_week: 'Letzte Woche'
-    next_week: 'Nächste Woche'
-    this_month: 'Diesen Monat'
-    prev_month: 'Letzten Monat'
-    next_month: 'Nächsten Monat'
-    this_year: 'Dieses Jahr'
-    prev_year: 'Letztes Jahr'
-    next_year: 'Nächstes Jahr'
-    past: 'Letzten'
-    future: 'Nächsten'
-    range: 'Zeitraum'
-    seconds: 'Sekunden'
-    minutes: 'Minuten'
-    hours: 'Stunden'
-    days: 'Tage'
-    weeks: 'Wochen'
-    months: 'Monate'
-    years: 'Jahre'
-    optional_attributes: 'Weitere'
+    update: Speichern
+    update_model: Editiere %{model}
+    updated_model: ! '%{model} aktualisiert'
+    =: =
+    ! '>=': ! '>='
+    <=: <=
+    ! '>': ! '>'
+    <: <
+    ! '!=': ! '!='
+    between: Zwischen
+    contains: Enthält
+    begins_with: Beginnt
+    ends_with: Endet
+    today: Heute
+    yesterday: Gestern
+    tomorrow: Morgen
+    this_week: Diese Woche
+    prev_week: Letzte Woche
+    next_week: Nächste Woche
+    this_month: Diesen Monat
+    prev_month: Letzten Monat
+    next_month: Nächsten Monat
+    this_year: Dieses Jahr
+    prev_year: Letztes Jahr
+    next_year: Nächstes Jahr
+    past: Letzten
+    future: Nächsten
+    range: Zeitraum
+    seconds: Sekunden
+    minutes: Minuten
+    hours: Stunden
+    days: Tage
+    weeks: Wochen
+    months: Monate
+    years: Jahre
+    optional_attributes: Weitere
     :null: 'Null'
-    not_null: 'Nicht Null'
+    not_null: Nicht Null
     date_picker_options:
-      weekHeader: 'Wo'
+      weekHeader: Wo
       firstDay: 1
       isRTL: false
       showMonthAfterYear: false
     datetime_picker_options:
-      timeText: 'Uhrzeit'
-      currentText: 'Jetzt'
-      closeText: 'Schließen'
+      timeText: Uhrzeit
+      currentText: Jetzt
+      closeText: Schließen
     human_conditions:
-      boolean: "%{column} = %{value}"
-      association: "%{column} = %{value}"
+      boolean: ! '%{column} = %{value}'
+      association: ! '%{column} = %{value}'
     errors:
       template:
         header:
-          one:    "Konnte %{model} nicht speichern: ein Fehler."
-          other:  "Konnte %{model} nicht speichern: %{count} Fehler."
-        body: "Bitte überprüfen Sie die folgenden Felder:"
-    # error_messages
-    cant_destroy_record: "%{record} kann nicht gelöscht werden"
-    internal_error: 'Fehler bei der Verarbeitung (code 500, Interner Fehler)'
-    version_inconsistency: 'Inkonsistente Versionen - dieser Eintrag wurde verändert nachdem Sie mit der Bearbeitung begonnen haben.'
-    record_not_saved: 'Eintrag kann nicht gespeichert werden. Ursache unbekannt.'
-    no_authorization_for_action: "Keine Berechtigung für Aktion %{action}"
+          one: ! 'Konnte %{model} nicht speichern: ein Fehler.'
+          other: ! 'Konnte %{model} nicht speichern: %{count} Fehler.'
+        body: ! 'Bitte überprüfen Sie die folgenden Felder:'
+    cant_destroy_record: ! '%{record} kann nicht gelöscht werden'
+    internal_error: Fehler bei der Verarbeitung (code 500, Interner Fehler)
+    version_inconsistency: Inkonsistente Versionen - dieser Eintrag wurde verändert nachdem Sie mit der Bearbeitung begonnen haben.
+    record_not_saved: Eintrag kann nicht gespeichert werden. Ursache unbekannt.
+    no_authorization_for_action: Keine Berechtigung für Aktion %{action}
+    'null': 'Null'