active_scaffold 3.1.11 → 3.1.12

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

@@ -148,7 +148,7 @@ $(document).ready(function() {
       return true;
     } else return false;
   });
-  $('input.update_form, textarea.update_form, select.update_form').live('change', function(event) {
+  $('input.update_form:not(.recordselect), 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);

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

@@ -72,7 +72,8 @@ $(document).ready(function() {
     
     if (action_link) {
       var cancel_url = as_cancel.attr('href');
-      if (typeof(cancel_url) == 'undefined' || cancel_url.length == 0) {
+      var refresh_data = as_cancel.attr('data-refresh');
+      if (refresh_data !== 'true' || !cancel_url) {
         action_link.close();
         return false;
       }
@@ -147,12 +148,17 @@ $(document).ready(function() {
       return true;
     } else return false;
   });
-  $('input.update_form, text_area.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/frontends/default/views/add_existing.js.erb

@@ -1,20 +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});
-<%%>
+<% 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'))%>');
+  ActiveScaffold.replace('<%= active_scaffold_calculations_id %>', '<%= escape_javascript(render(:partial => 'list_calculations')) %>');
 <%end%>
-<%%>
-<% if(form_stays_open == true)%>
+
+<% 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'))%>');
+  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%>
-    page.delay 0.1 do
-      page << "ActiveScaffold.focus_first_element_of_form('#{element_form_id}');"
-    end
-  <%end%>
-<%else%>
-  ActiveScaffold.find_action_link('<%element_form_id(:action => :new_existing)%>').close();
-<%end%>
+  <% 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/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

@@ -103,6 +103,8 @@ module ActiveScaffold::Actions
           create_save
         end
       rescue ActiveRecord::RecordInvalid
+        flash[:error] = $!.message
+        self.successful = false
       end
     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

@@ -92,9 +92,11 @@ module ActiveScaffold::Actions
           end
         end
       rescue ActiveRecord::RecordInvalid
+        flash[:error] = $!.message
+        self.successful = false
       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/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/data_structures/nested_info.rb

@@ -28,6 +28,10 @@ module ActiveScaffold::DataStructures
       @parent_scaffold = session_info[:parent_scaffold]
     end
     
+    def to_params
+      {:parent_scaffold => parent_scaffold.controller_path}
+    end
+    
     def new_instance?
       result = @new_instance.nil?
       @new_instance = false
@@ -94,6 +98,10 @@ module ActiveScaffold::DataStructures
       association.options[:order]
     end
     
+    def to_params
+      super.merge(:association => @association.name, :assoc_id => parent_id)
+    end
+    
     protected
     
     def iterate_model_associations(model)
@@ -119,5 +127,9 @@ module ActiveScaffold::DataStructures
       @scope = session_info[:name]
       @constrained_fields = [] 
     end
+    
+    def to_params
+      super.merge(:named_scope => @scope)
+    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])
@@ -29,6 +28,10 @@ module ActiveScaffold::DataStructures
       @parent_scaffold = session_info[:parent_scaffold]
     end
     
+    def to_params
+      {:parent_scaffold => parent_scaffold.controller_path}
+    end
+    
     def new_instance?
       result = @new_instance.nil?
       @new_instance = false
@@ -95,6 +98,10 @@ module ActiveScaffold::DataStructures
       association.options[:order]
     end
     
+    def to_params
+      super.merge(:association => @association, :assoc_id => parent_id)
+    end
+    
     protected
     
     def iterate_model_associations(model)
@@ -120,5 +127,9 @@ module ActiveScaffold::DataStructures
       @scope = session_info[:name]
       @constrained_fields = [] 
     end
+    
+    def to_params
+      super.merge(:named_scope => @scope)
+    end
   end
 end

data/lib/active_scaffold/helpers/controller_helpers.rb

@@ -32,10 +32,7 @@ module ActiveScaffold
             parameters[:controller] = params[:parent_controller]
             parameters[:eid] = params[:parent_controller]
           end
-          if nested?
-            parameters[:controller] = nested.parent_scaffold.controller_path
-            parameters[:eid] = nil
-          end
+          parameters.merge! nested.to_params if nested?
           if params[:parent_sti]
             parameters[:controller] = params[:parent_sti]
             parameters[:eid] = nil

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

@@ -78,7 +78,9 @@ module ActiveScaffold
           select_options = options_for_association(column.association, true)
         else
           method = column.name
-          select_options = Array(column.options[:options])
+          select_options = column.options[:options].collect do |text, value|
+            active_scaffold_translated_option(column, text, value)
+          end
         end
 
         options = { :selected => associated }.merge! column.options

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 = 1
-    PATCH = 11
+    PATCH = 12
 
     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: 21
+  hash: 27
   prerelease: 
   segments: 
   - 3
   - 1
-  - 11
-  version: 3.1.11
+  - 12
+  version: 3.1.12
 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-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -144,9 +144,9 @@ 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.erb
 - frontends/default/views/_search.html.erb
 - frontends/default/views/_show.html.erb
 - frontends/default/views/list.html.erb
@@ -155,24 +155,24 @@ files:
 - 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/delete.html.erb
 - frontends/default/views/add_existing_form.html.erb
 - frontends/default/views/create.html.erb
+- frontends/default/views/_horizontal_subform_footer.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.erb
-- frontends/default/views/search.html.erb
 - frontends/default/views/add_existing.js.erb
+- frontends/default/views/search.html.erb
+- frontends/default/views/destroy.js.erb
 - frontends/default/views/update.html.erb
+- frontends/default/views/_list_messages.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.erb
+- frontends/default/views/_list_record_columns.html.erb
+- frontends/default/views/_list_with_header.html.erb
 - frontends/default/views/_search_attribute.html.erb
 - frontends/default/views/action_confirmation.html.erb
-- frontends/default/views/_horizontal_subform_footer.html.erb
 - frontends/default/views/edit_associated.js.erb
 - frontends/default/views/form_messages.js.erb
 - frontends/default/views/on_action_update.js.erb
@@ -181,8 +181,8 @@ files:
 - frontends/default/views/on_update.js.erb
 - frontends/default/views/refresh_list.js.erb
 - frontends/default/views/render_field.js.erb
-- frontends/default/views/update_column.js.erb
 - frontends/default/views/_base_form.html.erb~
+- frontends/default/views/update_column.js.erb
 - frontends/default/views/update_row.js.erb
 - frontends/default/views/_form.html.erb~
 - frontends/default/views/_row.html.erb~
@@ -207,6 +207,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
@@ -218,9 +219,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~
@@ -256,8 +257,8 @@ files:
 - lib/active_scaffold/data_structures/error_message.rb
 - 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/bridge.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~
@@ -323,13 +324,14 @@ files:
 - lib/active_scaffold/bridges/shared/date_bridge.rb~
 - lib/active_scaffold/bridges/tiny_mce.rb
 - lib/active_scaffold/bridges/tiny_mce/helpers.rb
-- lib/active_scaffold/version.rb
+- lib/active_scaffold/engine.rb
 - lib/active_scaffold/marked_model.rb
 - lib/active_scaffold/extensions/action_controller_rendering.rb
 - lib/active_scaffold/extensions/action_view_rendering.rb
 - lib/active_scaffold/extensions/active_association_reflection.rb
 - lib/active_scaffold/extensions/active_record_offset.rb
 - lib/active_scaffold/extensions/array.rb
+- lib/active_scaffold/extensions/cache_association.rb
 - lib/active_scaffold/extensions/localize.rb
 - lib/active_scaffold/extensions/name_option_for_datetime.rb
 - lib/active_scaffold/extensions/nil_id_in_url_params.rb
@@ -340,7 +342,6 @@ files:
 - lib/active_scaffold/extensions/unsaved_associated.rb
 - lib/active_scaffold/extensions/unsaved_record.rb
 - lib/active_scaffold/extensions/usa_state.rb
-- lib/active_scaffold/extensions/cache_association.rb
 - lib/active_scaffold/extensions/action_controller_rendering.rb~
 - lib/active_scaffold/extensions/action_view_rendering.rb~
 - lib/active_scaffold/extensions/cache_association.rb~
@@ -349,7 +350,7 @@ files:
 - lib/active_scaffold/extensions/unsaved_associated.rb~
 - lib/active_scaffold/paginator.rb
 - lib/active_scaffold/responds_to_parent.rb
-- lib/active_scaffold/engine.rb
+- lib/active_scaffold/version.rb
 - lib/active_scaffold/attribute_params.rb~
 - lib/active_scaffold/finder.rb~
 - lib/active_scaffold/constraints.rb~