active_scaffold 3.1.7 → 3.1.8

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

@@ -1,6 +1,7 @@
 <% case ActiveScaffold.js_framework %>
 <% when :jquery %>
 <% require_asset "jquery-ui" %>
+<% require_asset "jquery-ui-timepicker-addon" %>
 <% require_asset "jquery/active_scaffold" %>
 <% require_asset "jquery/jquery.editinplace" %>
 <% require_asset "jquery/date_picker_bridge" %>

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

@@ -1,6 +1,6 @@
 <table cellpadding="0" cellspacing="0">
   <%
-    record = if associated.empty?
+    @record = if associated.empty?
       if column.singular_association?
         parent_record.send("build_#{column.name}".to_sym)
       else
@@ -10,7 +10,7 @@
       associated.last
     end
   -%>
-  <%= render :partial => 'horizontal_subform_header', :locals => {:parent_record => parent_record, :record => record} %>
+  <%= render :partial => 'horizontal_subform_header', :locals => {:parent_record => parent_record, :record => @record} %>
 
   <tbody id="<%= sub_form_list_id(:association => column.name) %>">
     <% associated.each_index do |index| %>
@@ -25,8 +25,8 @@
     <%= render :partial => 'horizontal_subform_record', :locals => {:scope => column_scope(column), :parent_record => parent_record, :column => column, :locked => show_blank_record && @record.new_record? && @record == associated.last} %>
     <% end -%>
   </tbody>
-  <tfooter>
+  <tfoot>
     <%= render :partial => 'horizontal_subform_footer', :locals => {:scope => column_scope(column), :parent_record => parent_record, :column => column} %>
-  </tfooter>
+  </tfoot>
 </table>
 <%= render :partial => 'form_association_footer', :locals => {:parent_record => parent_record, :column => column, :associated => associated} -%>

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

@@ -1,6 +1,6 @@
 <table cellpadding="0" cellspacing="0">
   <%
-    record = if associated.empty?
+    @record = if associated.empty?
       if column.singular_association?
         parent_record.send("build_#{column.name}".to_sym)
       else
@@ -10,7 +10,7 @@
       associated.last
     end
   -%>
-  <%= render :partial => 'horizontal_subform_header', :locals => {:parent_record => parent_record, :record => record} %>
+  <%= render :partial => 'horizontal_subform_header', :locals => {:parent_record => parent_record, :record => @record} %>
 
   <tbody id="<%= sub_form_list_id(:association => column.name) %>">
     <% associated.each_index do |index| %>
@@ -25,5 +25,8 @@
     <%= render :partial => 'horizontal_subform_record', :locals => {:scope => column_scope(column), :parent_record => parent_record, :column => column, :locked => show_blank_record && @record.new_record? && @record == associated.last} %>
     <% end -%>
   </tbody>
+  <tfooter>
+    <%= render :partial => 'horizontal_subform_footer', :locals => {:scope => column_scope(column), :parent_record => parent_record, :column => column} %>
+  </tfooter>
 </table>
 <%= render :partial => 'form_association_footer', :locals => {:parent_record => parent_record, :column => column, :associated => associated} -%>

data/lib/active_scaffold/actions/core.rb~

@@ -36,8 +36,8 @@ module ActiveScaffold::Actions
         @scope = params[:scope]
         
         if column.send_form_on_update_column
-          hash = if params[:scope]
-            params[:scope].gsub('[','').split(']').inject(params[:record]) do |hash, index|
+          hash = if @scope
+            @scope.gsub('[','').split(']').inject(params[:record]) do |hash, index|
               hash[index]
             end
           else
@@ -165,7 +165,7 @@ module ActiveScaffold::Actions
         params = params[:record] || {} unless params[model.inheritance_column] # in create action must be inside record key
         model = params.delete(model.inheritance_column).camelize.constantize if params[model.inheritance_column]
       end
-      model.respond_to?(:build) ? model.build(build_options || {}) : model.new
+      model.new(build_options || {})
     end
 
     private

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

@@ -16,6 +16,8 @@ class ActiveScaffold::Bridges::RecordSelect
           active_scaffold_record_select(column, options, @record.send(column.name), multiple)
         elsif column.plural_association?
           active_scaffold_record_select(column, options, @record.send(column.name), true)
+        else
+          active_scaffold_record_select_autocomplete(column, options)
         end
       end
 
@@ -51,6 +53,23 @@ class ActiveScaffold::Bridges::RecordSelect
         html = self.class.field_error_proc.call(html, self) if @record.errors[column.name].any?
         html
       end
+      
+      def active_scaffold_record_select_autocomplete(column, options)
+        record_select_options = active_scaffold_input_text_options(
+          :controller => active_scaffold_controller_for(@record.class).controller_path,
+          :id => options[:id],
+          :class => options[:class].gsub(/update_form/, '')
+        )
+        if options['data-update_url']
+          record_select_options[:onchange] = %|function(id, label) {
+              ActiveScaffold.update_column(null, "#{options['data-update_url']}", #{options['data-update_send_form'].to_json}, "#{options[:id]}", id);
+            }|
+        end
+
+        html = record_select_autocomplete(options[:name], @record, record_select_options)
+        html = self.class.field_error_proc.call(html, self) if @record.errors[column.name].any?
+        html
+      end
     end
 
     module SearchColumnHelpers

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

@@ -16,6 +16,8 @@ class ActiveScaffold::Bridges::RecordSelect
           active_scaffold_record_select(column, options, @record.send(column.name), multiple)
         elsif column.plural_association?
           active_scaffold_record_select(column, options, @record.send(column.name), true)
+        else
+          active_scaffold_record_select_autocomplete(column, options)
         end
       end
 
@@ -34,7 +36,7 @@ class ActiveScaffold::Bridges::RecordSelect
         record_select_options = active_scaffold_input_text_options(
           :controller => remote_controller,
           :id => options[:id],
-          :class => options[:class]
+          :class => options[:class].gsub(/update_form/, '')
         )
         record_select_options.merge!(column.options)
         if options['data-update_url']
@@ -51,6 +53,23 @@ class ActiveScaffold::Bridges::RecordSelect
         html = self.class.field_error_proc.call(html, self) if @record.errors[column.name].any?
         html
       end
+      
+      def active_scaffold_record_select_autocomplete(column, options)
+        record_select_options = active_scaffold_input_text_options(
+          :controller => active_scaffold_controller_for(@record.class).controller_path,
+          :id => options[:id],
+          :class => options[:class].gsub(/update_form/, '')
+        )
+        if options['data-update_url']
+          record_select_options[:onchange] = %|function(id, label) {
+              ActiveScaffold.update_column(null, "#{options['data-update_url']}", #{options['data-update_send_form'].to_json}, "#{options[:id]}", id);
+            }|
+        end
+
+        html = record_select_autocomplete(options[:name], value, record_select_options)
+        html = self.class.field_error_proc.call(html, self) if @record.errors[column.name].any?
+        html
+      end
     end
 
     module SearchColumnHelpers

data/lib/active_scaffold/version.rb

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