active_scaffold 3.4.1 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c53462e9f8376026d9967b86c6e853504641002e
-  data.tar.gz: c7f5e3fdf9da980b02791d0d99d50f6377095070
+  metadata.gz: f13a22b391abab0509c40d617c528902fda68c27
+  data.tar.gz: a4bc30e40eb947290999544fcdec3cce07fe3236
 SHA512:
-  metadata.gz: f31c9d71a8ef33e63eae3987cd37a6bbd0327746db8af9f9c241e959be1a765fbd28da7edf25a41785add40a532f9963995052becf89c31870b65eac90cc3db4
-  data.tar.gz: af95b26715e8eaa8808dea19c2ea4b88650893892d1cd863f34e64f3c9db168570313d194cb1166b0e4c2bc1d2843261733672060f7a432a3ff45d520db58b1e
+  metadata.gz: 56f0cf576372ed2f10ddd03c6a798738237e5a3bda87e01d62b6bd3f8fe4831b7579589aa0fa50a6989c9b372e8e9c23dfd1643d682231fe356091e93f30c0d0
+  data.tar.gz: e8d69d8f3c33c9167829635378146560e2b771d8ab495db3adf2966d4af0061394594541020696f72b5cfb7f21577934656d26667288ba32abd318680ba7338c

data/CHANGELOG

@@ -1,3 +1,19 @@
+= 3.4.2 (not released yet)
+- fix tableless on latest rails4 versions
+- respond with 406 for html request on js only actions
+- fix JS issue on IE8
+- support jquery-ui-rails 5
+- update_columns fixes on subforms refreshing
+- fix dynamic links menu in group links
+- fix id_condition (/:id/index) for models with different primary key
+- fix parent_controller param when rendering subforms on render_field
+- fix session usage on rails >= 4.1
+- fix marked records on rails >= 4.1
+- add display_dynamic_action_group helper to help building js and html to display a dynamic action group
+- display error when has_one association with :select form_ui fails to set, save continued but change was lost
+- fix each_record_in_scope for rails 4 (fixes mark all records)
+- trigger as:element_created for created record
+
 = 3.4.1
 - fix search value when both field_search and search are enabled and a search with field_search is active
 - fix cancan permissions check on subform

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

@@ -7,12 +7,13 @@
 <% require_asset "jquery/date_picker_bridge" %>
 <% require_asset "jquery/draggable_lists" %>
 <% elsif Jquery.const_defined? 'Ui' %>
-<% require_asset "jquery.ui.core" %>
-<% require_asset "jquery.ui.effect" %>
-<% require_asset "jquery.ui.sortable" %>
-<% require_asset "jquery.ui.draggable" %>
-<% require_asset "jquery.ui.droppable" %>
-<% require_asset "jquery.ui.datepicker" %>
+<% jquery_ui_prefix = Jquery::Ui::Rails::VERSION < '5.0.0' ? 'jquery.ui.' : 'jquery-ui/' %>
+<% require_asset "#{jquery_ui_prefix}core" %>
+<% require_asset "#{jquery_ui_prefix}effect" %>
+<% require_asset "#{jquery_ui_prefix}sortable" %>
+<% require_asset "#{jquery_ui_prefix}draggable" %>
+<% require_asset "#{jquery_ui_prefix}droppable" %>
+<% require_asset "#{jquery_ui_prefix}datepicker" %>
 <% require_asset "jquery-ui-timepicker-addon" %>
 <% require_asset "jquery/date_picker_bridge" %>
 <% require_asset "jquery/draggable_lists" %>

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

@@ -38,7 +38,7 @@ jQuery(document).ready(function($) {
   jQuery(document).on('focus', ':input', function() { ActiveScaffold.last_focus = this; });
   jQuery(document).on('blur', ':input', function(e) { ActiveScaffold.last_focus = e.relatedTarget; });
   jQuery(document).click(function(event) {
-    jQuery('.action_group.dyn ul').hide(); // only hide so action links loading still work
+    jQuery('.action_group.dyn > ul').hide(); // only hide so action links loading still work
   });
   jQuery(document).on('ajax:beforeSend', 'form.as_form', function(event) {
     var as_form = jQuery(this).closest("form");
@@ -193,10 +193,10 @@ jQuery(document).ready(function($) {
       return true;
     } else return false;
   });
-  jQuery(document).on('ajax:complete', '.action_group.dyn ul a', function(event) {
+  jQuery(document).on('ajax:complete', '.action_group.dyn > ul a', function(event) {
     var action_link = ActiveScaffold.find_action_link(event.target);
     if (action_link.loading_indicator) action_link.loading_indicator.css('visibility','hidden');  
-    jQuery(event.target).closest('.action_group.dyn ul').remove();
+    jQuery(event.target).closest('.action_group.dyn > ul').remove();
   });
 
   jQuery(document).on('change', 'input.update_form:not(.recordselect), textarea.update_form, select.update_form, .checkbox-list.update_form input:checkbox', function(event) {
@@ -252,8 +252,8 @@ jQuery(document).ready(function($) {
   });
   
   jQuery(document).on('click', '.active-scaffold .sub-form a.destroy', function(event) {
-  	event.preventDefault();
-  	ActiveScaffold.delete_subform_record($(this).data('delete-id'));
+    event.preventDefault();
+    ActiveScaffold.delete_subform_record($(this).data('delete-id'));
   });
 
   jQuery(document).on("click", '.hover_click', function(event) {
@@ -495,7 +495,7 @@ var ActiveScaffold = {
   replace: function(element, html) {
     if (typeof(element) == 'string') element = '#' + element; 
     element = jQuery(element);
-    var new_element = typeof(html) == 'string' ? jQuery.parseHTML(html.trim(), true) : html;
+    var new_element = typeof(html) == 'string' ? jQuery.parseHTML(jQuery.trim(html), true) : html;
     new_element = jQuery(new_element);
     if (element.length) {
       element.replaceWith(new_element);
@@ -583,13 +583,13 @@ var ActiveScaffold = {
   create_record_row: function(active_scaffold_id, html, options) {
     if (typeof(active_scaffold_id) == 'string') active_scaffold_id = '#' + active_scaffold_id;
     tbody = jQuery(active_scaffold_id).find('tbody.records').first();
+    var new_row;
     
     if (options.insert_at == 'top') {
       tbody.prepend(html);
-      var new_row = tbody.children('tr.record:first-child');
+      new_row = tbody.children('tr.record:first-child');
     } else if (options.insert_at == 'bottom') {
       var rows = tbody.children('tr.record, tr.inline-adapter');
-      var new_row = null;
       if (rows.length > 0) {
         new_row = rows.last().after(html).next();
       } else {
@@ -613,6 +613,7 @@ var ActiveScaffold = {
     this.hide_empty_message(tbody);
     this.increment_record_count(tbody.closest('div.active-scaffold'));
     this.highlight(new_row);
+    new_row.trigger('as:element_created');
   },
     
   create_record_row_from_url: function(action_link, url, options) {
@@ -663,14 +664,16 @@ var ActiveScaffold = {
   },
 
   display_dynamic_action_group: function(link, html) {
+    var container;
     if (typeof(link) == 'string') link = jQuery('#' + link);
-    link.next('ul').remove();
-    if (link.closest('td.actions').length) link.closest('td').addClass('action_group dyn');
-    else {
-      if (link.parent('div.actions').length) link.wrap($('<div>'));
-      link.parent().addClass('action_group dyn');
+    if (link.closest('td.actions').length) {
+      container = link.closest('td').addClass('action_group dyn');
+    } else {
+      if (link.parent('div.actions').length) link.wrap(jQuery('<div>'));
+      container = link.parent().addClass('action_group dyn');
     }
-    link.after(html);
+    container.find('> ul').remove();
+    container.append(html);
   },
   
   scroll_to: function(element, checkInViewport) {
@@ -939,7 +942,7 @@ var ActiveScaffold = {
       complete: function(event) {
         element.nextAll('img.loading-indicator').css('visibility','hidden');
         ActiveScaffold.enable_form(as_form);
-        if (ActiveScaffold.last_focus) $(ActiveScaffold.last_focus).focus().select();
+        if (ActiveScaffold.last_focus) jQuery(ActiveScaffold.last_focus).focus().select();
       },
       error: function (xhr, status, error) {
         var as_div = element.closest("div.active-scaffold");

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

@@ -13,13 +13,13 @@ if (!Element.Methods.highlight) Element.addMethods({highlight: Prototype.emptyFu
 
 document.observe("dom:loaded", function() {
   document.on('click', function(event) {
-    $$('.action_group.dyn ul').invoke('remove');
+    $$('.action_group.dyn > ul').invoke('hide');
   });
-  document.on('ajax:complete', '.action_group.dyn ul a', function() {
+  document.on('ajax:complete', '.action_group.dyn > ul a', function() {
     var source = event.findElement();
     var action_link = ActiveScaffold.find_action_link(source);
     if (action_link.loading_indicator) action_link.loading_indicator.css('visibility','hidden');  
-    $(source).up('.action_group.dyn ul').remove();
+    $(source).up('.action_group.dyn > ul').remove();
   });
   document.on('ajax:create', 'form.as_form', function(event) {
     var source = event.findElement();
@@ -568,15 +568,16 @@ var ActiveScaffold = {
   },
 
   display_dynamic_action_group: function(link, html) {
+    var container;
     link = $(link);
-    link.next('ul').remove();
-    link.up('td').addClassName('action_group dyn');
-    if (link.up('td.actions')) link.up('td').addClassName('action_group dyn');
-    else {
+    if (link.up('td.actions')) {
+      container = link.up('td').addClassName('action_group dyn');
+    } else {
       if (link.up().hasClassName('actions')) link.wrap('div');
-      link.up().addClassName('action_group dyn');
+      container = link.up().addClassName('action_group dyn');
     }
-    link.insert({after: html});
+    container.down('> ul').remove();
+    container.insert({bottom: html});
   },
   
   scroll_to: function(element, checkInViewport) {

data/app/assets/stylesheets/active_scaffold_jquery_ui.css.erb

@@ -2,6 +2,10 @@
 <% require_asset "jquery-ui" %>
 <% require_asset "jquery-ui-theme" %>
 <% elsif Jquery.const_defined? 'Ui' %>
+<% if Jquery::Ui::Rails::VERSION < '5.0.0' %>
 <% require_asset "jquery.ui.datepicker" %>
+<% else %>
+<% require_asset "jquery-ui/datepicker" %>
+<% end %>
 <% require_asset "jquery-ui-theme" %>
 <% end %>

data/app/assets/stylesheets/active_scaffold_layout.css

@@ -261,7 +261,7 @@ min-width: 150px;
 right: 0px;
 z-index: 2;
 }
-.active-scaffold .actions .action_group.dyn ul {
+.active-scaffold .actions .action_group.dyn > ul {
 width: auto;
 display: block;
 }
@@ -296,7 +296,7 @@ text-align: left;
   background-position: 5px 50%;
   background-repeat: no-repeat;
 }
-.active-scaffold .actions .action_group.dyn ul li a {
+.active-scaffold .actions .action_group.dyn > ul li a {
   padding-left: 5px;
 }
 
@@ -309,7 +309,7 @@ border-top-width: 0px;
 display: none;
 }
 
-.active-scaffold .actions .action_group:hover ul,
+.active-scaffold .actions .action_group:hover > ul,
 .active-scaffold .actions .action_group ul li:hover > ul,
 .active-scaffold .actions .action_group ul ul li:hover ul {
 display: block;

data/app/views/active_scaffold_overrides/_form_association_footer.html.erb

@@ -13,8 +13,8 @@ return unless show_add_new or show_add_existing
 
 temporary_id = generated_id(parent_record) if parent_record.new_record?
 controller_path = active_scaffold_controller_for(parent_record.class).controller_path
-edit_associated_url = params_for(:controller => controller_path, :action => 'edit_associated', :child_association => column.name, :associated_id => '--ID--', :scope => scope, :id => parent_record.to_param, :generated_id => temporary_id, :parent_controller => controller.controller_path) if show_add_existing
-add_new_url = params_for(:controller => controller_path, :action => 'edit_associated', :child_association => column.name, :scope => scope, :id => parent_record.to_param, :generated_id => temporary_id, :parent_controller => controller.controller_path) if show_add_new
+edit_associated_url = params_for(:controller => controller_path, :action => 'edit_associated', :child_association => column.name, :associated_id => '--ID--', :scope => scope, :id => parent_record.to_param, :generated_id => temporary_id, :parent_controller => params[:parent_controller] || controller.controller_path) if show_add_existing
+add_new_url = params_for(:controller => controller_path, :action => 'edit_associated', :child_association => column.name, :scope => scope, :id => parent_record.to_param, :generated_id => temporary_id, :parent_controller => params[:parent_controller] || controller.controller_path) if show_add_new
 
 -%>
 <div class="footer-wrapper">

data/app/views/active_scaffold_overrides/_list_inline_adapter.html.erb

@@ -1,12 +1,12 @@
 <%# nested_id, allows us to remove a nested scaffold programmatically %>
 <tr class="inline-adapter" id="<%= element_row_id :action => :nested %>">
   <td class="inline-adapter-cell">
-<% if controller.send(:successful?) %>
+<% if successful? %>
     <div class="<%= "#{params[:action]}-view" if params[:action] %> <%= "#{nested? ? nested.name : id_from_controller(params[:controller])}-view" %> view">
       <%= link_to(as_(:close), '', :class => 'inline-adapter-close as_cancel', :remote => true, :title => as_(:close)) -%>
       <%= payload -%>
     </div>
 <% end %>
+    <%= javascript_tag("setTimeout(function() { var action_link = ActiveScaffold.ActionLink.get('#{element_row_id(:action => :nested)}'); if (action_link) { action_link.update_flash_messages('#{escape_javascript(render(:partial => 'messages').strip)}');#{' action_link.close(); ActiveScaffold.scroll_to(action_link.scaffold(), ActiveScaffold.config.scroll_on_close == "checkInViewport");' unless successful?} } }, 10);") %>
   </td>
 </tr>
-<%= javascript_tag("setTimeout(function() { var action_link = ActiveScaffold.ActionLink.get('#{element_row_id(:action => :nested)}'); if (action_link) { action_link.update_flash_messages('#{escape_javascript(render(:partial => 'messages').strip)}');#{' action_link.close(); ActiveScaffold.scroll_to(action_link.scaffold(), ActiveScaffold.config.scroll_on_close == "checkInViewport");' unless controller.send(:successful?)} } }, 10);") %>

data/app/views/active_scaffold_overrides/destroy.js.erb

@@ -1,5 +1,5 @@
 <% messages_id = active_scaffold_messages_id %>
-<% if controller.send(:successful?) %>
+<% if successful? %>
   <% if render_parent? %>
     <% if render_parent_action == :row %>
       <%# TODO: That s not working with delete.... %>

data/app/views/active_scaffold_overrides/on_action_update.js.erb

@@ -1,4 +1,4 @@
-<% if controller.send :successful? %>
+<% if successful? %>
   <% if @record %>
     <%= render :partial => 'update_messages' %>
     <% row = escape_javascript(render(:partial => 'list_record', :locals => {:record => @record})) -%>

data/app/views/active_scaffold_overrides/on_create.js.erb

@@ -8,7 +8,7 @@ insert_at ||= :top -%>
 action_link = ActiveScaffold.find_action_link('<%= form_selector %>');
 action_link.update_flash_messages('<%= escape_javascript(render(:partial => 'messages')) %>');
 <% end -%>
-<% if controller.send :successful? -%>
+<% if successful? -%>
   <% if render_parent? %>
     <% if nested_singular_association? %>
       action_link.close(true);

data/app/views/active_scaffold_overrides/on_mark.js.erb

@@ -1,6 +1,6 @@
 <%
   checked = all_marked? unless local_assigns.has_key? :checked
-  options = {:checked => checked, :include_mark_all => true, :include_checkboxes => params[:id].nil?}
+  options = {:checked => checked, :include_mark_all => true, :include_checkboxes => @include_checkboxes}
 %>
 ActiveScaffold.mark_records('<%= active_scaffold_tbody_id %>',<%= options.to_json.html_safe %>);
 <%= render :partial => 'update_messages' %>

data/app/views/active_scaffold_overrides/on_update.js.erb

@@ -2,7 +2,7 @@ try {
 <% form_selector = "#{element_form_id(:action => :update, :id => @record.try(:id) || params[:id])}" %>
 var action_link = ActiveScaffold.find_action_link('<%= form_selector %>');
 action_link.update_flash_messages('<%= escape_javascript(render(:partial => 'messages')) %>');
-<% if controller.send :successful? %>
+<% if successful? %>
   <% if params[:dont_close] %>
     <% row_selector = element_row_id(:action => :list, :id => @record.id) %>
     ActiveScaffold.update_row('<%= row_selector %>', '<%= escape_javascript(render(:partial => 'list_record', :locals => {:record => @record})) %>');

data/app/views/active_scaffold_overrides/update_column.js.erb

@@ -1,10 +1,10 @@
 <% @column_span_id ||= element_cell_id(:id => @record.id.to_s, :action => 'update_column', :name => @column.name) -%>
-<% unless controller.send :successful? -%>
+<% unless successful? -%>
   alert('<%= escape_javascript(@record.errors.full_messages.join("\n")) %>');
   <% @record.reload -%>
 <% end -%>
 <% if @column.inplace_edit
-     ipe_update = @column.inplace_edit_update if controller.send :successful? -%>
+     ipe_update = @column.inplace_edit_update if successful? -%>
   <% case ipe_update
      when :row -%>
        ActiveScaffold.update_row('<%= element_row_id(:action => :list) %>', '<%= escape_javascript render('row', :record => @record) %>');

data/lib/active_scaffold/actions/common_search.rb

@@ -29,14 +29,14 @@ module ActiveScaffold::Actions
       
       def store_search_params_into_session
         if active_scaffold_config.store_user_settings
-          active_scaffold_session_storage[:search] = params.delete :search if params[:search]
+          active_scaffold_session_storage['search'] = params.delete :search if params[:search]
         else
           @search_params = params.delete :search
         end
       end
 
       def search_params
-        @search_params || active_scaffold_session_storage[:search]
+        @search_params || active_scaffold_session_storage['search']
       end
 
       def global_search_ignore?

data/lib/active_scaffold/actions/core.rb

@@ -17,8 +17,12 @@ module ActiveScaffold::Actions
     def render_field
       if request.get?
         render_field_for_inplace_editing
+        respond_to do |format|
+          format.js { render :action => 'render_field_inplace', :layout => false }
+        end
       else
         render_field_for_update_columns
+        respond_to { |format| format.js }
       end
     end
     
@@ -38,7 +42,6 @@ module ActiveScaffold::Actions
     def render_field_for_inplace_editing
       @column = active_scaffold_config.columns[params[:update_column]]
       @record = find_if_allowed(params[:id], :crud_type => :update, :column => params[:update_column])
-      render :action => 'render_field_inplace', :layout => false
     end
 
     def render_field_for_update_columns
@@ -62,7 +65,7 @@ module ActiveScaffold::Actions
           end
 
           # check permissions and support overriding to_param
-          record = find_if_allowed(id, :update) if id
+          record = find_if_allowed(id, :read) if id
           # call update_record_from_params with new_model
           # in other case some associations can be saved
           @record = new_model
@@ -70,7 +73,7 @@ module ActiveScaffold::Actions
           apply_constraints_to_record(@record) unless @scope
           @record = update_record_from_params(@record, @main_columns, hash, true)
         else
-          @record = params[:id] ? find_if_allowed(params[:id], :update) : new_model
+          @record = params[:id] ? find_if_allowed(params[:id], :read) : new_model
           if @record.new_record?
             apply_constraints_to_record(@record) unless @scope
           else
@@ -125,11 +128,11 @@ module ActiveScaffold::Actions
     end
 
     def each_marked_record(&block)
-      active_scaffold_config.model.find(marked_records.to_a).each &block
+      active_scaffold_config.model.as_marked.each &block
     end
 
     def marked_records
-      active_scaffold_session_storage[:marked_records] ||= Set.new
+      active_scaffold_session_storage['marked_records'] ||= {}
     end
     
     def default_formats

data/lib/active_scaffold/actions/create.rb

@@ -101,7 +101,8 @@ module ActiveScaffold::Actions
           apply_constraints_to_record(@record, :allow_autosave => true)
           create_association_with_parent(@record) if nested?
           before_create_save(@record)
-          self.successful = [@record.valid?, @record.associated_valid?].all? # this syntax avoids a short-circuit
+          # errors to @record can be added by update_record_from_params when association fails to set and ActiveRecord::RecordNotSaved is raised
+          self.successful = [@record.errors.empty? && @record.valid?, @record.associated_valid?].all? # this syntax avoids a short-circuit
           create_save(@record) unless options[:skip_save]
         end
       rescue ActiveRecord::ActiveRecordError => ex

data/lib/active_scaffold/actions/list.rb

@@ -132,7 +132,8 @@ module ActiveScaffold::Actions
     def each_record_in_scope
       do_search if respond_to? :do_search, true
       set_includes_for_columns
-      append_to_query(beginning_of_chain, finder_options).each {|record| yield record}
+      # where(nil) is needed because we need a relation
+      append_to_query(beginning_of_chain.where(nil), finder_options).each {|record| yield record}
     end
 
     # The default security delegates to ActiveRecordPermissions.
@@ -151,11 +152,11 @@ module ActiveScaffold::Actions
     def process_action_link_action(render_action = :action_update, crud_type_or_security_options = nil)
       if request.get?
         # someone has disabled javascript, we have to show confirmation form first
-        @record = find_if_allowed(params[:id], :read) if params[:id] && params[:id].to_i > 0
+        @record = find_if_allowed(params[:id], :read) if params[:id]
         respond_to_action(:action_confirmation)
       else
         @action_link = active_scaffold_config.action_links[action_name]
-        if params[:id] && params[:id].to_i > 0
+        if params[:id]
           crud_type_or_security_options ||= (request.post? || request.put?) ? :update : :delete
           get_row(crud_type_or_security_options)
           unless @record.nil?

data/lib/active_scaffold/actions/mark.rb

@@ -27,12 +27,13 @@ module ActiveScaffold::Actions
     end
 
     def mark_respond_to_js
-      if params[:id]
+      if params.delete(:id) # so find_page doesn't filter by :id
         do_search if respond_to? :do_search, true
         set_includes_for_columns if active_scaffold_config.actions.include? :list
         @page = find_page(:pagination => active_scaffold_config.mark.mark_all_mode != :page)
         render :action => 'on_mark'
       else
+        @include_checkboxes = true
         render :action => 'on_mark', :locals => {:checked => mark?}
       end
     end

data/lib/active_scaffold/actions/show.rb

@@ -11,7 +11,7 @@ module ActiveScaffold::Actions
         do_show
         respond_to_action(:show)
       else
-        @record = find_if_allowed(params[:id], :read) if params[:id] && params[:id].to_i > 0
+        @record = find_if_allowed(params[:id], :read) if params[:id]
         action_confirmation_respond_to_html(:destroy)
       end
     end

data/lib/active_scaffold/actions/update.rb

@@ -101,7 +101,8 @@ module ActiveScaffold::Actions
         active_scaffold_config.model.transaction do
           @record = update_record_from_params(@record, active_scaffold_config.update.columns, attributes) unless options[:no_record_param_update]
           before_update_save(@record)
-          self.successful = [@record.valid?, @record.associated_valid?].all? # this syntax avoids a short-circuit
+          # errors to @record can be added by update_record_from_params when association fails to set and ActiveRecord::RecordNotSaved is raised
+          self.successful = [@record.errors.empty? && @record.valid?, @record.associated_valid?].all? # this syntax avoids a short-circuit
           if successful?
             @record.save! and @record.save_associated!
             after_update_save(@record)

data/lib/active_scaffold/attribute_params.rb

@@ -66,6 +66,7 @@ module ActiveScaffold
               begin
                 parent_record.send "#{column.name}=", value
               rescue ActiveRecord::RecordNotSaved
+                parent_record.errors.add column.name, :invalid
                 parent_record.association(column.name).target = value if column.association
               end
             end

data/lib/active_scaffold/config/base.rb

@@ -53,7 +53,7 @@ module ActiveScaffold::Config
         @params = params
         # the configuration object for this action
         @conf = conf
-        @action = action
+        @action = action.to_s
       end
 
       def [](key)

data/lib/active_scaffold/config/list.rb

@@ -237,7 +237,7 @@ module ActiveScaffold::Config
       attr_writer :label
       # This label has alread been localized.
       def label
-        self[:label] || @label || @conf.label
+        self['label'] || @label || @conf.label
       end
 
       def per_page

data/lib/active_scaffold/config/search.rb

@@ -41,7 +41,7 @@ module ActiveScaffold::Config
     def columns
       # we want to delay initializing to the @core.columns set for as long as possible. Too soon and .search_sql will not be available to .searchable?
       unless @columns
-        self.columns = @core.columns.collect{|c| c.name if @core.columns._inheritable.include?(c.name) and c.searchable? and c.column and c.column.text?}.compact
+        self.columns = @core.columns.collect{|c| c.name if @core.columns._inheritable.include?(c.name) and c.searchable? and c.text?}.compact
       end
       @columns
     end

data/lib/active_scaffold/constraints.rb

@@ -5,7 +5,7 @@ module ActiveScaffold
 
     # Returns the current constraints
     def active_scaffold_constraints
-      @active_scaffold_constraints ||= active_scaffold_session_storage[:constraints] || {}
+      @active_scaffold_constraints ||= active_scaffold_session_storage['constraints'] || {}
     end
 
     # For each enabled action, adds the constrained columns to the ActionColumns object (if it exists).

data/lib/active_scaffold/data_structures/column.rb

@@ -291,6 +291,10 @@ module ActiveScaffold::DataStructures
       @number
     end
 
+    def text?
+      @text
+    end
+
     # this is so that array.delete and array.include?, etc., will work by column name
     def ==(other) #:nodoc:
       # another column
@@ -338,11 +342,18 @@ module ActiveScaffold::DataStructures
         end
       end
       
-      self.number = @column.try(:number?)
-      @options = {:format => :i18n_number} if self.number?
-      @form_ui = :checkbox if @column and @column.type == :boolean
-      @form_ui = :textarea if @column and @column.type == :text
-      @form_ui = :number   if @column and self.number?
+      @text = @column.nil? || [:string, :text].include?(@column.type)
+      if @column
+        @form_ui = case @column.type
+          when :boolean then :checkbox
+          when :text then :textarea
+        end
+        if @column.number?
+          @number = true
+          @form_ui = :number
+          @options = {:format => :i18n_number}
+        end
+      end
       @allow_add_existing = true
       @form_ui = self.class.association_form_ui if @association && self.class.association_form_ui
       

data/lib/active_scaffold/extensions/action_view_rendering.rb

@@ -45,19 +45,19 @@ module ActionView::Helpers #:nodoc:
         eid = Digest::MD5.hexdigest(params[:controller] + remote_controller.to_s + constraints.to_s + conditions.to_s)
         eid_info = session["as:#{eid}"] ||= {}
         if constraints
-          eid_info[:constraints] = constraints 
+          eid_info['constraints'] = constraints 
         else
-          eid_info.delete :constraints
+          eid_info.delete 'constraints'
         end
         if conditions
-          eid_info[:conditions] = conditions
+          eid_info['conditions'] = conditions
         else
-          eid_info.delete :conditions
+          eid_info.delete 'conditions'
         end
         if options[:label]
-          eid_info[:list] = {:label => options[:label]}
+          eid_info['list'] = {'label' => options[:label]}
         else
-          eid_info.delete :list
+          eid_info.delete 'list'
         end
         session.delete "as:#{eid}" if eid_info.empty?
         options[:params] ||= {}

data/lib/active_scaffold/extensions/reverse_associations.rb

@@ -1,12 +1,20 @@
-module ActiveRecord
-  module Reflection
-    class AssociationReflection #:nodoc:
+module ActiveScaffold
+  module ReverseAssociation
+    module CommonMethods
+      def self.included(base)
+        base.class_eval { attr_writer :reverse }
+        base.alias_method_chain :inverse_of, :autodetect
+      end
+
+      def inverse_of_with_autodetect
+        inverse_of_without_autodetect || autodetect_inverse
+      end
+
       def inverse_for?(klass)
         inverse_class = inverse_of.try(:active_record)
         inverse_class.present? && (inverse_class == klass || klass < inverse_class)
       end
 
-      attr_writer :reverse
       def reverse(klass = nil)
         unless defined? @reverse
           @reverse ||= inverse_of.try(:name)
@@ -14,56 +22,84 @@ module ActiveRecord
         @reverse || (autodetect_inverse(klass).try(:name) unless klass.nil?)
       end
 
-      def inverse_of_with_autodetect
-        inverse_of_without_autodetect || autodetect_inverse
+      def autodetect_inverse(klass = nil)
+        return nil if klass.nil? && options[:polymorphic]
+        klass ||= self.klass
+
+        # name-based matching (association name vs self.active_record.to_s)
+        matches = self.reverse_matches(klass)
+        if matches.length > 1
+          matches.find_all do |assoc|
+            self.active_record.to_s.underscore.include? assoc.name.to_s.pluralize.singularize
+          end
+        end
+
+        matches.first
       end
-      alias_method_chain :inverse_of, :autodetect
+    end
 
+    module AssociationReflection
+      def self.included(base)
+        base.send :include, ActiveScaffold::ReverseAssociation::CommonMethods
+      end
+      
       protected
+      def reverse_matches(klass)
+        reverse_matches = []
 
-        def autodetect_inverse(klass = nil)
-          return nil if klass.nil? && options[:polymorphic]
-          klass ||= self.klass
-          reverse_matches = []
-
-          # stage 1 filter: collect associations that point back to this model and use the same foreign_key
-          klass.reflect_on_all_associations.each do |assoc|
-            next if assoc == self
-            if self.options[:through]
-              # only iterate has_many :through associations
-              next unless assoc.options[:through]
-              next unless assoc.through_reflection.klass == self.through_reflection.klass
-            else
-              # skip over has_many :through associations
-              next if assoc.options[:through]
-              next unless assoc.options[:polymorphic] or assoc.class_name == self.active_record.name
-
-              case [assoc.macro, self.macro].find_all{|m| m == :has_and_belongs_to_many}.length
-                # if both are a habtm, then match them based on the join table
-                when 2
-                next unless assoc.options[:join_table] == self.options[:join_table]
-
-                # if only one is a habtm, they do not match
-                when 1
-                next
-
-                # otherwise, match them based on the foreign_key
-                when 0
-                next unless assoc.foreign_key.to_sym == self.foreign_key.to_sym
-              end
-            end
-
-            reverse_matches << assoc
-          end
+        # collect associations that point back to this model and use the same foreign_key
+        klass.reflect_on_all_associations.each do |assoc|
+          next if assoc == self
+          # skip over has_many :through associations
+          next if assoc.options[:through]
+          next unless assoc.options[:polymorphic] or assoc.class_name == self.active_record.name
 
-          # stage 2 filter: name-based matching (association name vs self.active_record.to_s)
-          reverse_matches.find_all do |assoc|
-            self.active_record.to_s.underscore.include? assoc.name.to_s.pluralize.singularize
-          end if reverse_matches.length > 1
+          case [assoc.macro, self.macro].find_all{|m| m == :has_and_belongs_to_many}.length
+            # if both are a habtm, then match them based on the join table
+            when 2
+            next unless assoc.options[:join_table] == self.options[:join_table]
+
+            # if only one is a habtm, they do not match
+            when 1
+            next
+
+            # otherwise, match them based on the foreign_key
+            when 0
+            next unless assoc.foreign_key.to_sym == self.foreign_key.to_sym
+          end
 
-          reverse_matches.first
+          reverse_matches << assoc
         end
+        reverse_matches
+      end
+    end
+
+    module ThroughReflection
+      def self.included(base)
+        base.send :include, ActiveScaffold::ReverseAssociation::CommonMethods unless base < ActiveScaffold::ReverseAssociation::CommonMethods
+      end
 
+      protected
+
+      def reverse_matches(klass)
+        reverse_matches = []
+
+        # collect associations that point back to this model and use the same foreign_key
+        klass.reflect_on_all_associations.each do |assoc|
+          next if assoc == self
+          # only iterate has_many :through associations
+          next unless assoc.options[:through]
+          next unless assoc.class_name == self.active_record.name
+          next unless assoc.through_reflection.class_name == self.through_reflection.class_name
+          
+          reverse_matches << assoc
+        end
+        reverse_matches
+      end
     end
+
   end
 end
+
+ActiveRecord::Reflection::AssociationReflection.send :include, ActiveScaffold::ReverseAssociation::AssociationReflection
+ActiveRecord::Reflection::ThroughReflection.send :include, ActiveScaffold::ReverseAssociation::ThroughReflection

data/lib/active_scaffold/extensions/unsaved_associated.rb

@@ -4,7 +4,8 @@ class ActiveRecord::Base
     return true if path.include?(self) # prevent recursion (if associated and parent are new records)
     path << self
     # using [].all? syntax to avoid a short-circuit
-    with_unsaved_associated { |a| [a.valid?, a.associated_valid?(path)].all? }
+    # errors to associated record can be added by update_record_from_params when association fails to set and ActiveRecord::RecordNotSaved is raised
+    with_unsaved_associated { |a| [a.errors.empty? && a.valid?, a.associated_valid?(path)].all? }
   end
 
   def save_associated

data/lib/active_scaffold/finder.rb

@@ -18,7 +18,7 @@ module ActiveScaffold
         where_clauses = []
         columns.each do |column|
           Array(column.search_sql).each do |search_sql|
-            where_clauses << "#{search_sql} #{(column.column.nil? || column.column.text?) ? ActiveScaffold::Finder.like_operator : '='} ?"
+            where_clauses << "#{search_sql} #{column.text? ? ActiveScaffold::Finder.like_operator : '='} ?"
           end
         end
         phrase = where_clauses.join(' OR ')
@@ -26,7 +26,7 @@ module ActiveScaffold
         tokens.collect do |value|
           columns.inject([phrase]) do |condition, column|
             Array(column.search_sql).size.times do
-              condition.push((column.column.nil? || column.column.text?) ? like_pattern.sub('?', value) : column.column.type_cast(value))
+              condition.push(column.text? ? like_pattern.sub('?', value) : column.column.type_cast(value))
             end
             condition
           end
@@ -62,7 +62,7 @@ module ActiveScaffold
               when :select, :multi_select, :country, :usa_state, :chosen, :multi_chosen
                 ["%{search_sql} in (?)", Array(value)]
               else
-                if column.column.nil? || column.column.text?
+                if column.text?
                   ["%{search_sql} #{ActiveScaffold::Finder.like_operator} ?", like_pattern.sub('?', value)]
                 else
                   ["%{search_sql} = ?", column.column.type_cast(value)]
@@ -97,7 +97,7 @@ module ActiveScaffold
 
       def condition_for_range(column, value, like_pattern = nil)
         if !value.is_a?(Hash)
-          if column.column.nil? || column.column.text?
+          if column.text?
             ["%{search_sql} #{ActiveScaffold::Finder.like_operator} ?", like_pattern.sub('?', value)]
           else
             ["%{search_sql} = ?", column.column.type_cast(value)]
@@ -320,12 +320,12 @@ module ActiveScaffold
         conditions_for_collection,                    # from the dev
         conditions_from_params,                       # from the parameters (e.g. /users/list?first_name=Fred)
         conditions_from_constraints,                  # from any constraints (embedded scaffolds)
-        active_scaffold_session_storage[:conditions] # embedding conditions (weaker constraints)
+        active_scaffold_session_storage['conditions'] # embedding conditions (weaker constraints)
       ].reject(&:blank?)
     end
 
     def id_condition
-      {:id => params[:id]} if params[:id]
+      {active_scaffold_config.model.primary_key => params[:id]} if params[:id]
     end
     
     # returns a single record (the given id) but only if it's allowed for the specified security options.

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -130,7 +130,7 @@ module ActiveScaffold
         ActiveSupport::Deprecation.warn "Relying on @record is deprecated, include :object in options with record.", caller if record.nil? # TODO Remove when relying on @record is removed
         record ||= @record # TODO Remove when relying on @record is removed
         subform_controller = controller.class.active_scaffold_controller_for(record.class) if scope
-        form_columns = @main_columns.try(:names)
+        form_columns = @main_columns.try(:names) if scope.nil? || subform_controller == controller.class
         form_columns ||= current_form_columns(record, scope, subform_controller)
         if force || (form_columns && column.update_columns && (column.update_columns & form_columns).present?)
           url_params = params_for(:action => 'render_field', :column => column.name, :id => record.to_param)

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -156,7 +156,7 @@ module ActiveScaffold
       end
 
       def active_scaffold_search_range_string?(column)
-        (column.column && column.column.text?) || column.search_ui == :string
+        column.text? || column.search_ui == :string
       end
 
       def active_scaffold_search_range_comparator_options(column)

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -96,6 +96,15 @@ module ActiveScaffold
         end
       end
 
+      def display_dynamic_action_group(action_link, links, record_or_ul_options = nil, ul_options = nil)
+        ul_options = record_or_ul_options if ul_options.nil? && record_or_ul_options.is_a?(Hash)
+        record = record_or_ul_options unless record_or_ul_options.is_a?(Hash)
+        html = content_tag :ul, ul_options do
+          links.map { |link| content_tag :li, link }.join('').html_safe
+        end
+        raw "ActiveScaffold.display_dynamic_action_group('#{get_action_link_id action_link, record}', '#{escape_javascript html}');"
+      end
+
       def display_action_links(action_links, record, options, &block)
         options[:level_0_tag] ||= nil
         options[:options_level_0_tag] ||= nil
@@ -512,7 +521,7 @@ module ActiveScaffold
 
       def column_empty?(column_value)
         empty = column_value.nil?
-        empty ||= column_value != false && column_value.blank?
+        empty ||= false != column_value && column_value.blank?
         empty ||= [' ', active_scaffold_config.list.empty_field_text].include? column_value if String === column_value
         return empty
       end

data/lib/active_scaffold/marked_model.rb

@@ -3,31 +3,37 @@ module ActiveScaffold
     # This is a module aimed at making the make session_stored marked_records available to ActiveRecord models
     
     def self.included(base)
-      base.extend ClassMethods
-      base.scope :as_marked, lambda { where(:id => base.marked_records.to_a) }
+      base.class_eval do
+        extend ClassMethods
+        scope :as_marked, lambda { where(primary_key => marked_record_ids) }
+      end
     end
     
     def as_marked
-      marked_records.include?(self.id)
+      marked_records.include?(self.id.to_s)
     end
     
     def as_marked=(value)
       value = [true, 'true', 1, '1', 'T', 't'].include?(value.class == String ? value.downcase : value)
       if value == true
-        marked_records << self.id if !as_marked
+        marked_records[self.id.to_s] = true if !as_marked
       else
-        marked_records.delete(self.id)
+        marked_records.delete(self.id.to_s)
       end
     end
   
     module ClassMethods
       def marked_records
-        Thread.current[:marked_records] ||= Set.new
+        Thread.current[:marked_records] ||= {}
       end
 
       def marked_records=(marked)
         Thread.current[:marked_records] = marked 
       end
+
+      def marked_record_ids
+        marked_records.keys
+      end
     end
   
     # Instance-level access to the marked_records

data/lib/active_scaffold/tableless.rb

@@ -195,13 +195,15 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
     raise 'destroy must be implemented in a Tableless model'
   end
 
-  def create_record #:nodoc:
+  def _create_record #:nodoc:
     run_callbacks(:create) {}
   end
-  alias_method :create, :create_record # for rails3
+  alias_method :create_record, :_create_record # for rails4 < 4.0.6, < 4.1.2
+  alias_method :create, :_create_record # for rails3
 
-  def update_record(*) #:nodoc:
+  def _update_record(*) #:nodoc:
     run_callbacks(:update) {}
   end
-  alias_method :update, :update_record # for rails3
+  alias_method :update_record, :_update_record # for rails4 < 4.0.6, < 4.1.2
+  alias_method :update, :_update_record # for rails3
 end

data/lib/active_scaffold/version.rb

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

data/test/misc/attribute_params_test.rb

@@ -319,4 +319,7 @@ class Controller
   def logger
     @logger ||= Logger.new(STDOUT)
   end
+  def flash
+    @flash ||= ActionDispatch::Flash::FlashHash.new
+  end
 end

data/test/mock_app/app/models/person.rb

@@ -2,7 +2,7 @@ class Person < ActiveRecord::Base
   has_many :buildings, :foreign_key => :owner_id
   has_one :floor, :foreign_key => :tenant_id
   has_one :address, :through => :floor
-  has_one :home, :through => :floor, :source => :building
+  has_one :home, :through => :floor, :source => :building, :class_name => 'Building'
 
   has_many :contacts, :as => :contactable
   has_one :car, :dependent => :destroy

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-02 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda