active_scaffold 3.0.22 → 3.0.23

data/frontends/default/stylesheets/stylesheet.css

@@ -260,6 +260,10 @@ background: #333 url(../../../images/active_scaffold/default/indicator-small.gif
 margin-left: 5px;
 }
 
+.active-scaffold th.hidden, .active-scaffold td.hidden {
+display: none;
+}
+
 /* Table :: Record Rows
    ============================= */
 
@@ -1086,4 +1090,4 @@ padding: 5px 2px 5px 5px;
 
 .as_touch tr.record td {
 padding: 5px 10px;
-}
+}

data/frontends/default/views/_horizontal_subform_header.html.erb

@@ -2,9 +2,10 @@
   <tr>
     <%
     active_scaffold_config_for(@record.class).subform.columns.each :for => @record.class, :flatten => true do |column|
-      next unless in_subform?(column, parent_record) and column_renders_as(column) != :hidden
+      hidden = column_renders_as(column) == :hidden
+      next unless in_subform?(column, parent_record)
       -%>
-      <th<%= ' class="required"' if column.required? %>><label><%= column.label %></label></th>
+      <th class="<%= "#{'required' if column.required?} #{'hidden' if hidden}" %>"><label><%= column.label unless hidden %></label></th>
     <% end -%>
   </tr>
 </thead>

data/frontends/default/views/_horizontal_subform_header.html.erb~

@@ -0,0 +1,10 @@
+<thead>
+  <tr>
+    <%
+    active_scaffold_config_for(@record.class).subform.columns.each :for => @record.class, :flatten => true do |column|
+      next unless in_subform?(column, parent_record) and column_renders_as(column) != :hidden
+      -%>
+      <th<%= ' class="required"' if column.required? %>><label><%= column.label %></label></th>
+    <% end -%>
+  </tr>
+</thead>

data/frontends/default/views/_horizontal_subform_record.html.erb

@@ -15,7 +15,7 @@
   column = column.clone
   column.form_ui ||= :select if column.association
 -%>
-  <td>
+  <td<%= ' class="hidden"'.html_safe if column_renders_as(column) == :hidden %>>
     <% unless readonly and not @record.new_record? or not @record.authorized_for?(:crud_type => crud_type, :column => column.name) -%>
       <%= render :partial => form_partial_for_column(column), :locals => { :column => column, :scope => scope } -%>
     <% else -%>

data/frontends/default/views/_horizontal_subform_record.html.erb~

@@ -0,0 +1,38 @@
+<%
+   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]}"
+%>
+<tr id="<%= tr_id %>" class="association-record <%= 'association-record-new' if @record.new_record? -%> <%= 'locked' if locked -%>">
+<% config.subform.columns.each :for => @record.class, :crud_type => crud_type, :flatten => true do |column| %>
+<%
+  next unless in_subform?(column, parent_record)
+  show_actions = true
+  column = column.clone
+  column.form_ui ||= :select if column.association
+-%>
+  <td class="<%= 'hidden' if column_renders_as(column) == :hidden %>">
+    <% unless readonly and not @record.new_record? or not @record.authorized_for?(:crud_type => crud_type, :column => column.name) -%>
+      <%= render :partial => form_partial_for_column(column), :locals => { :column => column, :scope => scope } -%>
+    <% else -%>
+      <p><%= get_column_value(@record, column) -%></p>
+    <% end -%>
+  </td>
+<% end -%>
+<% if show_actions -%>
+  <td class="actions">
+    <% 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 -%>
+  </td>
+<% end -%>
+</tr>

data/lib/active_scaffold/bridges/record_select/lib/record_select_bridge.rb

@@ -42,8 +42,11 @@ module ActiveScaffold
           params.merge!({column.association.primary_key_name => ''})
         end
  
-        record_select_options = {:controller => remote_controller, :id => options[:id]}
-        record_select_options.merge!(active_scaffold_input_text_options)
+        record_select_options = active_scaffold_input_text_options(
+          :controller => remote_controller,
+          :id => options[:id],
+          :class => options[:class]
+        )
         record_select_options.merge!(column.options)
         if options['data-update_url']
           record_select_options[:onchange] = %|function(id, label) {
@@ -51,11 +54,13 @@ module ActiveScaffold
             }|
         end
  
-        if multiple
+        html = if multiple
           record_multi_select_field(options[:name], value || [], record_select_options)
         else
           record_select_field(options[:name], value || column.association.klass.new, record_select_options)
         end
+        html = self.class.field_error_proc.call(html, self) if @record.errors[column.name].any?
+        html
       end
     end
 

data/lib/active_scaffold/bridges/record_select/lib/record_select_bridge.rb~

@@ -42,9 +42,17 @@ module ActiveScaffold
           params.merge!({column.association.primary_key_name => ''})
         end
  
-        record_select_options = {:controller => remote_controller, :id => options[:id]}
-        record_select_options.merge!(active_scaffold_input_text_options)
+        record_select_options = active_scaffold_input_text_options(
+          :controller => remote_controller,
+          :id => options[:id],
+          :class => options[:class]
+        )
         record_select_options.merge!(column.options)
+        if options['data-update_url']
+          record_select_options[:onchange] = %|function(id, label) {
+              ActiveScaffold.update_column($("##{options[:id]}"), "#{options['data-update_url']}", #{options['data-update_send_form'].to_json}, "#{options[:id]}", id);
+            }|
+        end
  
         if multiple
           record_multi_select_field(options[:name], value || [], record_select_options)
@@ -63,7 +71,7 @@ module ActiveScaffold
       def field_search_record_select_value(column)
         begin
           value = field_search_params[column.name]
-          value = unless value.blank?
+          unless value.blank?
             if column.options[:multiple]
               column.association.klass.find value.collect!(&:to_i)
             else
@@ -74,8 +82,6 @@ module ActiveScaffold
           logger.error Time.now.to_s + "Sorry, we are not that smart yet. Attempted to restore search values to search fields but instead got -- #{e.inspect} -- on the ActiveScaffold column = :#{column.name} in #{@controller.class}"
           raise e
         end
-
-        active_scaffold_record_select(column, options, value, column.options[:multiple])
       end
     end
   end

data/lib/active_scaffold/helpers/association_helpers.rb

@@ -3,7 +3,9 @@ module ActiveScaffold
     module AssociationHelpers
       # Provides a way to honor the :conditions on an association while searching the association's klass
       def association_options_find(association, conditions = nil)
-        association.klass.where(conditions).where(association.options[:conditions]).all
+        relation = association.klass.where(conditions).where(association.options[:conditions])
+        relation = relation.includes(association.options[:include]) if association.options[:include]
+        relation.all
       end
 
       def association_options_count(association, conditions = nil)

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 0
-    PATCH = 22
+    PATCH = 23
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 41
   prerelease: 
   segments: 
   - 3
   - 0
-  - 22
-  version: 3.0.22
+  - 23
+  version: 3.0.23
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-30 00:00:00 +02:00
+date: 2011-09-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -195,7 +195,9 @@ files:
 - frontends/default/views/_search_attribute.html.erb
 - frontends/default/views/action_confirmation.html.erb
 - frontends/default/views/_base_form.html.erb~
+- frontends/default/views/_horizontal_subform_header.html.erb~
 - frontends/default/views/_form_association_footer.html.erb~
+- frontends/default/views/_horizontal_subform_record.html.erb~
 - lib/active_scaffold.rb
 - lib/active_scaffold_env.rb
 - lib/active_scaffold/actions/common_search.rb