active_scaffold 3.0.25 → 3.0.26

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

@@ -0,0 +1,18 @@
+<% new_row = render :partial => 'list_record', :locals => {:record => @record} %>
+ActiveScaffold.create_record_row('<%= active_scaffold_id %>', '<%= escape_javascript(new_row) %>', <%= {:insert_at => :top}.to_json.html_safe %>);
+
+<% if active_scaffold_config.list.columns.any? {|c| c.calculation?} %>
+  ActiveScaffold.replace('<%= active_scaffold_calculations_id %>', '<%= escape_javascript(render(:partial => 'list_calculations')) %>');
+<%end%>
+
+<% if form_stays_open ||= true %>
+  <%# why not just re-render the form? that wouldn't utilize a possible do_new override which sets default values.%>
+  ActiveScaffold.reset_form('<%= element_form_id %>');
+  ActiveScaffold.replace_html('<%= element_messages_id(:action => :add_existing) %>', '<%= escape_javascript(render(:partial => 'form_messages')) %>');
+  <%# have to delay the focus, because there's no "firstElement" in prototype until at least one element is not disabled%>
+  <% if ActiveScaffold.js_framework == :prototype %>
+      ActiveScaffold.focus_first_element_of_form.defer('<%= element_form_id %>');
+  <% end %>
+<% else %>
+  ActiveScaffold.find_action_link('<%element_form_id(:action => :new_existing)%>').close();
+<% end %>

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

@@ -2,9 +2,6 @@ module ActiveScaffold::Actions
   module Create
     def self.included(base)
       base.before_filter :create_authorized_filter, :only => [:new, :create]
-      base.verify :method => :post,
-                  :only => :create,
-                  :redirect_to => { :action => :index }
     end
 
     def new
@@ -106,6 +103,8 @@ module ActiveScaffold::Actions
           create_save
         end
       rescue ActiveRecord::RecordInvalid
+        self.successful = false
+        flash[:error] = $!.messages
       end
     end
 

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

@@ -18,7 +18,7 @@ module ActiveScaffold::Actions
     # for inline (inlist) editing
     def update_column
       do_update_column
-      render :action => 'update_column', :locals => {:column_span_id => params[:editor_id] || params[:editorId]}
+      @column_span_id = params[:editor_id] || params[:editorId]
     end
 
     protected
@@ -92,9 +92,11 @@ module ActiveScaffold::Actions
           end
         end
       rescue ActiveRecord::RecordInvalid
+        self.successful = false
+        flash[:error] = $!.message
       rescue ActiveRecord::StaleObjectError
         @record.errors.add(:base, as_(:version_inconsistency))
-        self.successful=false
+        self.successful = false
       rescue ActiveRecord::RecordNotSaved
         @record.errors.add(:base, as_(:record_not_saved)) if @record.errors.empty?
         self.successful = false

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,18 +48,11 @@ 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/, '')
+        remote_controller = active_scaffold_controller_for(column.association.klass).controller_path
+        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], value, record_select_options)
+        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

data/lib/active_scaffold/data_structures/nested_info.rb

@@ -107,7 +107,7 @@ module ActiveScaffold::DataStructures
         if association.primary_key_name == current.primary_key_name
           # show columns for has_many and has_one child associationes
           constrained_fields << current.name.to_sym if current.belongs_to? 
-          @child_association = current
+          @child_association = current if current.klass == @parent_model
         end
       end
     end

data/lib/active_scaffold/data_structures/nested_info.rb~

@@ -6,7 +6,6 @@ module ActiveScaffold::DataStructures
       else
         session_info = session_storage[:nested].clone
         begin
-          debugger
           session_info[:parent_scaffold] = "#{session_info[:parent_scaffold].to_s.camelize}Controller".constantize
           session_info[:parent_model] = session_info[:parent_scaffold].active_scaffold_config.model
           session_info[:association] = session_info[:parent_model].reflect_on_association(session_info[:name])
@@ -99,13 +98,13 @@ module ActiveScaffold::DataStructures
     
     def iterate_model_associations(model)
       @constrained_fields = [] 
-      @constrained_fields << association.foreign_key.to_sym unless association.belongs_to?
+      @constrained_fields << association.primary_key_name.to_sym unless association.belongs_to?
       model.reflect_on_all_associations.each do |current|
-        if !current.belongs_to? && association.foreign_key == current.association_foreign_key
+        if !current.belongs_to? && association.primary_key_name == current.association_foreign_key
           constrained_fields << current.name.to_sym
           @child_association = current if current.klass == @parent_model
         end
-        if association.foreign_key == current.foreign_key
+        if association.primary_key_name == current.primary_key_name
           # show columns for has_many and has_one child associationes
           constrained_fields << current.name.to_sym if current.belongs_to? 
           @child_association = current

data/lib/active_scaffold/extensions/active_association_reflection.rb~

@@ -0,0 +1,22 @@
+# Bugfix: building an sti model from an association fails
+# https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/6306-collection-associations-build-method-not-supported-for-sti
+# https://github.com/rails/rails/issues/815
+# https://github.com/rails/rails/pull/1686
+ActiveRecord::Reflection::AssociationReflection.class_eval do
+  def klass_with_sti(*opts)
+    sti_col = klass.inheritance_column
+    if (h = opts.first).is_a? Hash and (passed_type = ( h[sti_col] || h[sti_col.to_sym] )) and (new_klass = active_record.send(:compute_type, passed_type)) < klass
+      new_klass
+    else
+      klass
+    end
+  end
+  def build_association(*opts, &block)
+    self.original_build_association_called = true
+    klass_with_sti(*opts).new(*opts, &block)
+  end
+  def create_association(*opts, &block)
+    self.original_build_association_called = true
+    klass_with_sti(*opts).create(*opts, &block)
+  end
+end

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

@@ -33,8 +33,7 @@ module ActiveScaffold
             parameters[:eid] = params[:parent_controller]
           end
           if nested?
-            parameters[:controller] = nested.parent_scaffold.controller_path
-            parameters[:eid] = nil
+            parameters.merge! nested.to_params
           end
           if params[:parent_sti]
             parameters[:controller] = params[:parent_sti]
@@ -84,17 +83,11 @@ module ActiveScaffold
       end
       
       def build_associated(column, record)
-        child = column.singular_association? ? record.send(:"build_#{column.name}") : record.send(column.name).build
-        if record.new_record? && (reflection = record.class.reflect_on_association(column.name)).try(:reverse)
-          reverse_macro = child.class.reflect_on_association(reflection.reverse).macro
-          if [:has_one, :belongs_to].include?(reverse_macro) # singular
-            child.send(:"#{reflection.reverse}=", record)
-          # TODO: Might want to extend with this branch in the future
-          # else # plural
-          #  child.send(:"#{reflection.reverse}") << record
-          end
+        if column.singular_association?
+          record.send(:"build_#{column.name}")
+        else
+          record.send(column.name).build
         end
-        child
       end
     end
   end

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

@@ -88,7 +88,7 @@ module ActiveScaffold
         else
           options[:include_blank] ||= as_(:_select_) 
         end
-        select(:record, method, options_for_select, options, html_options)
+        select(:record, method, select_options, options, html_options)
       end
 
       def active_scaffold_search_text(column, options)

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 0
-    PATCH = 25
+    PATCH = 26
 
     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: 53
+  hash: 51
   prerelease: 
   segments: 
   - 3
   - 0
-  - 25
-  version: 3.0.25
+  - 26
+  version: 3.0.26
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-12 00:00:00 Z
+date: 2011-12-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -155,37 +155,37 @@ files:
 - frontends/default/views/_list_pagination_links.html.erb
 - frontends/default/views/_list_record.html.erb
 - frontends/default/views/_action_group.html.erb
-- frontends/default/views/_list_messages.html.erb
-- frontends/default/views/_row.html.erb
 - frontends/default/views/_messages.html.erb
+- frontends/default/views/_base_form.html.erb
+- frontends/default/views/_render_field.js.rjs
 - frontends/default/views/_search.html.erb
 - frontends/default/views/_show.html.erb
 - frontends/default/views/list.html.erb
-- frontends/default/views/list.js.rjs
 - frontends/default/views/_show_columns.html.erb
 - frontends/default/views/_update_actions.html.erb
 - frontends/default/views/_update_form.html.erb
 - frontends/default/views/_vertical_subform.html.erb
 - frontends/default/views/_vertical_subform_record.html.erb
-- frontends/default/views/_base_form.html.erb
+- frontends/default/views/_row.html.erb
+- frontends/default/views/list.js.rjs
 - frontends/default/views/delete.html.erb
 - frontends/default/views/add_existing_form.html.erb
 - frontends/default/views/create.html.erb
+- frontends/default/views/_list_messages.html.erb
 - frontends/default/views/_human_conditions.html.erb
-- frontends/default/views/_list_with_header.html.erb
 - frontends/default/views/field_search.html.erb
-- frontends/default/views/_render_field.js.rjs
-- frontends/default/views/search.html.erb
 - frontends/default/views/add_existing.js.rjs
+- frontends/default/views/search.html.erb
+- frontends/default/views/destroy.js.rjs
 - frontends/default/views/update.html.erb
+- frontends/default/views/_list_with_header.html.erb
 - frontends/default/views/_list_pagination.html.erb
-- frontends/default/views/_list_record_columns.html.erb
 - frontends/default/views/show.html.erb
-- frontends/default/views/destroy.js.rjs
+- frontends/default/views/form_messages.js.rjs
+- frontends/default/views/_list_record_columns.html.erb
+- frontends/default/views/edit_associated.js.rjs
 - frontends/default/views/_search_attribute.html.erb
 - frontends/default/views/action_confirmation.html.erb
-- frontends/default/views/edit_associated.js.rjs
-- frontends/default/views/form_messages.js.rjs
 - frontends/default/views/on_action_update.js.rjs
 - frontends/default/views/on_create.js.rjs
 - frontends/default/views/on_mark_all.js.rjs
@@ -217,6 +217,7 @@ files:
 - frontends/default/views/_horizontal_subform_record.html.erb~
 - frontends/default/views/_list_with_header.html.erb~
 - frontends/default/views/_update_form.html.erb~
+- frontends/default/views/add_existing.js.erb~
 - lib/active_scaffold.rb
 - lib/active_scaffold_env.rb
 - lib/active_scaffold/actions/core.rb
@@ -228,9 +229,9 @@ files:
 - lib/active_scaffold/actions/show.rb
 - lib/active_scaffold/actions/nested.rb
 - lib/active_scaffold/actions/search.rb
-- lib/active_scaffold/actions/mark.rb
 - lib/active_scaffold/actions/subform.rb
 - lib/active_scaffold/actions/update.rb
+- lib/active_scaffold/actions/mark.rb
 - lib/active_scaffold/actions/core.rb~
 - lib/active_scaffold/actions/nested.rb~
 - lib/active_scaffold/actions/update.rb~
@@ -267,9 +268,9 @@ files:
 - lib/active_scaffold/data_structures/set.rb
 - lib/active_scaffold/data_structures/sorting.rb
 - lib/active_scaffold/data_structures/nested_info.rb
+- lib/active_scaffold/data_structures/nested_info.rb~
 - lib/active_scaffold/data_structures/action_columns.rb~
 - lib/active_scaffold/data_structures/action_link.rb~
-- lib/active_scaffold/data_structures/nested_info.rb~
 - lib/active_scaffold/finder.rb
 - lib/active_scaffold/helpers/association_helpers.rb
 - lib/active_scaffold/helpers/controller_helpers.rb
@@ -365,6 +366,7 @@ files:
 - lib/active_scaffold/extensions/reverse_associations.rb~
 - lib/active_scaffold/extensions/routing_mapper.rb~
 - lib/active_scaffold/extensions/unsaved_associated.rb~
+- lib/active_scaffold/extensions/active_association_reflection.rb~
 - lib/active_scaffold/paginator.rb
 - lib/active_scaffold/responds_to_parent.rb
 - lib/active_scaffold/attribute_params.rb~