active_scaffold_vho 3.0.25 → 3.0.26

data/active_scaffold_vho.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_scaffold_vho}
-  s.version = "3.0.25"
+  s.version = "3.0.26"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Many, see README"]
-  s.date = %q{2012-02-28}
+  s.date = %q{2012-05-12}
   s.description = %q{Save time and headaches, and create a more easily maintainable set of pages, with ActiveScaffold. ActiveScaffold handles all your CRUD (create, read, update, delete) user interface needs, leaving you more time to focus on more challenging (and interesting!) problems.}
   s.email = %q{activescaffold@googlegroups.com}
   s.extra_rdoc_files = [

data/frontends/default/javascripts/jquery/active_scaffold.js

@@ -1,4 +1,17 @@
 $(document).ready(function() {
+  $('form.as_form').live('ajax:before', function(event) {
+    var as_form = $(this).closest("form");
+    $(this).find('.association-record-new').each(function(index) {
+        var record_action = 'empty';
+
+        if(ActiveScaffold.form_elements_changed($(this).find('input, textarea, select'))) {
+          record_action = 'create';
+        }
+        $(this).find('input.associated_action').val(record_action);
+    });
+    return true;
+  });
+  
   $('form.as_form').live('ajax:loading', function(event) {
     var as_form = $(this).closest("form");
     if (as_form && as_form.attr('data-loading') == 'true') {
@@ -34,6 +47,7 @@ $(document).ready(function() {
       } else {
         // hack: jquery requires if you request for javascript that javascript
         // is coming back, however rails has a different mantra
+        // Not needed anymore just included for backwards compatibility with jquery_vho
         if (action_link.position) {
           if (parseFloat($.fn.jquery) >= 1.5) {
             event.data_type = 'text';
@@ -48,6 +62,15 @@ $(document).ready(function() {
     }
     return true;
   });
+  $('a.as_action').live('ajax:beforeSend', function(event, xhr, settings) {
+    xhr.setRequestHeader('accept', '*/*;q=0.5, ' + settings.accepts.script);
+    var action_link = ActiveScaffold.ActionLink.get($(this));
+    if (action_link && action_link.position) {
+      settings.dataType = 'text';
+      settings.dataTypes = ['text'];
+    }
+    return true;
+  });
   $('a.as_action').live('ajax:success', function(event, response) {
     var action_link = ActiveScaffold.ActionLink.get($(this));
     if (action_link) {
@@ -85,6 +108,7 @@ $(document).ready(function() {
       var refresh_data = as_cancel.attr('data-refresh');
       if (refresh_data === 'true' && action_link.refresh_url) {
         event.data_url = action_link.refresh_url;
+        as_cancel.attr('href', action_link.refresh_url);
         if (action_link.position) event.data_type = 'html' 
       } else if (refresh_data === 'false' || typeof(cancel_url) == 'undefined' || cancel_url.length == 0) {
         action_link.close();
@@ -93,6 +117,17 @@ $(document).ready(function() {
     }
     return true;
   });
+  $('a.as_cancel').live('ajax:beforeSend', function(event, xhr, settings) {
+    var as_cancel = $(this);
+    var action_link = ActiveScaffold.ActionLink.get($(this));
+    var refresh_data = as_cancel.attr('data-refresh');
+
+    if (action_link && action_link.position && refresh_data === 'true' && action_link.refresh_url) {
+      settings.dataType = 'html';
+      settings.dataTypes = ['html'];
+    }
+    return true;
+  });
   $('a.as_cancel').live('ajax:success', function(event, response) {
     var action_link = ActiveScaffold.find_action_link($(this));
 
@@ -140,11 +175,25 @@ $(document).ready(function() {
     $(this).prevAll('img.loading-indicator').css('visibility','hidden');
     return true;
   });
-  $('input[type=button].as_add_existing').live('ajax:before', function(event) {
-    var url = $(this).attr('href').replace('--ID--', $(this).prev().val());
-    event.data_url = url;
-    return true;
+  $('a.as_add_existing').live('ajax:before', function(event) {
+    var selected_id = $(this).prev().val();
+    if (selected_id) {
+      var url = $(this).attr('href').replace('--ID--', $(this).prev().val());
+      $(this).attr('href', url);
+      event.data_url = url;
+      return true;
+    } else {
+      return false;
+    }
+    
   });
+  $('a.as_destroy_existing').live('click', function(event) {
+    var associated_record = $(this).closest('tr.association-record');
+    ActiveScaffold.delete_subform_record(associated_record);
+    event.stopPropagation();
+    return false;
+  });
+
   $('input.update_form, textarea.update_form, select.update_form').live('change', function(event) {
       var element = $(this);
       var as_form = element.closest('form.as_form');
@@ -229,6 +278,24 @@ $(document).ready(function() {
     ActiveScaffold.focus_first_element_of_form(as_form);
     return true;
   });
+  $('li.horizontal-sub-form').live('as:form_element_loaded', function(event) {
+    $(this).find('a.as_associated_form_link').each(function(index) {
+        ActiveScaffold.show($(this));
+        //Show select Box for add_existing as well
+        if($(this).has('as_add_existing')) {
+          ActiveScaffold.show($(this).prev());
+        }
+    })
+    return true;
+  });
+  $('li.sub-form').live('as:form_element_loaded', function(event) {
+    $(this).find('.association-record-new').each(function(index) {
+        $(this).find('input, textarea, select').each(function(index) {
+          $(this).data('value_was', $(this).val());
+        })
+    })
+    return true;
+  });
   $('span.mark_heading, span.in_place_editor_field[data-ie_mode="inline_checkbox"]').live('click', function(event) {
     ActiveScaffold.process_checkbox_inplace_edit($(this).find('input:checkbox'), ActiveScaffold.inplace_edit_options($(this)));
     return true;
@@ -240,12 +307,20 @@ $(document).ready(function() {
     return true;
   });
   $('tr.inline-adapter-autoopen').live('as:list_row_loaded', function(event) {
-    var actionlink_id = $(event.target).attr('data-actionlinkid');
-    if(actionlink_id) {
-      var action_link = ActiveScaffold.ActionLink.get(actionlink_id);
-      if (action_link) {
-        action_link.set_opened();
-      }
+    var actionlink_controllers = $(event.target).attr('data-actionlink-controllers');
+    if(actionlink_controllers) {
+      actionlink_controllers = actionlink_controllers.split('::');
+      $(this).prev('tr').find('a.index').each(function(index) {
+        var action_link = $(this);
+        for (var i = 0; i < actionlink_controllers.length; i++) {
+          if (actionlink_controllers[i] === action_link.attr('data-controller')) {
+            var as_action_link = ActiveScaffold.ActionLink.get(action_link);
+            if (as_action_link) {
+              as_action_link.set_opened();
+            }
+          }
+        }
+      });
     }
     return true;
   });
@@ -260,6 +335,7 @@ $(document).ready(function() {
     return true;
   });
   ActiveScaffold.trigger_load_events($('[data-as_load]'));
+  ActiveScaffold.load_embedded_conrollers();
   
 });
 
@@ -580,7 +656,8 @@ var ActiveScaffold = {
     if (errors.hasClass('association-record-errors')) {
       this.replace_html(errors, '');
     }
-    this.remove(record);
+    record.find('input.associated_action').val('delete');
+    this.hide(record);
   },
 
   report_500_response: function(active_scaffold_id) {
@@ -841,6 +918,27 @@ var ActiveScaffold = {
        break;
       }
     });
+  },
+
+  load_embedded_conrollers: function(){
+    $.each($('a.as_link_to_component'), function(index) {
+      var div_element = $(this).closest('div.active-scaffold-component');
+      div_element.load($(this).attr('href').append_params({embedded: true}));
+    });
+  },
+
+  form_elements_changed: function(form_elements){
+    var form_elements_count = form_elements.length;
+    var i = 0;
+    var changed = false;
+
+    while(changed === false && i < form_elements_count) {
+      if($(form_elements[i]).val() != $(form_elements[i]).data('value_was')) {
+        changed = true;
+      }
+      i++;
+    }
+    return changed;
   }
 }
 

data/frontends/default/javascripts/prototype/active_scaffold.js

@@ -230,11 +230,22 @@ document.observe("dom:loaded", function() {
     if(loading_indicator) loading_indicator.style.visibility = 'hidden';  
     return true;
   });
-  document.on('ajax:before', 'input[type=button].as_add_existing', function(event) {
+  document.on('ajax:before', 'a.as_add_existing', function(event) {
     var button = event.findElement();
-    var url =  button.readAttribute('href').sub('--ID--', button.previous().getValue());
-    event.memo.url = url;
-    return true;
+    var selected_id = button.previous().getValue();
+    if (selected_id) {
+      var url =  button.readAttribute('href').sub('--ID--', selected_id);
+      event.memo.url = url;
+      return true;
+    } else {
+      return false;
+    }
+  });
+  document.on('click', 'a.as_destroy_existing', function(event) {
+    var associated_record = event.findElement('tr.association-record');
+    ActiveScaffold.delete_subform_record(associated_record);
+    event.stop();
+    return false;
   });
   document.on('change', 'input.update_form, textarea.update_form, select.update_form', function(event) {
     var element = event.findElement();
@@ -314,13 +325,30 @@ document.observe("dom:loaded", function() {
       ActiveScaffold.focus_first_element_of_form(as_form);
       return true;
   });
+  document.on('as:form_element_loaded', 'li.horizontal-sub-form', function(event, element) {
+      element.select('a.as_associated_form_link').each(function(element) {
+        ActiveScaffold.show(element);
+        //Show select Box for add_existing as well
+        if(element.hasClassName('as_add_existing')) {
+          ActiveScaffold.show(element.previous());
+        }
+      });
+      return true;
+  });
   document.on('as:list_row_loaded', 'tr.inline-adapter-autoopen', function(event, element) {
-    var actionlink_id = element.readAttribute('data-actionlinkid');
-    if(actionlink_id) {
-      var action_link = ActiveScaffold.ActionLink.get(actionlink_id);
-      if (action_link) {
-        action_link.set_opened();
-      }
+    var actionlink_controllers = event.element().readAttribute('data-actionlink-controllers');
+    if(actionlink_controllers) {
+      actionlink_controllers = actionlink_controllers.split('::');
+      element.previous('tr').select('a.index').each(function(action_link) {
+        for (var i = 0; i < actionlink_controllers.length; i++) {
+          if (actionlink_controllers[i] === action_link.readAttribute('data-controller')) {
+            var as_action_link = ActiveScaffold.ActionLink.get(action_link);
+            if (as_action_link) {
+              as_action_link.set_opened();  
+            }
+          }
+        }
+      });
     }
     return true;
   });
@@ -335,6 +363,7 @@ document.observe("dom:loaded", function() {
     return true;
   });
   ActiveScaffold.trigger_load_events($$('[data-as_load]'));
+  ActiveScaffold.load_embedded_conrollers();
 });
 
 
@@ -490,7 +519,7 @@ var ActiveScaffold = {
       tbody.insert({top: html});
       new_row = tbody.firstDescendant();
     } else if (options.insert_at == 'bottom') {
-      var last_row = tbody.childElements().reverse().detect(function(node) { return node.hasClassName('record') || node.hasClassName('inline-adapter')});
+      var last_row = tbody.childElements().reverse().detect(function(node) {return node.hasClassName('record') || node.hasClassName('inline-adapter')});
       if (last_row) {
         last_row.insert({after: html});
       } else {
@@ -529,7 +558,8 @@ var ActiveScaffold = {
     if (errors.hasClassName('association-record-errors')) {
       this.replace_html(errors, '');
     }
-    this.remove(record);
+    record.down('input.associated_action').value('delete');
+    this.hide(record);
   },
 
   report_500_response: function(active_scaffold_id) {
@@ -651,7 +681,7 @@ var ActiveScaffold = {
     var mark_checkboxes = $$('#' + element.readAttribute('id') + ' > tr.record td.marked-column input[type="checkbox"]');
     mark_checkboxes.each(function(item) {
      if(options.checked === true) {
-       item.writeAttribute({ checked: 'checked' });
+       item.writeAttribute({checked: 'checked'});
      } else {
        item.removeAttribute('checked');
      }
@@ -660,7 +690,7 @@ var ActiveScaffold = {
     if(options.include_mark_all === true) {
       var mark_all_checkbox = element.previous('thead').down('th.marked-column_heading span input[type="checkbox"]');
       if(options.checked === true) {
-        mark_all_checkbox.writeAttribute({ checked: 'checked' }); 
+        mark_all_checkbox.writeAttribute({checked: 'checked'}); 
       } else {
         mark_all_checkbox.removeAttribute('checked');
       }
@@ -698,6 +728,13 @@ var ActiveScaffold = {
        break;
       }
     });
+  },
+
+  load_embedded_conrollers: function(){
+    $$('a.as_link_to_component').each(function(element) {
+      var div_element = element.up('div.active-scaffold-component');
+      new Ajax.Updater(div_element, element.readAttribute('href').append_params({embedded: true}), {method: 'get', evalScripts: true});
+    });
   }
 
 }

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

@@ -10,17 +10,15 @@ show_add_new = column_show_add_new(column, associated, @record)
 
 return unless show_add_new or show_add_existing
 
-edit_associated_url = url_for(:action => 'edit_associated', :id => parent_record.id, :association => column.name, :associated_id => '--ID--', :escape => false, :eid => params[:eid], :parent_controller => params[:parent_controller], :parent_id => params[:parent_id]) if show_add_existing
-add_new_url = url_for(:action => 'edit_associated', :id => parent_record.id, :association => column.name, :escape => false, :eid => params[:eid], :parent_controller => params[:parent_controller], :parent_id => params[:parent_id]) if show_add_new
+edit_associated_url = url_for(:action => 'edit_associated', :id => parent_record.id, :association => column.name, :associated_id => '--ID--', :escape => false, :eid => params[:eid], :parent_controller => params[:parent_controller], :parent_id => params[:parent_id]).html_safe if show_add_existing
+add_new_url = url_for(:action => 'edit_associated', :id => parent_record.id, :association => column.name, :escape => false, :eid => params[:eid], :parent_controller => params[:parent_controller], :parent_id => params[:parent_id]).html_safe if show_add_new
 
 -%>
 <div class="footer-wrapper">
   <div class="footer">
     <% if show_add_new -%>
-    <% add_label = column.plural_association? ? as_(:create_another, :model => column.association.klass.model_name.human) : as_(:replace_with_new) 
-       create_another_id = "#{sub_form_id(:association => column.name)}-create-another" %>
-    <%= tag(:input, {:id => create_another_id, :type => 'button', :value => add_label, :href => add_new_url.html_safe, 'data-remote' => true, :style=> "display: none;"}) %>
-    <%= javascript_tag("ActiveScaffold.show('#{create_another_id}');") %>
+    <% add_label = column.plural_association? ? as_(:create_another, :model => column.association.klass.model_name.human) : as_(:replace_with_new) %>
+    <%= link_to add_label, add_new_url, :class => 'as_associated_form_link', :remote => true, :style=> "display: none;" %>
     <% end -%>
 
     <%= '|' if show_add_new and show_add_existing %>
@@ -29,11 +27,9 @@ add_new_url = url_for(:action => 'edit_associated', :id => parent_record.id, :as
       <% if remote_controller and remote_controller.respond_to? :uses_record_select? and remote_controller.uses_record_select? -%>
         <%= link_to_record_select as_(:add_existing), remote_controller.controller_path, :onselect => "ActiveScaffold.record_select_onselect(#{edit_associated_url.to_json}, #{active_scaffold_id.to_json}, id);" -%>
       <% else -%>
-        <% select_options = options_for_select(options_for_association(column.association)) 
-           add_existing_id = "#{sub_form_id(:association => column.name)}-add-existing" %>
-        <%= select_tag 'associated_id', '<option value="">'.html_safe + as_(:_select_) + '</option>'.html_safe + select_options %>
-        <%= tag(:input, {:id => add_existing_id, :type => 'button', :value => as_(:add_existing), :href => edit_associated_url.html_safe, 'data-remote' => true, :class=> 'as_add_existing', :style => "display: none;"}) %>
-        <%= javascript_tag("ActiveScaffold.show('#{add_existing_id}');") %>
+        <% select_options = options_for_select(options_for_association(column.association))%>
+        <%= select_tag 'associated_id', '<option value="">'.html_safe + as_(:_select_) + '</option>'.html_safe + select_options, :id => nil, :style => "display: none;" %>
+        <%= link_to as_(:add_existing), edit_associated_url, :remote => true, :class => 'as_associated_form_link as_add_existing', :style => "display: none;" %>
       <% end -%>
     <% end -%>
   </div>

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

@@ -5,6 +5,7 @@
    config = active_scaffold_config_for(@record.class)
    options = active_scaffold_input_options(config.columns[@record.class.primary_key], scope)
    tr_id = "association-#{options[:id]}"
+   associated_action = @record.new_record? ? :create_or_empty : :update
 %>
 <tr id="<%= tr_id %>" class="association-record <%= 'association-record-new' if @record.new_record? -%> <%= 'locked' if locked -%>">
 <% config.subform.columns.each :for => @record.class, :crud_type => crud_type, :flatten => true do |column| %>
@@ -25,13 +26,16 @@
 <% if show_actions -%>
   <td class="actions">
     <% if record_column.plural_association? and (@record.authorized_for?(:crud_type => :delete) or not [:destroy, :delete_all].include?(record_column.association.options[:dependent])) %>
-      <% destroy_id = "#{options[:id]}-destroy" %>
-      <%= link_to as_(:remove), '#', :class => 'destroy', :id => destroy_id , :onclick => "ActiveScaffold.delete_subform_record(\"#{tr_id}\"); return false;", :style=> "display: none;" %>
-      <%= javascript_tag("ActiveScaffold.show('#{destroy_id}');") if !locked %>
+      <% link_classes = ['destroy', 'as_destroy_existing']
+         link_classes << 'as_associated_form_link' if !locked %>
+      <%= link_to as_(:remove), '#', :class => link_classes.join(' '), :style=> "display: none;" %>
     <% end %>
+  </td>
+<% end -%>
+  <td>
     <% unless @record.new_record? %>
-      <input type="hidden" name="<%= options[:name] -%>" id="<%= options[:id] -%>" value="<%= @record.id -%>" />
+    <input type="hidden" name="<%= options[:name] -%>" id="<%= options[:id] -%>" value="<%= @record.id -%>" />
     <% end -%>
+    <input type="hidden" name="<%= scope ? "record#{scope}[associated_action]" : "record[associated_action]" -%>" class="associated_action" value="<%= associated_action -%>" />
   </td>
-<% end -%>
 </tr>

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

@@ -6,6 +6,7 @@
   config = active_scaffold_config_for(@record.class)
   options = active_scaffold_input_options(config.columns[@record.class.primary_key], scope)
   tr_id = "association-#{options[:id]}"
+  associated_action = @record.new_record? ? :create_or_empty : :update
 -%>
 <ol id="<%= tr_id %>" class="association-record <%= 'association-record-new' if @record.new_record? -%> <%= 'locked' if locked -%>">
 <% config.subform.columns.each :for => @record, :crud_type => crud_type, :flatten => true do |column| %>
@@ -26,13 +27,16 @@
 <% if show_actions -%>
   <li class="actions">
     <% if record_column.plural_association? and (@record.authorized_for?(:crud_type => :delete) or not [:destroy, :delete_all].include?(record_column.association.options[:dependent])) %>
-      <% destroy_id = "#{options[:id]}-destroy" %>
-      <%= link_to as_(:remove), '#', :class => 'destroy', :id => destroy_id , :onclick => "ActiveScaffold.delete_subform_record(\"#{tr_id}\"); return false;", :style=> "display: none;" %>
-      <%= javascript_tag("ActiveScaffold.show('#{destroy_id}');") if !locked %>
+      <% link_classes = ['destroy', 'as_destroy_existing']
+         link_classes << 'as_associated_form_link' if !locked %>
+      <%= link_to as_(:remove), '#', :class => link_classes.join(' '), :style=> "display: none;" %>
     <% end %> 
+  </li>
+<% end -%>
+  <li>
     <% unless @record.new_record? %>
-      <input type="hidden" name="<%= options[:name] -%>" id="<%= options[:id] -%>" value="<%= @record.id -%>" />
+    <input type="hidden" name="<%= options[:name] -%>" id="<%= options[:id] -%>" value="<%= @record.id -%>" />
     <% end -%>
+    <input type="hidden" name="<%= scope ? "record#{scope}[associated_action]" : "record[associated_action]" -%>" class="associated_action" value="<%= associated_action -%>" />
   </li>
-<% end -%>
 </ol>

data/lib/active_scaffold/active_record_permissions.rb

@@ -82,8 +82,6 @@ module ActiveRecordPermissions
       # options[:column] should be the name of a model attribute
       # options[:action] is the name of a method
       def authorized_for?(options = {})
-        raise ArgumentError, "unknown crud type #{options[:crud_type]}" if options[:crud_type] and ![:create, :read, :update, :delete].include?(options[:crud_type])
-
         # column_authorized_for_crud_type? has the highest priority over other methods,
         # you can disable a crud verb and enable that verb for a column
         # (for example, disable update and enable inplace_edit in a column)

data/lib/active_scaffold/attribute_params.rb

@@ -88,7 +88,7 @@ module ActiveScaffold
     end
     
     def manage_nested_record_from_params(parent_record, column, attributes)
-      record = find_or_create_for_params(attributes, column, parent_record)
+      record = nested_record_for_action(parent_record, column, attributes)
       if record
         record_columns = active_scaffold_config_for(column.association.klass).subform.columns
         update_record_from_params(record, record_columns, attributes)
@@ -96,6 +96,23 @@ module ActiveScaffold
       end
       record
     end
+
+    def nested_record_for_action(parent_record, column, attributes)
+      associated_action = attributes.delete(:associated_action)
+
+      case associated_action.to_sym
+      when :create then create_nested_record(column, parent_record)
+      when :update then find_nested_record(attributes[:id], column, parent_record)
+      when :empty then nil
+      when :delete then nil
+      when :create_or_empty then
+        if column.show_blank_record && attributes_hash_is_empty?(attributes, column.association.klass)
+          nil
+        else
+          create_nested_record(column, parent_record)
+        end
+      end
+    end
     
     def column_value_from_param_value(parent_record, column, value)
       # convert the value, possibly by instantiating associated objects
@@ -150,33 +167,35 @@ module ActiveScaffold
       end
     end
 
-    # Attempts to create or find an instance of klass (which must be an ActiveRecord object) from the
-    # request parameters given. If params[:id] exists it will attempt to find an existing object
-    # otherwise it will build a new one.
-    def find_or_create_for_params(params, parent_column, parent_record)
-      current = parent_record.send(parent_column.name)
+    def create_nested_record(parent_column, parent_record)
       klass = parent_column.association.klass
-      return nil if parent_column.show_blank_record and attributes_hash_is_empty?(params, klass)
+      
+      if klass.authorized_for?(:crud_type => :create)
+        if parent_column.singular_association?
+          return parent_record.send("build_#{parent_column.name}")
+        else
+          return parent_record.send(parent_column.name).build
+        end
+      end
+    end
 
-      if params.has_key? :id
+    def find_nested_record(id, parent_column, parent_record)
+      klass = parent_column.association.klass
+      if id
+        current = parent_record.send(parent_column.name)
+        Rails.logger.info("find_nested_record: id: #{id}, curent: #{current.inspect}")
         # modifying the current object of a singular association
-        if current and current.is_a? ActiveRecord::Base and current.id.to_s == params[:id]
+        if current && current.is_a?(ActiveRecord::Base) && current.id.to_s == id
           return current
         # modifying one of the current objects in a plural association
-        elsif current and current.respond_to?(:any?) and current.any? {|o| o.id.to_s == params[:id]}
-          return current.detect {|o| o.id.to_s == params[:id]}
+        elsif current && current.respond_to?(:any?) && current.any? {|o| o.id.to_s == id}
+          return current.detect {|o| o.id.to_s == id}
         # attaching an existing but not-current object
         else
-          return klass.find(params[:id])
+          return klass.find(id)
         end
       else
-        if klass.authorized_for?(:crud_type => :create)
-          if parent_column.singular_association?
-            return parent_record.send("build_#{parent_column.name}")
-          else
-            return parent_record.send(parent_column.name).build
-          end
-        end
+        Rails.logger.info("Activescaffold find_nested_record missing id")
       end
     end
 

data/lib/active_scaffold/data_structures/action_link.rb

@@ -67,15 +67,6 @@ module ActiveScaffold::DataStructures
     def confirm?
       @confirm ? true : false
     end
-    
-    # if the action uses a DHTML based (i.e. 2-phase) confirmation
-    attr_writer :dhtml_confirm
-    def dhtml_confirm
-      @dhtml_confirm
-    end
-    def dhtml_confirm?
-      @dhtml_confirm
-    end
 
     # what method to call on the controller to see if this action_link should be visible
     # note that this is only the UI part of the security. to prevent URL hax0rz, you also need security on requests (e.g. don't execute update method unless authorized).

data/lib/active_scaffold/extensions/action_view_rendering.rb

@@ -38,7 +38,8 @@ module ActionView::Rendering #:nodoc:
   # Defining options[:label] lets you completely customize the list title for the embedded scaffold.
   #
   def render_with_active_scaffold(*args, &block)
-    if args.first == :super
+    options = args.first
+    if options == :super
       last_view = @view_stack.last
       options = args[1] || {}
       options[:locals] ||= {}
@@ -52,37 +53,31 @@ module ActionView::Rendering #:nodoc:
       result = render_without_active_scaffold options
       @view_stack.pop
       result
-    elsif args.first.is_a?(Hash) and args.first[:active_scaffold]
+    elsif options.is_a?(Hash) && options[:active_scaffold]
       require 'digest/md5'
-      options = args.first
 
       remote_controller = options[:active_scaffold]
       constraints = options[:constraints]
       conditions = options[:conditions]
       eid = Digest::MD5.hexdigest(params[:controller] + remote_controller.to_s + constraints.to_s + conditions.to_s)
-      session["as:#{eid}"] = {:constraints => constraints, :conditions => conditions, :list => {:label => args.first[:label]}}
+      session["as:#{eid}"] = {:constraints => constraints, :conditions => conditions, :list => {:label => options[:label]}}
       options[:params] ||= {}
       options[:params].merge! :eid => eid, :embedded => true
       
       id = "as_#{eid}-content"
       url_options = {:controller => remote_controller.to_s, :action => 'index'}.merge(options[:params])
       
-      if controller.respond_to?(:render_component_into_view)
+      unless controller.respond_to?(:render_component_into_view)
         controller.send(:render_component_into_view, url_options)
       else
-        content_tag(:div, {:id => id}) do
+        url_options.delete(:embedded)
+        content_tag(:div, {:id => id, :class => 'active-scaffold-component'}) do
           url = url_for(url_options)
-          link_to(remote_controller.to_s, url, {:remote => true, :id => id}) <<
-            if ActiveScaffold.js_framework == :prototype
-            javascript_tag("new Ajax.Updater('#{id}', '#{url}', {method: 'get', evalScripts: true});")
-          elsif ActiveScaffold.js_framework == :jquery
-            javascript_tag("$('##{id}').load('#{url}');")
-          end
+          link_to(remote_controller.to_s, url, {:remote => true, :class => 'as_link_to_component'})
         end
       end
       
     else
-      options = args.first
       if options.is_a?(Hash)
         current_view = {:view => options[:partial], :is_template => false} if options[:partial]
         current_view = {:view => options[:template], :is_template => !!options[:template]} if current_view.nil? && options[:template]

data/lib/active_scaffold/finder.rb

@@ -265,7 +265,8 @@ module ActiveScaffold
                          :where => search_conditions,
                          :joins => joins_for_finder,
                          :includes => options[:count_includes]}
-                         
+
+
       finder_options.merge! custom_finder_options
 
       # NOTE: we must use :include in the count query, because some conditions may reference other tables
@@ -275,6 +276,9 @@ module ActiveScaffold
       # Converts count to an integer if ActiveRecord returned an OrderedHash
       # that happens when finder_options contains a :group key
       count = count.length if count.is_a? ActiveSupport::OrderedHash
+
+      full_includes = add_association_to_includes_for_sorting(options[:sorting], full_includes)
+
       finder_options.merge! :includes => full_includes
 
       # we build the paginator differently for method- and sql-based sorting
@@ -292,6 +296,21 @@ module ActiveScaffold
       end
       pager.page(options[:page])
     end
+
+    # if someone excludes association from includes in configuration
+    # and sorts by that that column... database will not be happy about it :-)
+    # just a safety check to prevent many many database queries
+    def add_association_to_includes_for_sorting(sorting, full_includes)
+      if sorting && sorting.sorts_by_method?
+        sorting_column = sorting.first.first
+        #wants to sort by assocation which is not included bad performance...
+        if sorting_column.association && !sorting_column.polymorphic_association? &&
+           sorting_column.includes.empty? && !full_includes.include?(sorting_column.association.name)
+           full_includes << sorting_column.association.name
+        end
+      end
+      full_includes
+    end
     
     def append_to_query(query, options)
       options.assert_valid_keys :where, :select, :group, :order, :limit, :offset, :joins, :includes, :lock, :readonly, :from
@@ -330,6 +349,7 @@ module ActiveScaffold
 
     # TODO: this should reside on the column, not the controller
     def sort_collection_by_column(collection, column, order)
+      Rails.logger.info("das hier ja was bin im sort_collection")
       sorter = column.sort[:method]
       collection = collection.sort_by { |record|
         value = (sorter.is_a? Proc) ? record.instance_eval(&sorter) : record.instance_eval(sorter)

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -351,15 +351,15 @@ module ActiveScaffold
       
       def render_nested_view(action_links, url_options, record)
         rendered = []
-        link_id = nil
+        link_nested_controllers = []
         action_links.member.each do |link|
           if link.nested_link? && link.column && @nested_auto_open[link.column.name] && @records.length <= @nested_auto_open[link.column.name] && controller.respond_to?(:render_component_into_view)
             link_url_options = {:embedded => true, :format => :js}.merge(action_link_url_options(link, url_options, record, options = {:reuse_eid => true}))
-            link_id = get_action_link_id(link_url_options, record, link.column)
+            link_nested_controllers << link.controller.to_s if link.controller
             rendered << (controller.send(:render_component_into_view, link_url_options))
           end 
         end
-        content_tag(:tr, content_tag(:td, rendered.join(' ').html_safe), :class => "inline-adapter-autoopen", 'data-actionlinkid' => link_id, 'data-as_load'=>"tr");
+        content_tag(:tr, content_tag(:td, rendered.join(' ').html_safe), :class => "inline-adapter-autoopen", 'data-actionlink-controllers' => link_nested_controllers.join('::').html_safe, 'data-as_load'=>"tr");
       end  
       
     end

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -160,7 +160,6 @@ module ActiveScaffold
       end
       
       def action_link_html_options(link, url_options, record, html_options)
-        link_id = get_action_link_id(url_options, record, link.column)
         html_options.reverse_merge! link.html_options.merge(:class => link.action)
 
         # Needs to be in html_options to as the adding _method to the url is no longer supported by Rails        
@@ -175,14 +174,7 @@ module ActiveScaffold
           html_options['data-popup'] = true
           html_options[:target] = '_blank'
         end
-        html_options[:id] = link_id
         html_options[:remote] = true unless link.page? || link.popup?
-        if link.dhtml_confirm?
-          html_options[:class] += ' as_action' if !link.inline?
-          html_options[:page_link] = 'true' if !link.inline?
-          html_options[:dhtml_confirm] = link.dhtml_confirm.value
-          html_options[:onclick] = link.dhtml_confirm.onclick_function(controller, link_id)
-        end
         html_options[:class] += " #{link.html_options[:class]}" unless link.html_options[:class].blank?
         html_options
       end
@@ -242,6 +234,7 @@ module ActiveScaffold
       end
 
       def column_class(column, column_value, record)
+        @numeric_classes ||= [:decimal, :float, :integer]
         classes = []
         classes << "#{column.name}-column"
         if column.css_class.is_a?(Proc)
@@ -253,7 +246,7 @@ module ActiveScaffold
          
         classes << 'empty' if column_empty? column_value
         classes << 'sorted' if active_scaffold_config.list.user.sorting.sorts_on?(column)
-        classes << 'numeric' if column.column and [:decimal, :float, :integer].include?(column.column.type)
+        classes << 'numeric' if column.column && @numeric_classes.include?(column.column.type)
         classes.join(' ').rstrip
       end
       
@@ -272,9 +265,10 @@ module ActiveScaffold
       end
 
       def column_empty?(column_value)
+        @empty_column_strings ||= ['&nbsp;', active_scaffold_config.list.empty_field_text]
         empty = column_value.nil?
         empty ||= column_value.empty? if column_value.respond_to? :empty?
-        empty ||= ['&nbsp;', active_scaffold_config.list.empty_field_text].include? column_value if String === column_value
+        empty ||= @empty_column_strings.include?(column_value) if String === column_value
         return empty
       end
 

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_vho
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: false
   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: 2012-02-28 00:00:00 +01:00
+date: 2012-05-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency