active_scaffold_vho 3.0.17 → 3.0.18

data/active_scaffold_vho.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_scaffold_vho}
-  s.version = "3.0.17"
+  s.version = "3.0.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Many, see README"]
-  s.date = %q{2011-03-14}
+  s.date = %q{2011-03-27}
   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

@@ -168,7 +168,7 @@ $(document).ready(function() {
 
       if (span.closest('div.active-scaffold').attr('data-eid')) {
         if (options['params'].length > 0) {
-          options['params'] += ";";
+          options['params'] += "&";
         }
         options['params'] += ("eid=" + span.closest('div.active-scaffold').attr('data-eid'));
       }

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

@@ -184,7 +184,7 @@ document.observe("dom:loaded", function() {
 
       if (span.up('div.active-scaffold').readAttribute('data-eid')) {
         if (options['params'].length > 0) {
-          options['params'] += ";";
+          options['params'] += "&";
         }
         options['params'] += ("eid=" + span.up('div.active-scaffold').readAttribute('data-eid'));
       }

data/frontends/default/views/on_update.js.rjs

@@ -15,7 +15,7 @@ if controller.send :successful?
       end
     end
     #page.call 'ActiveScaffold.replace', active_scaffold_calculations_id, render(:partial => 'list_calculations') if active_scaffold_config.list.columns.any? {|c| c.calculation?}
-  elsif (active_scaffold_config.update.refresh_list)
+  elsif update_refresh_list?
     page.call 'ActiveScaffold.replace_html', active_scaffold_content_id, render(:partial => 'list', :layout => false)
   else
     updated_row = render :partial => 'list_record', :locals => {:record => @record}

data/lib/active_scaffold/actions/update.rb

@@ -5,6 +5,7 @@ module ActiveScaffold::Actions
       base.verify :method => [:post, :put],
                   :only => :update,
                   :redirect_to => { :action => :index }
+      base.helper_method :update_refresh_list?
     end
 
     def edit
@@ -49,7 +50,7 @@ module ActiveScaffold::Actions
       end
     end
     def update_respond_to_js
-      if successful? && active_scaffold_config.update.refresh_list && !render_parent?
+      if successful? && update_refresh_list? && !render_parent?
         do_search if respond_to? :do_search
         do_list
       end
@@ -125,6 +126,11 @@ module ActiveScaffold::Actions
     # override this method if you want to do something after the save
     def after_update_save(record); end
 
+    # should we refresh whole list after update operation
+    def update_refresh_list?
+      active_scaffold_config.update.refresh_list
+    end
+
     # The default security delegates to ActiveRecordPermissions.
     # You may override the method to customize.
     def update_authorized?(record = nil)

data/lib/active_scaffold/finder.rb

@@ -298,8 +298,10 @@ module ActiveScaffold
       options.reject{|k, v| v.blank?}.inject(query) do |query, (k, v)|
         # default ordering of model has a higher priority than current queries ordering
         # fix this by removing existing ordering from arel
-        # will not work if order part is first one which is iterated
-        query = query.except(:order) if k.to_sym == :order && query.is_a?(ActiveRecord::Relation)
+        if k.to_sym == :order
+          query = query.where('1=1') unless query.is_a?(ActiveRecord::Relation)
+          query = query.except(:order)
+        end
         query.send((k.to_sym), v) 
       end
     end

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -134,12 +134,12 @@ module ActiveScaffold
       def render_action_link(link, url_options, record = nil, html_options = {})
         url_options = action_link_url_options(link, url_options, record)
         html_options = action_link_html_options(link, url_options, record, html_options)
-        action_link_html(link, url_options, html_options)
+        action_link_html(link, url_options, html_options, record)
       end
 
       def render_group_action_link(link, url_options, options, record = nil)
         if link.type == :member && !options[:authorized]
-          action_link_html(link, nil, {:class => "disabled #{link.action}#{link.html_options[:class].blank? ? '' : (' ' + link.html_options[:class])}"})
+          action_link_html(link, nil, {:class => "disabled #{link.action}#{link.html_options[:class].blank? ? '' : (' ' + link.html_options[:class])}"}, record)
         else
           render_action_link(link, url_options, record)
         end
@@ -198,7 +198,7 @@ module ActiveScaffold
         action_link_id(action_id, id)
       end
       
-      def action_link_html(link, url, html_options)
+      def action_link_html(link, url, html_options, record)
         # issue 260, use url_options[:link] if it exists. This prevents DB data from being localized.
         label = url.delete(:link) if url.is_a?(Hash) 
         label ||= link.label

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 0
-    PATCH = 17
+    PATCH = 18
 
     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: 37
+  hash: 35
   prerelease: false
   segments: 
   - 3
   - 0
-  - 17
-  version: 3.0.17
+  - 18
+  version: 3.0.18
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-14 00:00:00 +01:00
+date: 2011-03-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency