active_scaffold 3.4.43 → 3.5.0

data/app/assets/stylesheets/active_scaffold_colors.scss

@@ -366,11 +366,11 @@ background-color: $input_focus_bg;
 border-color: $input_border_color;
 }
 
-.active-scaffold .draggable-list {
+.active-scaffold form .checkbox-list.draggable-list {
 background-color: $draggable_list_bg;
 }
 
-.active-scaffold .draggable-list.selected {
+.active-scaffold form .checkbox-list.draggable-list.selected {
 background-color: $draggable_list_selected_bg;
 }
 .active-scaffold .ui-droppable-disabled, .active-scaffold .ui-droppable-disabled.selected {

data/app/assets/stylesheets/active_scaffold_layout.css

@@ -51,7 +51,7 @@ padding: 5px 20px 5px 5px;
 /* Header
    ======================== */
 
-.active-scaffold-header {
+.active-scaffold-header, .form-footer + .active-scaffold-footer {
 position: relative;
 }
 
@@ -61,8 +61,8 @@ margin: 0;
 font: bold 160% arial, sans-serif;
 }
 
-.active-scaffold-header div.actions a,
-.active-scaffold-header div.actions {
+.active-scaffold div.actions a,
+.active-scaffold div.actions {
 float: right;
 font: bold 14px arial;
 letter-spacing: -1px;
@@ -74,7 +74,7 @@ background-position: 1px 50%;
 background-repeat: no-repeat;
 }
 
-.active-scaffold-header div.actions a {
+.active-scaffold div.actions a {
 padding: 5px 5px;
 margin-left: 0px;
 }
@@ -84,18 +84,18 @@ margin-left: 0px;
 padding: 1px 5px;
 }
 
-.active-scaffold-header div.actions div.action_group {
+.active-scaffold div.actions div.action_group {
 display: inline;
 float: right;
 }
 
-.active-scaffold-header div.actions div.action_group li a,
-.active-scaffold-header div.actions div.action_group li div {
+.active-scaffold div.actions div.action_group li a,
+.active-scaffold div.actions div.action_group li div {
 float: none;
 margin: 0;
 }
 
-.active-scaffold-header div.actions .action_group ul {
+.active-scaffold div.actions .action_group ul {
 line-height: 130%;
 top: 19px;
 }
@@ -108,7 +108,7 @@ top: 14px;
 top: -3px;
 }
 
-.active-scaffold-header div.actions a.disabled {
+.active-scaffold div.actions a.disabled {
 opacity: 0.5;
 }
 
@@ -116,7 +116,7 @@ opacity: 0.5;
 .active-scaffold-header div.actions a.new_existing,
 .active-scaffold-header div.actions a.show_search,
 .active-scaffold-header div.actions a.show_config_list,
-.active-scaffold-header div.actions div.action_group div {
+.active-scaffold div.actions div.action_group div {
 margin:0;
 padding: 5px 5px 5px 25px;
 background-position: 5px 50%;
@@ -134,7 +134,8 @@ background-position: 1px 50%;
 background-repeat: no-repeat;
 }
 
-.active-scaffold-header div.actions a.disabled:hover {
+.active-scaffold div.actions a.disabled:hover,
+.active-scaffold div.actions a.disabled:hover {
 background-color: transparent;
 cursor: default;
 }
@@ -666,6 +667,13 @@ font: bold 14px arial, sans-serif;
 letter-spacing: 0;
 }
 
+.active-scaffold .active-scaffold-footer div.actions {
+  margin-top: -20px;
+}
+.active-scaffold .active-scaffold-footer div.actions a {
+  margin: 0;
+}
+
 /* Form :: Fields
    ============================== */
 
@@ -927,36 +935,36 @@ font-size: 20px;
 padding: 3px 10px;
 }
 
-.as_touch .active-scaffold-header div.actions a {
+.as_touch div.actions a {
 padding: 7px 5px;
 }
 
-.as_touch .active-scaffold .active-scaffold-header div.actions a {
+.as_touch .active-scaffold div.actions a {
 padding: 7px 5px;
 }
 
-.as_touch .active-scaffold-header div.actions .action_group ul {
+.as_touch div.actions .action_group ul {
 line-height: 130%;
 top: 23px;
 }
 
-.as_touch .active-scaffold .active-scaffold-header div.actions .action_group ul {
+.as_touch .active-scaffold div.actions .action_group ul {
 top: 23px;
 }
 
-.as_touch .active-scaffold-header div.actions a.new,
-.as_touch .active-scaffold-header div.actions a.new_existing,
-.as_touch .active-scaffold-header div.actions a.show_search,
-.as_touch .active-scaffold-header div.actions a.show_config_list,
-.as_touch .active-scaffold-header div.actions div.action_group div {
+.as_touch div.actions a.new,
+.as_touch div.actions a.new_existing,
+.as_touch div.actions a.show_search,
+.as_touch div.actions a.show_config_list,
+.as_touch div.actions div.action_group div {
 padding: 7px 5px 7px 25px;
 }
 
-.as_touch .active-scaffold .active-scaffold-header div.actions > a.new,
-.as_touch .active-scaffold .active-scaffold-header div.actions > a.new_existing,
-.as_touch .active-scaffold .active-scaffold-header div.actions > a.show_search,
-.as_touch .active-scaffold .active-scaffold-header div.actions > a.show_config_list,
-.as_touch .active-scaffold .active-scaffold-header div.actions div.action_group > div {
+.as_touch .active-scaffold div.actions > a.new,
+.as_touch .active-scaffold div.actions > a.new_existing,
+.as_touch .active-scaffold div.actions > a.show_search,
+.as_touch .active-scaffold div.actions > a.show_config_list,
+.as_touch .active-scaffold div.actions div.action_group > div {
 padding: 7px 5px 7px 25px;
 background-position: 5px 50%;
 }
@@ -973,12 +981,12 @@ padding: 7px 5px 7px 25px;
 padding: 4px 0px;
 }
 
-.as_touch .active-scaffold .active-scaffold-header div.actions a,
-.as_touch .active-scaffold .active-scaffold-header div.actions div {
+.as_touch .active-scaffold div.actions a,
+.as_touch .active-scaffold div.actions div {
   font: bold 14px arial;
 }
 
-.as_touch .active-scaffold .active-scaffold-header div.actions {
+.as_touch .active-scaffold div.actions {
   right: 15px;
 }
 

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

@@ -20,12 +20,11 @@
    form_id = element_form_id(:action => form_action, :id => @record.try(:id))
 %>
 <%=
-options = {:onsubmit => onsubmit,
-           :id => form_id,
+options = {:id => form_id,
            :multipart => multipart,
            :class => "as_form #{form_action.to_s}",
            :method => method,
-           'data-loading' => true}
+           'data-loading' => defined?(loading) ? loading : true}
 cancel_options = {:class => 'as_cancel'}
 
 cancel_options[:remote] = true if xhr #cancel link does nt have to care about multipart forms

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

@@ -1,17 +1,18 @@
 <%
-  url_options ||= params_for(:action => :index, :search => nil)
+  url_options ||= params_for(action: :index, id: nil, search: nil)
   submit_text ||= :search
+  xhr ||= request.xhr?
   options = {
-    :id => element_form_id(:action => 'search'),
-    :class => "as_form search",
-    :remote => xhr ||= request.xhr?,
-    :method => :get,
-    :'data-loading' => true
+    id: element_form_id(action: 'search'),
+    class: "as_form search",
+    remote: xhr,
+    data: {loading: true},
+    method: :get
   }
 -%>
 <%= form_tag url_options, options %>
   <ol class="form">
-   <% visibles, hiddens = visibles_and_hiddens(active_scaffold_config.field_search) %>
+    <% visibles, hiddens = visibles_and_hiddens(active_scaffold_config.field_search) %>
     <% visibles.each do |column| -%>
       <li class="form-element <%= column.css_class unless column.css_class.is_a?(Proc) %>"><%= search_attribute(column, @record) %></li>
     <% end -%>

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

@@ -1,14 +1,15 @@
 <%
-ActiveSupport::Deprecation.warn "Relying on @record to render form_asssociation partial with no parent_record local variable is deprecated", caller(1) unless local_assigns[:parent_record]
-parent_record ||= @record # TODO: remove when changing @record is removed, save @record, some partial can change @record
-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)
+associated = column.association.singular? ? [parent_record.send(column.name)].compact : parent_record.send(column.name).to_a
 if column.show_blank_record?(associated)
   show_blank_record = build_associated(column.association, parent_record)
 end
 disable_required_for_new = @disable_required_for_new
-@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" 
+@disable_required_for_new = !!show_blank_record unless (column.association.singular? && column.required?)
+subform_div_id = "#{sub_form_id(:association => column.name, :id => parent_record.id || generated_id(parent_record) || 99999999999)}-div"
+
+# render footer before rendering associated records, fixes create new on self-associations
+# so generated_id for blank associated record is not used in create new button
+footer = render(:partial => 'form_association_footer', :locals => {:parent_record => parent_record, :column => column, :associated => associated, :scope => scope})
 -%>
 <h5>
   <%= column.label -%>
@@ -16,11 +17,10 @@ subform_div_id = "#{sub_form_id(:association => column.name, :id => parent_recor
 </h5>
 <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 "#{active_scaffold_input_options(column, scope, :object => parent_record)[:name]}[0]", '' if column.plural_association? %>
+  <%= hidden_field_tag "#{(opts = active_scaffold_input_options(column, scope, :object => parent_record))[:name]}[0]", '', :id => "#{opts[:id]}_0" if column.association.collection? %>
   <%= render :partial => subform_partial_for_column(column), :locals => {:column => column, :parent_record => parent_record, :associated => associated, :show_blank_record => show_blank_record, :scope => scope} %>
-  <%= render :partial => 'form_association_footer', :locals => {:parent_record => parent_record, :column => column, :associated => associated, :scope => scope} -%>
+  <%= footer -%>
 </div>
 <%
-  @record = parent_record # TODO: remove when changing @record is removed, restore @record, some partials can change it
   @disable_required_for_new = disable_required_for_new
 -%>

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

@@ -4,7 +4,6 @@ begin
 rescue ActiveScaffold::ControllerNotFound
   remote_controller = nil
 end
-@record = parent_record
 
 show_add_existing = column_show_add_existing(column, parent_record)
 show_add_new = column_show_add_new(column, associated, parent_record)
@@ -13,14 +12,15 @@ 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
-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 => params[:parent_controller] || controller.controller_path) 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 => params[:parent_controller] || controller.controller_path) if show_add_new
+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
 
 -%>
 <div class="footer-wrapper">
   <div class="footer">
     <% if show_add_new -%>
-    <% if column.plural_association?
+    <% if column.association.collection?
          add_label = as_(:create_another, :model => column.association.klass.model_name.human)
          add_class = 'as_create_another'
        else
@@ -39,8 +39,8 @@ add_new_url = params_for(:controller => controller_path, :action => 'edit_associ
       <% else -%>
         <% select_options = options_from_collection_for_select(sorted_association_options_find(column.association, nil, parent_record), :to_param, :to_label)
            add_existing_id = "#{sub_form_id(:association => column.name, :id => parent_record.id || temporary_id || 99999999999)}-add-existing"
-           add_existing_label = column.plural_association? ? :add_existing : :replace_existing %>
-        <%= select_tag 'associated_id', '<option value="">'.html_safe + as_(:_select_) + '</option>'.html_safe + select_options %>
+           add_existing_label = column.association.collection? ? :add_existing : :replace_existing %>
+        <%= select_tag 'associated_id', content_tag(:option, as_(:_select_), value: '') + select_options %>
         <%= link_to as_(add_existing_label), edit_associated_url, :id => add_existing_id, :remote => true, :class=> "as-js-button as_#{add_existing_label}", :style => "display: none;" %>
       <% end -%>
     <% end -%>

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

@@ -1,8 +1,6 @@
 <%
   record_column = column
-  ActiveSupport::Deprecation.warn "Relying on @record to render form_asssociation_record partial with no :object is deprecated", caller(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
+  record = form_association_record
   readonly = (record.readonly? or not record.authorized_for?(:crud_type => :update))
   crud_type = record.new_record? ? :create : (readonly ? :read : :update)
   show_actions = false
@@ -34,57 +32,61 @@
   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 %>
-<% 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| %>
-<%
-  if column.respond_to? :each
-    columns_groups << column
-    next
-  end
-
-  next unless in_subform?(column, parent_record)
-  columns_length += 1
-  show_actions = true
-  if column.association && column.form_ui.nil?
-    column = column.clone
-    column.form_ui ||= :select
-  end
-  
-  col_class = default_col_class.clone
-  col_class << 'required' if column.required?
-  col_class << column.css_class unless column.css_class.nil? || column.css_class.is_a?(Proc)
-  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, false, record) %>
+<%= content_tag record_tag, :class => "sub-form-record" do %>
+  <% 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 => record) %>
+    <%= 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 %>
-<% 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])) %>
-      <%= link_to as_(:remove), '#', :class => 'destroy', :id => "#{options[:id]}-destroy" , :data => {:delete_id => tr_id} unless locked %>
+  <%= 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.respond_to? :each
+      columns_groups << column
+      next
+    end
+
+    next unless in_subform?(column, parent_record, record_column)
+    columns_length += 1
+    show_actions = true
+    if column.association && column.form_ui.nil?
+      column = column.clone
+      column.form_ui ||= :select
+    end
+
+    col_class = default_col_class.clone
+    col_class << 'required' if column.required?
+    col_class << column.css_class unless column.css_class.nil? || column.css_class.is_a?(Proc)
+    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, false, record) %>
     <% end %>
-    <% unless record.new_record? %>
-      <input type="hidden" name="<%= options[:name] -%>" id="<%= options[:id] -%>" value="<%= record.id -%>" />
-    <% end -%>
+  <% end -%>
+  <% if show_actions -%>
+    <%= content_tag column_tag, :class => "actions" do %>
+      <% if record_column.association.collection? && !locked %>
+        <%
+          auth = [:destroy, :delete_all, :delete].exclude?(record_column.association.dependent)
+          auth, reason = record.authorized_for?(:crud_type => :delete, :reason => true) unless auth
+        %>
+        <%= auth ? link_to(as_(:remove), '#', :class => 'destroy', :id => "#{options[:id]}-destroy" , :data => {:delete_id => tr_id}) : reason %>
+      <% end %>
+      <% unless record.new_record? %>
+        <input type="hidden" name="<%= options[:name] -%>" id="<%= options[:id] -%>" value="<%= record.id -%>" />
+      <% end -%>
+    <% end %>
+  <% end -%>
   <% end %>
-<% end -%>
-<% end %>
 
-<% columns_groups.each do |column| %>
-<%= 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) %>
+  <% columns_groups.each do |column| %>
+  <%= 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 %>
+    <% end %>
   <% end %>
   <% end %>
 <% end %>
-<% end %>
-</<%= record_tag %>>

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

@@ -2,7 +2,7 @@
 <%
   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} %>
+  <%= render :partial => 'horizontal_subform_header', :locals => {:parent_record => parent_record, :record_class => header_record_class, :parent_column => column} %>
 
   <%= 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 %>

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

@@ -3,7 +3,7 @@
     <%
     active_scaffold_config_for(record_class).subform.columns.each :for => record_class, :crud_type => :read do |column|
       next unless column.is_a? ActiveScaffold::DataStructures::Column
-      next unless in_subform?(column, parent_record)
+      next unless in_subform?(column, parent_record, parent_column)
       hidden = column_renders_as(column) == :hidden
       -%>
       <th class="<%= "#{column.name}-column #{'required' if column.required?} #{'hidden' if hidden}" %>">

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

@@ -1 +1,3 @@
-<%= columns.collect {|column| active_scaffold_human_condition_for(column)}.compact.to_sentence  %>
+<%= columns.collect {|column| active_scaffold_human_condition_for(column)}.compact.to_sentence  %>
+<%= tag(:br) if columns.present? && grouped_search? %>
+<%= as_(:grouped_by, column: active_scaffold_grouped_by_label) if grouped_search? %>

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

@@ -8,7 +8,7 @@
     <td>&nbsp;</td>
     <% end -%>
   <% end -%>
-  <% unless active_scaffold_config.action_links.empty? -%>
+  <% unless active_scaffold_config.action_links.empty? || grouped_search? -%>
     <td class="actions">&nbsp;</td>
   <% end -%>
 </tr>

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

@@ -5,5 +5,7 @@ default_sorting = active_scaffold_config.list.user.default_sorting
 <% columns.each do |column| -%>
   <%= render_column_heading(column, sorting, sorting.next_sorting_of(column, default_sorting.sorts_on?(column))) %>
 <% end -%>
+<% unless grouped_search? -%>
 <th class="actions">
 </th>
+<% end -%>