active_scaffold_vho 3.1.8 → 3.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_scaffold_vho (3.1.7)
+    active_scaffold_vho (3.1.8)
       kaminari
       rails (>= 3.1.0)
 
@@ -39,9 +39,9 @@ GEM
     builder (3.0.4)
     erubis (2.7.0)
     hike (1.2.1)
-    i18n (0.6.1)
+    i18n (0.6.4)
     journey (1.0.4)
-    json (1.7.6)
+    json (1.8.0)
     kaminari (0.14.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -49,8 +49,8 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.19)
-    multi_json (1.5.0)
+    mime-types (1.25)
+    multi_json (1.7.8)
     polyglot (0.3.3)
     rack (1.4.4)
     rack-cache (1.2)
@@ -74,7 +74,7 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.0.3)
+    rake (10.1.0)
     rcov (0.9.9)
     rdoc (3.12)
       json (~> 1.4)
@@ -84,12 +84,12 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.17.0)
+    thor (0.18.1)
     tilt (1.3.3)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby

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

@@ -814,21 +814,13 @@ var ActiveScaffold = {
     var mark_checkboxes = $('#' + element.attr('id') + ' > tr.record td.marked-column input[type="checkbox"]');
     mark_checkboxes.each(function (index) {
       var item = $(this);
-     if(options.checked === true) {
-       item.attr('checked', 'checked');
-     } else {
-       item.removeAttr('checked');
-     }
-     item.attr('value', ('' + !options.checked));
+      item.prop('checked', (options.checked === true));
+      item.prop('value', ('' + !options.checked));
     });
     if(options.include_mark_all === true) {
       var mark_all_checkbox = element.prev('thead').find('th.marked-column_heading span input[type="checkbox"]');
-      if(options.checked === true) {
-        mark_all_checkbox.attr('checked', 'checked');
-      } else {
-        mark_all_checkbox.removeAttr('checked');
-      }
-      mark_all_checkbox.attr('value', ('' + !options.checked));
+      mark_all_checkbox.prop('checked', (options.checked === true));
+      mark_all_checkbox.prop('value', ('' + !options.checked));
     }
   },
 

data/frontends/default/views/destroy.js.erb

@@ -7,7 +7,7 @@
       ActiveScaffold.delete_record_row('<%=element_row_id(:controller_id => "as_#{id_from_controller(params[:eid] || params[:parent_sti])}", :action => 'list', :id => params[:id])%>', '<%=url_for(params_for(:action => :index, :id => nil, :page => [active_scaffold_config.list.user.page.to_i - 1, 1].max, :escape => false))%>');
       <%messages_id = active_scaffold_messages_id(:controller_id => "as_#{id_from_controller(params[:eid] || params[:parent_sti])}")%>
     <%elsif render_parent_action == :index%>
-      <%= escape_javascript(controller.send(:render_component_into_view, render_parent_options))%>
+      <%= controller.send(:render_component_into_view, render_parent_options)%>
     <%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.delete.refresh_list)%>

data/frontends/default/views/on_create.js.erb

@@ -7,12 +7,12 @@ action_link.update_flash_messages('<%=escape_javascript(render(:partial => 'mess
   <% if render_parent? && controller.respond_to?(:render_component_into_view) %>
     <% parent_rendered = controller.send(:render_component_into_view, render_parent_options) %>
     <% if nested_singular_association? %>
-      action_link.close('<%= escape_javascript(parent_rendered)%>');
+      action_link.close('<%= escape_javascript(parent_rendered) %>');
     <% else %>
       <% if render_parent_action == :row %>
-        ActiveScaffold.create_record_row(action_link.scaffold(),'<%=  escape_javascript(parent_rendered)%>', <%= {:insert_at => insert_at}.to_json.html_safe %>);
+        ActiveScaffold.create_record_row(action_link.scaffold(),'<%= escape_javascript(parent_rendered) %>', <%= {:insert_at => insert_at}.to_json.html_safe %>);
       <% elsif render_parent_action == :index %>
-        <%= escape_javascript(parent_rendered) %>
+        <%= parent_rendered %>
       <% end %>
       action_link.close();
     <% end %>

data/frontends/default/views/on_mark_all.js.erb

@@ -2,10 +2,10 @@
            :include_mark_all => true}%>
 ActiveScaffold.mark_records('<%=active_scaffold_tbody_id%>',<%=options.to_json.html_safe%>);
 <%if active_scaffold_config.model.marked.length>0 then %>
-  <%if active_scaffold_config.model.marked.length < @page.pager.count then%>
-    ActiveScaffold.replace_html('<%=active_scaffold_messages_id%>','<%="#{active_scaffold_config.model.marked.length.to_s} records marked. Press <a href=\"#{url_for(:action=>"mark_all",:mark_target=>"scope")}\">here</a> to select all #{@page.pager.count} records.".html_safe%>');
+  <%if active_scaffold_config.model.marked.length < @records.count then%>
+    ActiveScaffold.replace_html('<%=active_scaffold_messages_id%>','<%="#{active_scaffold_config.model.marked.length.to_s} records marked. Press <a href=\"#{url_for(:action=>"mark_all",:mark_target=>"scope")}\">here</a> to select all #{@records.count} records.".html_safe%>');
   <%else%>
-    ActiveScaffold.replace_html('<%=active_scaffold_messages_id%>','<%="All #{@page.pager.count} records marked".html_safe%>');
+    ActiveScaffold.replace_html('<%=active_scaffold_messages_id%>','<%="All #{@records.count} records marked".html_safe%>');
   <%end%>
 <%else%>
   ActiveScaffold.replace_html('<%=active_scaffold_messages_id%>','');

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

@@ -6,12 +6,12 @@ action_link.update_flash_messages('<%=escape_javascript(render(:partial => 'mess
   <% if render_parent? && controller.respond_to?(:render_component_into_view) %>
     <% parent_rendered = controller.send(:render_component_into_view, render_parent_options) %>
     <% if nested_singular_association? %>
-      action_link.close('<%= escape_javascript(parent_rendered)%>');
+      action_link.close('<%= escape_javascript(parent_rendered) %>');
     <% else %>
       <% if render_parent_action == :row %>
-        action_link.close('<%= escape_javascript(parent_rendered)%>');
+        action_link.close('<%= escape_javascript(parent_rendered) %>');
       <% elsif render_parent_action == :index %>
-        <%= escape_javascript(parent_rendered) %>
+        <%= parent_rendered %>
       <% end %>
     <% end %>
     <%#page.call 'ActiveScaffold.replace', active_scaffold_calculations_id, render(:partial => 'list_calculations') if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>

data/lib/active_scaffold/bridges/date_picker/lib/datepicker_bridge.rb

@@ -1,3 +1,6 @@
+include Sprockets::Helpers::RailsHelper
+include Sprockets::Helpers::IsolatedHelper
+
 class File #:nodoc:
 
   unless File.respond_to?(:binread)
@@ -95,6 +98,10 @@ module ActiveScaffold
             Rails.logger.warn "ActiveScaffold: Missing date picker localization for your locale: #{locale}"
           end
 
+          unless date_picker_options[:buttonImage].nil?
+            date_picker_options[:buttonImage] = asset_path(date_picker_options[:buttonImage])
+          end
+
           js_format = self.to_datepicker_format(date_options[:formats][:default])
           date_picker_options[:dateFormat] = js_format unless js_format.nil?
           date_picker_options

data/lib/active_scaffold/finder.rb

@@ -269,7 +269,7 @@ module ActiveScaffold
       klass = klass.where("") if klass.is_a?(Array)
       
       # create a general-use options array that's compatible with Rails finders
-      finder_options = { :order => options[:sorting].try(:clause),
+      finder_options = { :reorder => options[:sorting].try(:clause),
                          :where => search_conditions,
                          :joins => joins_for_finder,
                          :includes => add_association_to_includes_for_sorting(options[:sorting], full_includes)}
@@ -302,14 +302,8 @@ module ActiveScaffold
     end
     
     def append_to_query(query, options)
-      options.assert_valid_keys :where, :select, :group, :order, :limit, :offset, :joins, :includes, :lock, :readonly, :from
+      options.assert_valid_keys :where, :select, :group, :reorder, :limit, :offset, :joins, :includes, :lock, :readonly, :from
       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
-        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/form_column_helpers.rb

@@ -257,8 +257,12 @@ module ActiveScaffold
 
       # the naming convention for overriding form fields with partials
       def override_form_field_partial(column)
-        path = active_scaffold_controller_for(column.active_record_class).controller_path
-        File.join(path, "#{clean_column_name(column.name)}_form_column")
+        begin
+          path = active_scaffold_controller_for(column.active_record_class).controller_path
+          File.join(path, "#{clean_column_name(column.name)}_form_column")
+        rescue ActiveScaffold::ControllerNotFound => e
+          nil
+        end
       end
 
       def override_form_field(column)

data/lib/active_scaffold/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold_vho
 version: !ruby/object:Gem::Version
-  version: 3.1.8
+  version: 3.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-25 00:00:00.000000000 Z
+date: 2014-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &19626940 !ruby/object:Gem::Requirement
+  requirement: &22098540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19626940
+  version_requirements: *22098540
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &19626440 !ruby/object:Gem::Requirement
+  requirement: &22114420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *19626440
+  version_requirements: *22114420
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &19625940 !ruby/object:Gem::Requirement
+  requirement: &22113940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19625940
+  version_requirements: *22113940
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &19625380 !ruby/object:Gem::Requirement
+  requirement: &22113460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *19625380
+  version_requirements: *22113460
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &19625000 !ruby/object:Gem::Requirement
+  requirement: &22113080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19625000
+  version_requirements: *22113080
 description: 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