active_scaffold 3.5.5 → 3.6.1

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.html.erb

@@ -13,8 +13,9 @@ footer = render(:partial => 'form_association_footer', :locals => {:parent_recor
 -%>
 <h5>
   <%= column.label -%>
-  <%= link_to_visibility_toggle(subform_div_id, {:default_visible => !column.collapsed}) -%>
+  <%= link_to_visibility_toggle(subform_div_id, default_visible: !column.collapsed) -%>
 </h5>
+<%= content_tag :span, column.description, class: 'description' if column.description.present? %>
 <div id ="<%= subform_div_id %>" <%= 'style="display: none;"'.html_safe if column.collapsed -%>>
 <%# HACK: to be able to delete all associated records %>
   <%= hidden_field_tag "#{(opts = active_scaffold_input_options(column, scope, :object => parent_record))[:name]}[0]", '', :id => "#{opts[:id]}_0" if column.association.collection? %>

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

@@ -6,11 +6,13 @@
   show_actions = false
   locked ||= false
   config = active_scaffold_config_for(record.class)
+  columns ||= config.subform.columns
   scope = column_scope(record_column, scope, record)
   options = active_scaffold_input_options(config.columns[record.class.primary_key], scope, :object => record)
   tr_id = "association-#{options[:id]}"
+  layout ||= config.subform.layout
 
-  if config.subform.layout == :vertical
+  if layout == :vertical
     record_tag ||= :div
     row_tag ||= :ol
     column_tag ||= :li
@@ -40,9 +42,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| %>
+  <% 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 +53,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,12 +82,26 @@
   <% 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| %>
-      <%= active_scaffold_render_subform_column(col, scope, crud_type, readonly, true, record) %>
-    <% end %>
+    <% if layout == :vertical %>
+      <% columns_group.each_column(for: record.class, crud_type: :read, flatten: true) do |col| %>
+        <%
+          col_class = default_col_class.clone
+          col_class << 'required' if col.required?
+          col_class << col.css_class unless col.css_class.nil? || col.css_class.is_a?(Proc)
+          col_class << 'hidden' if column_renders_as(col) == :hidden
+        %>
+        <%= content_tag column_tag, :class => col_class, :colspan => (columns_length if column_tag == :td) do %>
+          <%= active_scaffold_render_subform_column(col, scope, crud_type, readonly, false, record) %>
+        <% end %>
+      <% end %>
+    <% else %>
+      <%= content_tag column_tag, :colspan => (columns_length if column_tag == :td) do %>
+      <% 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 %>
     <% end %>
   <% end %>
   <% end %>

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

@@ -1,11 +1,11 @@
-<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
 -%>
-  <%= render :partial => 'horizontal_subform_header', :locals => {:parent_record => parent_record, :record_class => header_record_class, :parent_column => column} %>
+  <%= render partial: 'horizontal_subform_header', :locals => {parent_record: parent_record, record_class: header_record_class, parent_column: column, columns: local_assigns[:columns]} %>
 
-  <%= 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 %>
+  <%= render partial: 'form_association_record', collection: associated, locals: {scope: scope, parent_record: parent_record, column: column, columns: local_assigns[:columns], layout: :horizontal} %>
+  <%= render partial: 'form_association_record', object: show_blank_record, locals: {scope: scope, parent_record: parent_record, column: column, columns: local_assigns[:columns], layout: :horizontal, locked: true, index: associated.size} if show_blank_record %>
   <tfoot>
     <%= render :partial => 'horizontal_subform_footer', :locals => {:scope => scope, :parent_record => parent_record, :column => column} %>
   </tfoot>

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

@@ -1,7 +1,8 @@
 <thead>
   <tr>
     <%
-    active_scaffold_config_for(record_class).subform.columns.each :for => record_class, :crud_type => :read do |column|
+    columns ||= active_scaffold_config_for(record_class).subform.columns
+    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_header.html.erb

@@ -1,8 +1,6 @@
-<% action_links = active_scaffold_config.action_links.collection
-  unless action_links.empty? -%>
-  <div class="actions">
-    <%= display_action_links(action_links, nil, :skip_unauthorized => true) %>
-    <%= loading_indicator_tag(:action => :table) %>
-  </div>
-<% end %>
+<% action_links = active_scaffold_config.action_links.collection -%>
+<div class="actions">
+  <%= display_action_links(action_links, nil, :skip_unauthorized => true) unless action_links.empty? %>
+  <%= loading_indicator_tag(:action => :table) %>
+</div>
 <h2><%= active_scaffold_config.list.user.label %></h2>

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/_list_record.html.erb

@@ -6,14 +6,13 @@ tr_class = "#{cycle("", "even-record")} #{list_row_class(record)}"
 action_links ||= active_scaffold_config.action_links.member
 data_refresh ||= record.to_param
 -%>
-<tr class="record <%= tr_class %>" id="<%= row_id %>" data-refresh="<%= data_refresh %>">
+<%= content_tag :tr, list_row_attributes(tr_class, row_id, data_refresh) do %>
   <% columns.each do |column| %>
     <% authorized = record.authorized_for?(:crud_type => :read, :column => column.name) -%>
     <% column_value = authorized ? get_column_value(record, column) : empty_field_text -%>
+    <% attrs = column_attributes(column, record).merge(:class => column_class(column, column_value, record)) %>
 
-    <%= content_tag :td, column_attributes(column, record).merge(:class => column_class(column, column_value, record)) do %>
-      <%= authorized ? render_list_column(column_value, column, record) : column_value %>
-    <% end %>
+    <%= content_tag :td, authorized ? render_list_column(column_value, column, record) : column_value, attrs %>
   <% end -%>
 
   <% unless grouped_search? -%>
@@ -26,4 +25,4 @@ data_refresh ||= record.to_param
     </tr>
   </table></td>
   <% end -%>
-</tr>
+<% end %>

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

@@ -1,4 +1,4 @@
-<%= content_tag(:div, id: active_scaffold_id, class: as_main_div_class, data: params[:eid] ? {eid: id_from_controller(params[:eid])} : {}) do %>
+<%= content_tag(:div, id: active_scaffold_id, class: as_main_div_class, data: as_main_div_data) do %>
   <div class="active-scaffold-header">
     <%= render :partial => 'list_header' %>
   </div>

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/_refresh_list.js.erb

@@ -4,7 +4,11 @@
 
     <% if @page.pager.infinite? || @page.number < @page.pager.number_of_pages -%>
       ActiveScaffold.auto_load_page('<%= url_for main_path_to_return %>', {auto_pagination: true, page: <%= @page.number + 1 %>});
+    <% else %>
+      ActiveScaffold.hide('<%= loading_indicator_id(action: :pagination) %>');
     <% end # @page.pager.infinite?... %>
+  <% else %>
+    ActiveScaffold.hide('<%= loading_indicator_id(action: :pagination) %>');
   <% end # @page.items.present? %>
 
   <% elsif active_scaffold_config.list.refresh_with_header -%>

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/_vertical_subform.html.erb

@@ -1,4 +1,4 @@
 <div id="<%= sub_form_list_id(:association => column.name, :id => parent_record.id || generated_id(parent_record) || 99999999999) %>">
-  <%= 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 %>
+  <%= render partial: 'form_association_record', collection: associated, locals: {scope: scope, parent_record: parent_record, column: column, columns: local_assigns[:columns], layout: :vertical} %>
+  <%= render partial: 'form_association_record', object: show_blank_record, locals: {scope: scope, parent_record: parent_record, column: column, columns: local_assigns[:columns], layout: :vertical, locked: true, index: associated.size} if show_blank_record %>
 </div>

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 %>

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

@@ -1,5 +1,5 @@
 try {
-<% form_selector ||= "#{element_form_id(:action => :update, :id => @record.try(:id) || params[:id])}" %>
+<% form_selector ||= "#{element_form_id(:action => :update, :id => @record&.id || params[:id])}" %>
 var action_link = ActiveScaffold.find_action_link('<%= form_selector %>');
 if (action_link) action_link.update_flash_messages('<%= escape_javascript(render(:partial => 'messages')) %>');
 <% if successful? %>

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

@@ -1,2 +1,2 @@
-ActiveScaffold.update_row('<%= element_row_id(:action => :list, :id => @record.try(:id)) %>', '<%= escape_javascript render('list_record', :record => @record) %>');
+ActiveScaffold.update_row('<%= element_row_id(action: :list, id: @record&.id) %>', '<%= escape_javascript render('list_record', record: @record) %>');
 <%= render :partial => 'update_calculations', :formats => [:js] %>

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

@@ -15,12 +15,12 @@
        ActiveScaffold.update_inplace_edit('<%= @column_span_id %>','<%= escape_javascript(formatted_value) %>', <%= column_empty?(formatted_value).to_json %>);
     <% if ipe_update == :columns && @column.update_columns && !@column.update_columns.empty?
          @rendered = Set.new([@column.name]) -%>
-         <%= render :partial => 'update_column', :collection => @column.update_columns & active_scaffold_config.list.columns.names, :locals => {:row_id => element_row_id(:action => :list, :id => @record.id)} %>
+         <%= render :partial => 'update_column', :collection => @column.update_columns & active_scaffold_config.list.columns.visible_columns_names, :locals => {:row_id => element_row_id(:action => :list, :id => @record.id)} %>
     <% end %>
   <% end -%>
 <% else -%>
   ActiveScaffold.replace_html('<%= @column_span_id %>','<%= escape_javascript(get_column_value(@record, @column)) %>');
 <% end -%>
 <% if @column.calculation? -%>
-  ActiveScaffold.replace_html('<%= active_scaffold_calculations_id(:column => @column) %>', '<%= escape_javascript(render_column_calculation(@column)) %>');
+  ActiveScaffold.replace_html('<%= active_scaffold_calculations_id(:column => @column) %>', '<%= escape_javascript(render_column_calculation(@column, id_condition: false)) %>');
 <% end -%>

data/config/locales/de.yml

@@ -107,7 +107,8 @@ de:
       other: "%{count} %{model} makriert"
     refresh: Neu laden
     remove: Entfernen
-    remove_file: Entferne oder Ersetze Datei
+    remove_file: Entferne oder Ersetzte Datei
+    remove_files: Entfernen oder Hinzufügen Dateien
     replace_existing: Existierenden ersetzen
     replace_with_new: Mit Neuer ersetzen
     reset: Zurücksetzen

data/config/locales/en.yml

@@ -108,6 +108,7 @@ en:
     refresh: Refresh
     remove: Remove
     remove_file: Remove or Replace file
+    remove_files: Remove or Add files
     replace_existing: Replace Existing
     replace_with_new: Replace With New
     reset: Reset