active_scaffold 3.2.10 → 3.2.11

data/CHANGELOG

@@ -2,7 +2,7 @@
 - fix nested scaffolds with update action disabled
 - initial work for tableless support (index with limited options)
 - fix scrolling on closing nested scaffolds
-- fix calculations which were broken in 3.2.9
+- fix calculations and count includes which were broken in 3.2.9
 
 = 3.2.9
 - remove duplicated conditions with constraints

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

@@ -10,7 +10,7 @@
     <% unless local_assigns[:only_value] %>
     <%=raw active_scaffold_input_for column, scope %>
     <% else %>
-    <%= content_tag :span, get_column_value(@record, column), options.except(:name) %>
+    <%= content_tag :span, get_column_value(@record, column), column_options.except(:name) %>
     <%= hidden_field :record, column.association ? column.association.foreign_key : column.name, active_scaffold_input_options(column, scope) -%>
     <% end %>
     <% if column.update_columns -%>

data/lib/active_scaffold/actions/core.rb

@@ -154,6 +154,7 @@ module ActiveScaffold::Actions
       params.reject {|key, value| [:controller, :action, :id, :page, :sort, :sort_direction].include?(key.to_sym)}.each do |key, value|
         next unless active_scaffold_config.model.columns_hash[key.to_s]
         next if active_scaffold_constraints[key.to_sym]
+        next if nested? and nested.constrained_fields.include? key.to_sym
         conditions[key] = value
       end
       conditions

data/lib/active_scaffold/actions/create.rb

@@ -84,14 +84,16 @@ module ActiveScaffold::Actions
 
     # A somewhat complex method to actually create a new record. The complexity is from support for subforms and associated records.
     # If you want to customize this behavior, consider using the +before_create_save+ and +after_create_save+ callbacks.
-    def do_create(hash = nil)
-      hash ||= params[:record]
+    def do_create(options = {})
+      attributes = options[:attributes] || params[:record]
       begin
         active_scaffold_config.model.transaction do
-          @record = update_record_from_params(new_model, active_scaffold_config.create.columns, hash)
+          @record = update_record_from_params(new_model, active_scaffold_config.create.columns, attributes)
           apply_constraints_to_record(@record, :allow_autosave => true)
           create_association_with_parent(@record) if nested?
-          create_save
+          before_create_save(@record)
+          self.successful = [@record.valid?, @record.associated_valid?].all? {|v| v == true} # this syntax avoids a short-circuit
+          create_save(@record) unless options[:skip_save]
         end
       rescue ActiveRecord::ActiveRecordError => ex
         flash[:error] = ex.message
@@ -99,12 +101,10 @@ module ActiveScaffold::Actions
       end
     end
 
-    def create_save
-      before_create_save(@record)
-      self.successful = [@record.valid?, @record.associated_valid?].all? {|v| v == true} # this syntax avoids a short-circuit
+    def create_save(record)
       if successful?
-        @record.save! and @record.save_associated!
-        after_create_save(@record)
+        record.save! and record.save_associated!
+        after_create_save(record)
       end
     end
 

data/lib/active_scaffold/actions/update.rb

@@ -76,9 +76,10 @@ module ActiveScaffold::Actions
     end
 
     def update_save(options = {})
+      attributes = options[:attributes] || params[:record]
       begin
         active_scaffold_config.model.transaction do
-          @record = update_record_from_params(@record, active_scaffold_config.update.columns, params[:record]) unless options[:no_record_param_update]
+          @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? {|v| v == true} # this syntax avoids a short-circuit
           if successful?

data/lib/active_scaffold/config/core.rb

@@ -176,9 +176,9 @@ module ActiveScaffold::Config
     end
 
     def self.method_missing(name, *args)
-      klass = "ActiveScaffold::Config::#{name.to_s.titleize}".constantize rescue nil
+      klass = "ActiveScaffold::Config::#{name.to_s.camelcase}".constantize rescue nil
       if @@actions.include? name.to_s.underscore and klass
-        return eval("ActiveScaffold::Config::#{name.to_s.titleize}")
+        return eval("ActiveScaffold::Config::#{name.to_s.camelcase}")
       end
       super
     end

data/lib/active_scaffold/finder.rb

@@ -284,7 +284,7 @@ module ActiveScaffold
     # Returns a hash with options to count records, rejecting select and order options
     # See finder_options for valid options
     def count_options(find_options = {}, count_includes = nil)
-      count_includes ||= find_options[:includes] unless find_options[:where].nil?
+      count_includes ||= find_options[:includes] unless find_options[:conditions].nil?
       options = find_options.reject{|k,v| [:select, :reorder].include? k}
       options[:includes] = count_includes
       options

data/lib/active_scaffold/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 3
   - 2
-  - 10
-  version: 3.2.10
+  - 11
+  version: 3.2.11
 platform: ruby
 authors: 
 - Many, see README
@@ -15,10 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-23 00:00:00 Z
+date: 2012-05-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: shoulda
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -28,11 +29,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  type: :development
   version_requirements: *id001
-  name: shoulda
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: bundler
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -44,11 +45,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  type: :development
   version_requirements: *id002
-  name: bundler
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: rcov
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -58,11 +59,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  type: :development
   version_requirements: *id003
-  name: rcov
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: rails
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -74,9 +75,8 @@ dependencies:
         - 1
         - 3
         version: 3.1.3
+  type: :runtime
   version_requirements: *id004
-  name: rails
-  prerelease: false
 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 (and interesting!) problems.
 email: activescaffold@googlegroups.com
 executables: []