active_scaffold 3.2.20 → 3.3.0.rc

data/app/assets/stylesheets/active_scaffold_colors.css.scss

@@ -48,6 +48,7 @@ $nested_bg: #DAFFCD !default;
 $nested_border_color: #7FCF00 !default;
 $nested_footer_color: #444 !default;
 $nested_column_bg: #ECFFE7 !default;
+$nested_column_even_bg: #fff !default;
 $nested_column_border_color: $column_border_color !default;
 
 $second_nested_bg: #FFFFBB !default;
@@ -228,10 +229,13 @@ border-color: $nested_border_color;
 color: $nested_footer_color;
 }
 
-.active-scaffold .active-scaffold  td {
+.active-scaffold .active-scaffold tr.record {
 background-color: $nested_column_bg;
 border-color: $nested_column_border_color;
 }
+.active-scaffold .active-scaffold tr.even-record {
+background-color: $nested_column_even_bg;
+}
 
 .active-scaffold .active-scaffold td.inline-adapter-cell {
 background-color: $second_nested_bg;
@@ -335,6 +339,9 @@ color: $placeholder_color;
 border-color: $input_border_color;
 }
 
+.active-scaffold input:invalid,
+.active-scaffold textarea:invalid,
+.active-scaffold select:invalid,
 .active-scaffold .fieldWithErrors input,
 .active-scaffold .field_with_errors input,
 .active-scaffold .fieldWithErrors textarea,

data/app/assets/stylesheets/active_scaffold_layout.css

@@ -139,13 +139,6 @@ background-color: transparent;
 cursor: default;
 }
 
-.active-scaffold-header div.actions {
-position: absolute;
-right: 5px;
-top: 5px;
-text-align: right;
-}
-
 /* Table :: Column Headers
    ============================= */
 
@@ -264,6 +257,11 @@ line-height: 200%;
 display: none;
 width: 150px;
 right: 0px;
+z-index: 2;
+}
+.active-scaffold .actions .action_group.dyn ul {
+width: auto;
+display: block;
 }
 
 .active-scaffold .actions .action_group ul ul {
@@ -279,7 +277,7 @@ border-top: 1px dashed;
 display: block;
 position: relative;
 width: auto;
-z-index: 2;
+text-align: left;
 }
 
 .active-scaffold .actions .action_group ul li div {
@@ -296,6 +294,9 @@ z-index: 2;
   background-position: 5px 50%;
   background-repeat: no-repeat;
 }
+.active-scaffold .actions .action_group.dyn ul li a {
+  padding-left: 5px;
+}
 
 .active-scaffold .actions .action_group ul li.top {
 border-top-width: 0px;
@@ -787,6 +788,11 @@ background: none;
 display: none;
 }
 
+.active-scaffold .horizontal-sub-form .associated-record dl {
+float: left;
+margin-right: 5px;
+}
+
 .active-scaffold .sub-form .checkbox-list {
 padding: 0 2px 2px 2px;
 border: solid 1px;

data/{frontends/default/views → app/views/active_scaffold_overrides}/_form_association.html.erb

@@ -5,13 +5,18 @@ associated = associated.sort_by {|r| r.new_record? ? 99999999999 : r.id} unless
 if show_blank_record = column.show_blank_record?(associated)
   associated << build_associated(column, parent_record)
 end
+@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 || 99999999999})}-div" 
 -%>
 <h5><%= column.label -%></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)[:name]}[0]", '' if column.plural_association? %>
-<%= render :partial => subform_partial_for_column(column), :locals => {:column => column, :parent_record => parent_record, :associated => associated, :show_blank_record => show_blank_record, :scope => scope} %>
+  <%= hidden_field_tag "#{active_scaffold_input_options(column, scope)[:name]}[0]", '' if column.plural_association? %>
+  <%= 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} -%>
 </div>
 <%= link_to_visibility_toggle(subform_div_id, {:default_visible => !column.collapsed}) -%>
-<% @record = parent_record -%>
+<%
+  @record = parent_record
+  @disable_required_for_new = nil
+-%>

data/{frontends/default/views → app/views/active_scaffold_overrides}/_form_association_footer.html.erb

@@ -34,12 +34,13 @@ add_new_url = params_for(:action => 'edit_associated', :child_association => col
 
     <% if show_add_existing -%>
       <% if remote_controller and remote_controller.respond_to? :uses_record_select? and remote_controller.uses_record_select? -%>
-        <%= link_to_record_select as_(:add_existing), remote_controller.controller_path, :onselect => "ActiveScaffold.record_select_onselect(#{url_for(edit_associated_url).to_json}, #{active_scaffold_id.to_json}, id);" -%>
+        <%= link_to_record_select as_(:add_existing), remote_controller.controller_path, :onselect => "ActiveScaffold.record_select_onselect(#{edit_associated_url.to_json}, #{active_scaffold_id.to_json}, id);" -%>
       <% else -%>
-        <% select_options = options_for_select(options_for_association(column.association)) 
-           add_existing_id = "#{sub_form_id(:association => column.name)}-add-existing" %>
+        <% select_options = options_from_collection_for_select(sorted_association_options_find(column.association), :id, :to_label)
+           add_existing_id = "#{sub_form_id(:association => column.name)}-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 %>
-        <%= link_to as_(:add_existing), edit_associated_url, :id => add_existing_id, :remote => true, :class=> column.plural_association? ? 'as_add_existing' : 'as_replace_existing', :style => "display: none;" %>
+        <%= link_to as_(add_existing_label), edit_associated_url, :id => add_existing_id, :remote => true, :class=> "as_#{add_existing_label}", :style => "display: none;" %>
         <%= javascript_tag("ActiveScaffold.show('#{add_existing_id}');") %>
       <% end -%>
     <% end -%>

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

@@ -0,0 +1,85 @@
+<%
+  record_column = column
+  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)
+  tr_id = "association-#{options[:id]}"
+
+  if config.subform.layout == :vertical
+    record_tag ||= :div
+    row_tag ||= :ol
+    column_tag ||= :li
+    error_tag ||= :div
+    error_inner_tag ||= nil
+    default_col_class = ['form-element']
+    flatten = true unless local_assigns.has_key? :flatten
+  else
+    record_tag ||= :tbody
+    row_tag ||= :tr
+    column_tag ||= :td
+    error_tag ||= :tr
+    error_inner_tag ||= :td
+    default_col_class = []
+    flatten ||= false
+  end
+  index ||= 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 %>
+<% 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.is_a? ActiveScaffold::DataStructures::ActionColumns
+    columns_groups << column
+    next
+  end
+
+  next unless in_subform?(column, parent_record)
+  columns_length += 1
+  show_actions = true
+  column = column.clone
+  column.form_ui ||= :select if column.association
+  
+  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) %>
+  <% 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])) %>
+      <% destroy_id = "#{options[:id]}-destroy" %>
+      <%= link_to as_(:remove), '#', :class => 'destroy', :id => destroy_id , :onclick => "ActiveScaffold.delete_subform_record(\"#{tr_id}\"); return false;", :style=> "display: none;" %>
+      <%= javascript_tag("ActiveScaffold.show('#{destroy_id}');") if !locked %>
+    <% end %>
+    <% unless @record.new_record? %>
+      <input type="hidden" name="<%= options[:name] -%>" id="<%= options[:id] -%>" value="<%= @record.id -%>" />
+    <% 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) %>
+  <% end %>
+  <% end %>
+<% end %>
+<% end %>
+</<%= record_tag %>>

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

@@ -0,0 +1,23 @@
+<%
+  scope ||= nil
+  column_options = active_scaffold_input_options(column, scope)
+%>
+<dl<%= " class=\"#{col_class}\"".html_safe if local_assigns[:col_class].present? %>>
+  <dt>
+    <label for="<%= column_options[:id] %>"><%= column.label %></label>
+  </dt>
+  <dd>
+  <% unless local_assigns[:only_value] %>
+    <%=raw active_scaffold_input_for column, scope %>
+  <% else %>
+    <%= content_tag :span, get_column_value(@record, column), column_options.except(:name) %>
+    <%= hidden_field :record, column.association ? column.association.foreign_key : column.name, column_options -%>
+  <% end %>
+  <% if column.update_columns -%>
+    <%= loading_indicator_tag(:action => :render_field, :id => params[:id]) %>
+  <% end -%>
+  <% if column.description.present? -%>
+    <span class="description"><%= column.description %></span>
+  <% end -%>
+  </dd>
+</dl>

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

@@ -0,0 +1,12 @@
+<table cellpadding="0" cellspacing="0" id="<%= sub_form_list_id(:association => column.name) %>">
+  <% @record = associated.empty? ? build_associated(column, parent_record) : associated.last -%>
+  <%= render :partial => 'horizontal_subform_header', :locals => {:parent_record => parent_record, :record => @record} %>
+
+  <% 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 -%>
+  <tfoot>
+    <%= render :partial => 'horizontal_subform_footer', :locals => {:scope => column_scope(column, scope), :parent_record => parent_record, :column => column} %>
+  </tfoot>
+</table>

data/{frontends/default/views → app/views/active_scaffold_overrides}/_horizontal_subform_header.html.erb

@@ -1,9 +1,10 @@
 <thead>
   <tr>
     <%
-    active_scaffold_config_for(record.class).subform.columns.each :for => record.class, :crud_type => :read, :flatten => true do |column|
-      hidden = column_renders_as(column) == :hidden
+    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
       -%>
       <th class="<%= "#{column.name}-column #{'required' if column.required?} #{'hidden' if hidden}" %>"><label><%= column.label unless hidden %></label></th>
     <% end -%>

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

@@ -0,0 +1,35 @@
+<% if active_scaffold_config.list.messages_above_header %>
+<table>
+  <tbody>
+    <tr>
+      <td class="messages-container">
+        <p class="error-message message server-error" style="display:none;">
+          <%= as_(:internal_error).html_safe %>
+          <a href="#" class="close" title="<%= as_(:close).html_safe %>"><%= as_(:close).html_safe %></a>
+        </p>
+        <div id="<%= active_scaffold_messages_id -%>" class="action-messages">
+          <%= render :partial => 'messages' %>
+        </div>
+      </td>
+    </tr>
+  </tbody>
+</table>
+<% end %>
+<table cellpadding="0" cellspacing="0">
+  <thead>
+    <tr>
+      <% columns = list_columns %>
+      <%= render :partial => 'list_column_headings', :locals => {:columns => columns} %>
+    </tr>
+  </thead>
+  <%= render :partial => 'list_messages', :locals => {:columns => columns} %>
+  <tbody class="records" id="<%= active_scaffold_tbody_id %>">
+    <% if !@records.empty? -%>
+      <%= render :partial => 'list_record', :collection => @page.items, :locals => {:hidden => false, :columns => columns, :action_links => active_scaffold_config.action_links.member, :data_refresh => url_for(params_for(:action => :row, :id => '--ID--', :_method => :get))} %>
+    <% end -%>
+    <% if columns.any? {|c| c.calculation?} -%>
+      <%= render :partial => 'list_calculations', :locals => {:columns => columns} %>
+    <% end -%>
+  </tbody>
+</table>
+<%= render :partial => 'list_pagination' %>

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

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

data/{frontends/default/views → app/views/active_scaffold_overrides}/_list_messages.html.erb

@@ -2,19 +2,21 @@
 <tbody class="messages">
   <tr class="record even-record">
     <td colspan="<%= column_count -%>" class="messages-container">
+<% unless active_scaffold_config.list.messages_above_header %>
       <p class="error-message message server-error" style="display:none;">
         <%= as_(:internal_error).html_safe %>
         <a href="#" class="close" title="<%= as_(:close).html_safe %>"><%= as_(:close).html_safe %></a>
       </p>
-      <div id="<%= active_scaffold_messages_id -%>">
+      <div id="<%= active_scaffold_messages_id -%>" class="action-messages">
         <%= render :partial => 'messages' %>
       </div>
+<% end %>
       <div class="filtered-message" <%= ' style="display:none;" '.html_safe unless @filtered %>>
         <%= @filtered.is_a?(Array) ? render(:partial => 'human_conditions', :locals => {:columns => @filtered}) : as_(active_scaffold_config.list.filtered_message) %>
         <% if active_scaffold_config.list.show_search_reset && @filtered -%>
         <div class="reset">
           <%= loading_indicator_tag(:action => :record, :id => nil) %>
-          <%= render_action_link(active_scaffold_config.list.reset_link, params_for(:search => '')) %>
+          <%= render_action_link(active_scaffold_config.list.reset_link) %>
         </div>
         <% end -%>
       </div>
@@ -24,5 +26,3 @@
     </td>
   </tr>
 </tbody>    
-
-

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

@@ -0,0 +1,30 @@
+<%
+record = list_record if list_record # compat with render :partial :collection
+columns ||= list_columns
+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 %>">
+  <% 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 -%>
+
+    <%= 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 %>
+  <% end -%>
+    
+  <td class="actions"><table cellpadding="0" cellspacing="0">
+    <tr>
+      <td class="indicator-container">
+        <%= loading_indicator_tag(:action => :record, :id => record.id) %>
+      </td>
+      <%= display_action_links(action_links, record, :level_0_tag => :td, :for => record.persisted? ? record : record.class) %>
+    </tr>
+  </table></td>
+
+  
+  <%= render_nested_view(action_links, record) unless @nested_auto_open.nil? %>
+</tr>

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

@@ -0,0 +1 @@
+ActiveScaffold.replace_html('<%= active_scaffold_content_id %>', '<%= escape_javascript(render('list')) %>');

data/{frontends/default/views → app/views/active_scaffold_overrides}/_render_field.js.erb

@@ -4,6 +4,7 @@
   else
     active_scaffold_config.columns[render_field.to_sym]
   end
+  return unless @main_columns.include? column.name
   @rendered ||= Set.new
   return if @rendered.include? column.name
   @rendered << column.name
@@ -12,9 +13,16 @@
   else
     options = {:is_subform => false, :field_class => "#{column.name}-input"}
   end
+  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))
+  else
+    render(:partial => form_partial_for_column(column), :locals => { :column => column, :scope => scope })
+  end
 -%>
 
-ActiveScaffold.render_form_field('<%= source_id %>','<%= escape_javascript(render(:partial => form_partial_for_column(column), :locals => { :column => column, :scope => scope })) %>', <%= options.to_json.html_safe %>);
+ActiveScaffold.render_form_field('<%= source_id %>','<%= escape_javascript(html) %>', <%= options.to_json.html_safe %>);
 <%if column.update_columns && !column.update_columns.empty?%>
   <%=  render(:partial => "render_field", :collection => column.update_columns, :locals => {:source_id => source_id, :scope => scope})%>
 <%end%>