active_scaffold 3.1.8 → 3.1.9

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

@@ -147,12 +147,17 @@ $(document).ready(function() {
       return true;
     } else return false;
   });
-  $('input.update_form, select.update_form').live('change', function(event) {
+  $('input.update_form, textarea.update_form, select.update_form').live('change', function(event) {
     var element = $(this);
     var value = element.is("input:checkbox:not(:checked)") ? null : element.val();
     ActiveScaffold.update_column(element, element.attr('data-update_url'), element.attr('data-update_send_form'), element.attr('id'), value);
     return true;
   });
+  $('input.recordselect.update_form').live('recordselect:change', function(event, id, label) {
+    var element = $(this);
+    ActiveScaffold.update_column(element, element.attr('data-update_url'), element.attr('data-update_send_form'), element.attr('id'), id);
+    return true;
+  });
   
   $('select.as_search_range_option').live('change', function(event) {
     ActiveScaffold[$(this).val() == 'BETWEEN' ? 'show' : 'hide']($(this).parent().find('.as_search_range_between'));

data/app/assets/javascripts/jquery/active_scaffold.js~

@@ -147,7 +147,7 @@ $(document).ready(function() {
       return true;
     } else return false;
   });
-  $('input.update_form, select.update_form').live('change', function(event) {
+  $('input.update_form, text_area.update_form, select.update_form').live('change', function(event) {
     var element = $(this);
     var value = element.is("input:checkbox:not(:checked)") ? null : element.val();
     ActiveScaffold.update_column(element, element.attr('data-update_url'), element.attr('data-update_send_form'), element.attr('id'), value);
@@ -507,7 +507,7 @@ var ActiveScaffold = {
     }
     var associated = $(record).next();
     this.remove(record);
-    while (associated && associated.hasClassName('associated-record')) {
+    while (associated.hasClass('associated-record')) {
       record = associated;
       associated = $(record).next();
       this.remove(record);

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

@@ -236,11 +236,16 @@ document.observe("dom:loaded", function() {
     event.memo.url = url;
     return true;
   });
-  document.on('change', 'input.update_form, select.update_form', function(event) {
+  document.on('change', 'input.update_form, textarea.update_form, select.update_form', function(event) {
     var element = event.findElement();
     ActiveScaffold.update_column(element, element.readAttribute('data-update_url'), element.hasAttribute('data-update_send_form'), element.readAttribute('id'), element.getValue());
     return true;
   });
+  document.on('recordselect:change', 'input.recordselect.update_form', function(event) {
+    var element = event.findElement();
+    ActiveScaffold.update_column(element, element.readAttribute('data-update_url'), element.hasAttribute('data-update_send_form'), element.readAttribute('id'), element.memo.id);
+    return true;
+  });
   document.on('change', 'select.as_search_range_option', function(event) {
     var element = event.findElement();
     Element[element.value == 'BETWEEN' ? 'show' : 'hide'](element.readAttribute('id').sub('_opt', '_between'));

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

@@ -1,4 +1,4 @@
-<h4><%= active_scaffold_config.show.label(@record.to_label.nil? ? nil : clean_column_value(@record.to_label)) %></h4>
+<h4><%= active_scaffold_config.show.label(@record.to_label.nil? ? nil : @record.to_label) %></h4>
 
 <%= render :partial => 'show_columns', :locals => {:columns => active_scaffold_config.show.columns} -%>
 

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

@@ -1,4 +1,3 @@
-<% debugger %>
 <h4><%= active_scaffold_config.show.label(@record.to_label.nil? ? nil : clean_column_value(@record.to_label)) %></h4>
 
 <%= render :partial => 'show_columns', :locals => {:columns => active_scaffold_config.show.columns} -%>

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

@@ -3,4 +3,4 @@
                                                 :form_action => form_action ||= :update,
                                                 :method => method ||= :put,
                                                 :cancel_link => cancel_link,
-                                                :headline => headline ||= @record.to_label.nil? ? active_scaffold_config.update.label : as_(:update_model, :model => clean_column_value(@record.to_label))} %>
+                                                :headline => headline ||= @record.to_label.nil? ? active_scaffold_config.update.label : as_(:update_model, :model => @record.to_label)} %>

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

@@ -0,0 +1,6 @@
+<% cancel_link = true if cancel_link.nil? %>
+<%= render :partial => "base_form", :locals => {:xhr => xhr ||= nil,
+                                                :form_action => form_action ||= :update,
+                                                :method => method ||= :put,
+                                                :cancel_link => cancel_link,
+                                                :headline => headline ||= @record.to_label.nil? ? active_scaffold_config.update.label : as_(:update_model, :model => clean_column_value(@record.to_label))} %>

data/frontends/default/views/update_column.js.erb

@@ -5,7 +5,7 @@
 <% end%>
 <% column = active_scaffold_config.columns[params[:column]]%>
 <% if column.inplace_edit%>
-  ActiveScaffold.replace_html('<%=@column_span_id%>','<%=escape_javascript(format_inplace_edit_column(@record, column))%>');
+  ActiveScaffold.replace_html('<%=@column_span_id%>','<%=escape_javascript(get_column_value(@record, column))%>');
 <% else%>
   <% formatted_value = get_column_value(@record, column)%>
   ActiveScaffold.replace_html('<%=@column_span_id%>','<%=escape_javascript(formatted_value)%>');

data/frontends/default/views/update_column.js.erb~

@@ -5,10 +5,10 @@
 <% end%>
 <% column = active_scaffold_config.columns[params[:column]]%>
 <% if column.inplace_edit%>
-  ActiveScaffold.replace_html('<%=column_span_id%>','<%=escape_javascript(format_inplace_edit_column(@record, column))%>');
+  ActiveScaffold.replace_html('<%=@column_span_id%>','<%=escape_javascript(format_inplace_edit_column(@record, column))%>');
 <% else%>
   <% formatted_value = get_column_value(@record, column)%>
-  ActiveScaffold.replace_html('<%=column_span_id%>','<%=escape_javascript(formatted_value)%>');
+  ActiveScaffold.replace_html('<%=@column_span_id%>','<%=escape_javascript(formatted_value)%>');
 <% end%>
 <% if column.calculation?%>
  ActiveScaffold.replace_html('<%=active_scaffold_calculations_id(column)%>', '<%=escape_javascript(render_column_calculation(column))%>');

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

@@ -33,17 +33,10 @@ class ActiveScaffold::Bridges::RecordSelect
           params.merge!({column.association.primary_key_name => ''})
         end
  
-        record_select_options = active_scaffold_input_text_options(
-          :controller => remote_controller,
-          :id => options[:id],
-          :class => options[:class].gsub(/update_form/, '')
+        record_select_options = active_scaffold_input_text_options(options).merge(
+          :controller => remote_controller
         )
         record_select_options.merge!(column.options)
-        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 = if multiple
           record_multi_select_field(options[:name], value || [], record_select_options)
@@ -55,17 +48,9 @@ class ActiveScaffold::Bridges::RecordSelect
       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/, '')
+        record_select_options = active_scaffold_input_text_options(options).merge(
+          :controller => remote_controller
         )
-        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

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -119,7 +119,7 @@ module ActiveScaffold
       ## Overrides
       ##
       def active_scaffold_column_text(column, record)
-        truncate(clean_column_value(record.send(column.name)), :length => column.options[:truncate] || 50)
+        clean_column_value(truncate(record.send(column.name), :length => column.options[:truncate] || 50))
       end
 
       def active_scaffold_column_checkbox(column, record)
@@ -190,25 +190,25 @@ module ActiveScaffold
       end
 
       def format_association_value(value, column, size)
-        case column.association.macro
+        format_value case column.association.macro
           when :has_one, :belongs_to
             if column.polymorphic_association?
-              format_value("#{value.class.model_name.human}: #{value.to_label}")
+              "#{value.class.model_name.human}: #{value.to_label}"
             else
-              format_value(value.to_label)
+              value.to_label
             end
           when :has_many, :has_and_belongs_to_many
             if column.associated_limit.nil?
-              firsts = value.collect { |v| clean_column_value(v.to_label) }
+              firsts = value.collect { |v| v.to_label }
             else
               firsts = value.first(column.associated_limit)
-              firsts.collect! { |v| clean_column_value(v.to_label) }
+              firsts.collect! { |v| v.to_label }
               firsts[column.associated_limit] = '…' if value.size > column.associated_limit
             end
             if column.associated_limit == 0
               size if column.associated_number?
             else
-              joined_associated = format_value(firsts.join(active_scaffold_config.list.association_join_text))
+              joined_associated = firsts.join(active_scaffold_config.list.association_join_text)
               joined_associated << " (#{size})" if column.associated_number? and column.associated_limit and value.size > column.associated_limit
               joined_associated
             end
@@ -256,14 +256,6 @@ module ActiveScaffold
          column.inplace_edit != :ajax and (override_form_field?(column) or column.form_ui or (column.column and override_input?(column.column.type)))
       end
 
-      def format_inplace_edit_column(record,column)
-        if column.list_ui == :checkbox
-          active_scaffold_column_checkbox(column, record)
-        else
-          format_column_value(record, column)
-        end
-      end
-
       def active_scaffold_inplace_edit(record, column, options = {})
         formatted_column = options[:formatted_column] || format_column_value(record, column)
         id_options = {:id => record.id.to_s, :action => 'update_column', :name => column.name.to_s}

data/lib/active_scaffold/helpers/list_column_helpers.rb~

@@ -119,7 +119,7 @@ module ActiveScaffold
       ## Overrides
       ##
       def active_scaffold_column_text(column, record)
-        truncate(clean_column_value(record.send(column.name)), :length => column.options[:truncate] || 50)
+        clean_column_value(truncate(record.send(column.name), :length => column.options[:truncate] || 50))
       end
 
       def active_scaffold_column_checkbox(column, record)
@@ -190,25 +190,25 @@ module ActiveScaffold
       end
 
       def format_association_value(value, column, size)
-        case column.association.macro
+        format_value case column.association.macro
           when :has_one, :belongs_to
             if column.polymorphic_association?
-              format_value("#{value.class.model_name.human}: #{value.to_label}")
+              "#{value.class.model_name.human}: #{value.to_label}"
             else
-              format_value(value.to_label)
+              value.to_label
             end
           when :has_many, :has_and_belongs_to_many
             if column.associated_limit.nil?
-              firsts = value.collect { |v| clean_column_value(v.to_label) }
+              firsts = value.collect { |v| v.to_label }
             else
               firsts = value.first(column.associated_limit)
-              firsts.collect! { |v| clean_column_value(v.to_label) }
+              firsts.collect! { |v| v.to_label }
               firsts[column.associated_limit] = '…' if value.size > column.associated_limit
             end
             if column.associated_limit == 0
               size if column.associated_number?
             else
-              joined_associated = format_value(firsts.join(active_scaffold_config.list.association_join_text))
+              joined_associated = firsts.join(active_scaffold_config.list.association_join_text)
               joined_associated << " (#{size})" if column.associated_number? and column.associated_limit and value.size > column.associated_limit
               joined_associated
             end
@@ -279,7 +279,7 @@ module ActiveScaffold
           column = column.clone
           column.options = column.options.clone
           column.form_ui = :select if (column.association && column.form_ui.nil?)
-          returning(content_tag(:div, active_scaffold_input_for(column), :style => "display:none;", :class => inplace_edit_control_css_class)) do
+          content_tag(:div, active_scaffold_input_for(column), :style => "display:none;", :class => inplace_edit_control_css_class).tap do
             @record = old_record
           end
         end

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 1
-    PATCH = 8
+    PATCH = 9
 
     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: 19
+  hash: 17
   prerelease: 
   segments: 
   - 3
   - 1
-  - 8
-  version: 3.1.8
+  - 9
+  version: 3.1.9
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-09 00:00:00 Z
+date: 2011-11-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -205,6 +205,7 @@ files:
 - frontends/default/views/on_create.js.erb~
 - frontends/default/views/_horizontal_subform_record.html.erb~
 - frontends/default/views/_list_with_header.html.erb~
+- frontends/default/views/_update_form.html.erb~
 - lib/active_scaffold.rb
 - lib/active_scaffold_env.rb
 - lib/active_scaffold/actions/core.rb