active_scaffold 3.4.26 → 3.4.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e391ff964c183c36df4416f85b6c0d1466a44a9
-  data.tar.gz: a5b83b15499bb227ecb459381ca02b421261b383
+  metadata.gz: 48dc2381977713791be4113ae363aec520dbc8e0
+  data.tar.gz: 98506d01af1b998e7692b1bf5c7ca1a720686a5a
 SHA512:
-  metadata.gz: f85596592ba07b109e8d645c124a409e610b94df3b47495411e0ff2419a80fbcb617668b1c8029ef8e30f74b224c3a94de684bd390d171ea4848f4e698fdec15
-  data.tar.gz: a8645b27cd94fed33c84d8ffd5ef5073f5ea9e99e8cf27430a1bd6ea798e6679b1444f9cc3fd8e5f2f1c51d7a0ef8a11907c723ba31a813a8cbc3d2d1595c4c1
+  metadata.gz: 5f6740e7329844cbd546da3bc5738063bdb35ae794479cd5168d9cca99f0333f38644291a97d67d53104a517d55811f02771b410d2c0dc1991d7c7c2a86280c2
+  data.tar.gz: 0f1ef0aa8d699221e6dec5b71a4ff0669dfde7adbc3cb7c9d0f7428fe027dbc321cbc9a394254fe6f15b15a6ae9f8c06bf2277cdf6cbb60c747cfb2cdce51d7f

data/CHANGELOG

@@ -1,3 +1,7 @@
+= 3.4.27
+- support use_html option in columns for inplace_edit
+- don't add errors added on update_record_from_params to flash[:warning], they are on errors array, keep errors from update_record_from_params when running valid?
+
 = 3.4.26
 - fix padding for dynamic action_group inside action_group
 - fix using gem with symlink in BUNDLE_PATH option of config/bundle file

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

@@ -758,6 +758,7 @@ var ActiveScaffold = {
     if (column_heading.data('ie-rows')) options.textarea_rows = column_heading.data('ie-rows');
     if (column_heading.data('ie-cols')) options.textarea_cols = column_heading.data('ie-cols');
     if (column_heading.data('ie-size')) options.text_size = column_heading.data('ie-size');
+    if (column_heading.data('ie-use-html')) options.use_html = column_heading.data('ie-use-html');
   },
 
   create_inplace_editor: function(span, options) {

data/lib/active_scaffold/actions/create.rb

@@ -102,7 +102,7 @@ module ActiveScaffold::Actions
         create_association_with_parent(@record) if nested?
         before_create_save(@record)
         # 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
+        self.successful = [@record.keeping_errors { @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/update.rb

@@ -109,7 +109,7 @@ module ActiveScaffold::Actions
           @record = update_record_from_params(@record, active_scaffold_config.update.columns, attributes) unless options[:no_record_param_update]
           before_update_save(@record)
           # 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
+          self.successful = [@record.keeping_errors { @record.valid? }, @record.associated_valid?].all? # this syntax avoids a short-circuit
           if successful?
             @record.save! && @record.save_associated!
             after_update_save(@record)

data/lib/active_scaffold/attribute_params.rb

@@ -115,7 +115,6 @@ module ActiveScaffold
         end
       end
 
-      flash[:warning] = parent_record.errors.to_a.join("\n") if parent_record.errors.present?
       parent_record
     end
 

data/lib/active_scaffold/extensions/unsaved_associated.rb

@@ -5,7 +5,7 @@ class ActiveRecord::Base
     path << self
     # using [].all? syntax to avoid a short-circuit
     # 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? }
+    with_unsaved_associated { |a| [a.keeping_errors { a.valid? }, a.associated_valid?(path)].all? }
   end
 
   def save_associated
@@ -20,6 +20,15 @@ class ActiveRecord::Base
     with_unsaved_associated { |a| a.errors.count == 0 && a.no_errors_in_associated? }
   end
 
+  def keeping_errors
+    old_errors = errors.dup if errors.present?
+    yield.tap do
+      (old_errors || []).each do |attr|
+        old_errors[attr].each { |msg| errors.add(attr, msg) unless errors.added?(attr, msg) }
+      end
+    end
+  end
+
   protected
 
   # Provide an override to allow the model to restrict which associations are considered

data/lib/active_scaffold/helpers/human_condition_helpers.rb

@@ -29,7 +29,7 @@ module ActiveScaffold
       alias_method :active_scaffold_human_condition_float, :active_scaffold_human_condition_integer
 
       def active_scaffold_human_condition_string(column, value)
-        opt = ActiveScaffold::Finder::STRING_COMPARATORS.index(value[:opt]) || value[:opt]
+        opt = ActiveScaffold::Finder::STRING_COMPARATORS.key(value[:opt]) || value[:opt]
         to = "- #{value[:to]}" if opt == 'BETWEEN'
         format_human_condition column, opt, "'#{value[:from]}'", to
       end

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -256,6 +256,7 @@ module ActiveScaffold
         data[:ie_rows] = column.options[:rows] || 5 if column.column.try(:type) == :text
         data[:ie_cols] = column.options[:cols] if column.options[:cols]
         data[:ie_size] = column.options[:size] if column.options[:size]
+        data[:ie_use_html] = column.options[:use_html] if column.options[:use_html]
 
         if column.list_ui == :checkbox
           data[:ie_mode] = :inline_checkbox

data/lib/active_scaffold/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.4.26
+  version: 3.4.27
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2015-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brakeman