active_scaffold_vho 3.2.8 → 3.2.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODYyNmNhOThiNDY0MmRhYWIzNmM2ZjBlYzM1MzdhOTI0ZTc2M2U2Nw==
+    NmNjMTRjZWFkYWM5ZWJjZDU1NGJkZGI0MWM0ZDZjNDQ3OTZmMzQ5Mw==
   data.tar.gz: !binary |-
-    NGQ1YzFjNGNkZDg5MDQ3ZWIyZDc4YjI0YzNmMDQ0YjZkZmIzYTcxOA==
+    ZDE2MGFlYmRmNWQ3ZmE1N2EwYjMwNTU2ZTc1YTlmMDVjY2E3MDIzNQ==
 SHA512:
   metadata.gz: !binary |-
-    ZmM3Zjk1YWJiMTIwZGQ0ZjNmNmM0YjBlZWE0NzZhZWQ3OWU3NWRiODVjYTUw
-    OWI2ZThkNzcwOWY3ZGQ2ZGRjNmRiYTViYWIyNTlhNGYwZWY4NjZkNzUzMGYw
-    MjU4NmRkMmQ3MmFmYTFhNTUwYzkxY2FhNzNjMWZiNTU5MWY0Njc=
+    MDI2ODUyN2U4NTY0ZTFkYWYxZGMyZDcyMzIwNWE2N2E0ZGUyZmI5ZjdmZTJi
+    ODFmY2JmOTFjMmM2YmMzODU0ZDZmYzcwNzBlOTM5OGJiMTk5NjM0OTk5ZmYz
+    MzQ3NzNlZGZiMWM5MDBlMDMzYTQyODdmMGNjY2VmNmMxN2JmYTg=
   data.tar.gz: !binary |-
-    NmJiNTZhM2VlYmJhN2QzZWIxMTc1OTRmMDhjZmE4ZTdjYzRlNTBmMjliYmQ3
-    ZmE1OTJhYmQxMTdmMjcxNWNjYmQ5NTE5MjUwMWRmNTQ0ZWNkZjZiZjcxMmYy
-    MTg0Y2Q5NDQ0YzNiNGE3ZTU4YmEyMmM0NWZmNTYwMWVhOGVjOTc=
+    OTJiMTcwMTRlYzNlMDk2OWFhODFhM2RhNDhiOTY5MjMxYWJmMTEwZGY2M2Nl
+    NjM2YjNmZDNkYzhmMzJkZDNjMjg2N2JmYmQ2YTUxM2U4Mzc2ODY4NTIwYWEz
+    NGNhYjYzOTIwOTRlZjMyNzk5NzdhZjIxZGVhNGJkNDYyOTc1YTQ=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_scaffold_vho (3.2.7)
+    active_scaffold_vho (3.2.8)
       kaminari
       rails (>= 3.1.0)
 

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

@@ -201,44 +201,22 @@ $(document).ready(function() {
     return false;
   });
 
-  $(document).on('change', 'input.update_form, textarea.update_form, select.update_form', function(event) {
-      var element = $(this);
-      var as_form = element.closest('form.as_form');
-      var params = null;
-
-      if (element.attr('data-update_send_form')) {
-        params = as_form.serialize();
-        params += '&' + $.param({source_id: element.attr('id')});
-      } else {
-        if (element.is("input:checkbox")) {
-          params = {value: element.is(":checked")};
-        } else {
-          params = {value: element.val()};
-        }
-        params.source_id = element.attr('id');
-      }
+  $(document).on('change', 'input.update_form:not(.recordselect), input.update_form, textarea.update_form, select.update_form', function(event) {
+    var form_element = $(this);
+    var value, additional_params;
 
-      $.ajax({
-        url: element.attr('data-update_url'),
-        data: params,
-        beforeSend: function(xhr, settings) {
-          element.nextAll('img.loading-indicator').css('visibility','visible');
-          ActiveScaffold.disable_form(as_form);
-          if (settings.dataType === undefined || settings.dataType === 'text') {
-            xhr.setRequestHeader('accept', '*/*;q=0.5, ' + settings.accepts.script);
-          }
-        },
-        complete: function(xhr, status) {
-          element.nextAll('img.loading-indicator').css('visibility','hidden');
-          ActiveScaffold.enable_form(as_form)
-        },
-        error: function (xhr, status, error) {
-          var as_div = element.closest("div.active-scaffold");
-          if (as_div) {
-            ActiveScaffold.report_500_response(as_div)
-          }
-        }
-      });
+    if (form_element.is("input:checkbox")) {
+       value = form_element.is(":checked");
+    } else {
+       value = form_element.val();
+    }
+    ActiveScaffold.update_column(form_element, form_element.data('update_url'), form_element.data('update_send_form'), form_element.attr('id'), value, additional_params);
+    return true;
+  });
+
+  jQuery(document).on('recordselect:change', 'input.recordselect.update_form', function(event, id, label) {
+    var element = jQuery(this);
+    ActiveScaffold.update_column(element, element.data('update_url'), element.data('update_send_form'), element.attr('id'), id);
     return true;
   });
   
@@ -548,6 +526,46 @@ var ActiveScaffold = {
     if (even_row === true) replaced.addClass('even-record');
     ActiveScaffold.highlight(replaced);
   },
+
+  update_column: function(element, url, send_form, source_id, val, additional_params) {
+    if (!element) element = jQuery('#' + source_id);
+    var as_form = element.closest('form.as_form');
+    var params = null;
+
+    if (element.attr('data-update_send_form')) {
+      params = as_form.serialize();
+      params += '&' + $.param({source_id: source_id});
+    } else {
+      if (element.is("input:checkbox")) {
+        params = {value: element.is(":checked")};
+      } else {
+        params = {value: val};
+      }
+      params.source_id = source_id;
+    }
+
+    $.ajax({
+      url: url,
+      data: params,
+      beforeSend: function(xhr, settings) {
+        element.nextAll('img.loading-indicator').css('visibility','visible');
+        ActiveScaffold.disable_form(as_form);
+        if (settings.dataType === undefined || settings.dataType === 'text') {
+          xhr.setRequestHeader('accept', '*/*;q=0.5, ' + settings.accepts.script);
+        }
+      },
+      complete: function(xhr, status) {
+        element.nextAll('img.loading-indicator').css('visibility','hidden');
+        ActiveScaffold.enable_form(as_form)
+      },
+      error: function (xhr, status, error) {
+        var as_div = element.closest("div.active-scaffold");
+        if (as_div) {
+          ActiveScaffold.report_500_response(as_div)
+        }
+      }
+    });
+  },
   
   replace: function(element, html, disable_event_trigger) {
     if (typeof(element) == 'string') element = '#' + element; 
@@ -767,10 +785,15 @@ var ActiveScaffold = {
     if (typeof(source) == 'string') source = '#' + source;
     var source = $(source);
     var element = source.closest('.association-record');
+
+    var element = source.closest('.sub-form-record'), selector = '';
     if (element.length == 0) {
-      element = source.closest('ol.form');
+      element = source.closest('form > ol.form');
+      selector = 'li';
     }
-    element = element.find('.' + options.field_class);
+    // find without entering new subforms
+    selector = options.is_subform ? '' : selector + ':not(.sub-form) ';
+    element = element.find(selector + '.' + options.field_class).first();
 
     if (element) {
       if (options.is_subform == false) {

data/lib/active_scaffold/attribute_params.rb

@@ -125,7 +125,7 @@ module ActiveScaffold
     def column_value_from_param_simple_value(parent_record, column, value)
       if column.singular_association?
         # it's a single id
-        column.association.klass.find(value) if value and not value.empty?
+        column.association.klass.where(:id=> value).first if value and not value.empty?
       elsif column.plural_association?
         column_plural_assocation_value_from_value(column, value)
       elsif column.column && column.column.number? && [:i18n_number, :currency].include?(column.options[:format])

data/lib/active_scaffold/data_structures/action_columns.rb

@@ -19,13 +19,18 @@ module ActiveScaffold::DataStructures
     attr_accessor :collapsed
     
     # nests a subgroup in the column set
-    def add_subgroup(label, &proc)
+    def add_subgroup(label, insert_index = nil, &proc)
       columns = ActiveScaffold::DataStructures::ActionColumns.new
       columns.label = label
       columns.action = self.action
       columns.configure &proc
       self.exclude columns.collect_columns
-      self.add columns
+      if insert_index.nil?
+        self.add columns
+      else
+        self.add columns, insert_index
+      end
+
     end
 
     def include?(item)

data/lib/active_scaffold/data_structures/column.rb

@@ -306,7 +306,11 @@ module ActiveScaffold::DataStructures
       
       # default all the configurable variables
       self.css_class = ''
-      self.required = active_record_class.validators_on(self.name).map(&:class).include? ActiveModel::Validations::PresenceValidator
+      self.required = active_record_class.validators_on(self.name).any? do |val|
+        !val.options[:if] && !val.options[:unless] && (ActiveModel::Validations::PresenceValidator === val ||
+            (ActiveModel::Validations::InclusionValidator === val && !val.options[:allow_nil] && !val.options[:allow_blank] && !(@form_ui == :checkbox && [[true, false], [false, true]].include?(val.send(:delimiter))))
+        )
+      end
       self.sort = true
       self.search_sql = true
       

data/lib/active_scaffold/data_structures/set.rb

@@ -16,9 +16,19 @@ module ActiveScaffold::DataStructures
     # the way to add items to the set.
     def add(*args)
       args.flatten! # allow [] as a param
+
+      index = args.pop if args.last().is_a? Numeric
+
       args.each { |arg|
         arg = arg.to_sym if arg.is_a? String
-        @set << arg unless @set.include? arg # avoid duplicates
+        unless @set.include? arg # avoid duplicates
+          if index.nil?
+            @set << arg
+          else
+            @set.insert(index,arg)
+            index += 1
+          end
+        end
       }
     end
     alias_method :<<, :add

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -196,6 +196,13 @@ module ActiveScaffold
         record_select_options = {:controller => remote_controller, :id => options[:id]}
         record_select_options.merge!(active_scaffold_input_text_options)
         record_select_options.merge!(column.options)
+        record_select_options[:size] ||= ActionView::Helpers::InstanceTag::DEFAULT_FIELD_OPTIONS["size"]
+
+        unless options['data-update_url'].nil?
+          record_select_options['data-update_url'] = options['data-update_url']
+          record_select_options['data-update_send_form'] = options['data-update_send_form']
+          record_select_options[:class] = "#{record_select_options[:class]} #{options[:class]}".strip
+        end
 
         if multiple
           record_multi_select_field(options[:name], value || [], record_select_options)

data/lib/active_scaffold/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold_vho
 version: !ruby/object:Gem::Version
-  version: 3.2.8
+  version: 3.2.9
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-13 00:00:00.000000000 Z
+date: 2014-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda