active_scaffold_vho 3.2.10 → 3.2.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGQ4MzQyOGU2ZjQ3MTJmYWQ3NDVlMjY2ODVmMjNkOGQ1YzY2MDljMg==
+    MDdiYjFiZTVjMjhhMjZhN2FkNDQxMjc4M2Q3ZDU0ZjkwZjE5YzczNQ==
   data.tar.gz: !binary |-
-    NjcwMDEzMmJmYjk0YTE2NThlMWNiZWU1N2JhMzQ3MjY3ODYxNDI2MQ==
+    M2FkZWIxMWZmYWYyOTA1MDJlNGVlNTIyODFhZDE3OGIyZmI4ODJhYw==
 SHA512:
   metadata.gz: !binary |-
-    ZDgwN2VjZGZhMDJiYjY0NDg2Y2IxNzZhMDIzMzBjZTI2M2VmNjQ4M2RiMmQ2
-    MzY4YmM5YjE0MjI0Y2ZjNThlNDU3NjY0NTBjOGNkMTlhNWY1NzhmZTFiNzUx
-    YTJjMmZkNjJkMWVlM2RjOGIzN2EwY2Q0MmQzZThjZTBmNTdjOWI=
+    YTlhMTRkOTZhNjlhYTRjNTM3N2QyZjJlZTViODZhOTAyMDVlOTJhMmNkYjMz
+    MjViNTM3NzFiODdhMjJkNDc3N2EwNmVkZjgwMjFlZTRiODk4NGVhNjc3YWYw
+    NDRjNDg5YjY2ZWNmNDRmYTFmZmY5NjBkN2QyZDA2MmEzYmJhNGY=
   data.tar.gz: !binary |-
-    ZTk5ZmJkNDliZTQ4YmY5ZmQxN2Q0ZGRmOWYyYjMyZmQ0YTk3ZTNhNjYzODlm
-    YmM4ZGI3NTU1M2MxMjYyZTE2ODg2YTQyMmNjNWIzZWRkM2NlMjc4NGU2M2Ew
-    OTY3OThhYzRlMjVjODJlYWUzZWEwNWI4OGU4YWM4YzcwMmQ5NTU=
+    Mzg1MjZlMmVlMjk0MmVlMTM1NjU0YmI1NGU5MGRlYTM4YTdmMGExNGZkN2Fl
+    YzhhNDVkNjM1YTNiNWY0YTkzNmIzMDhjOGQxYzIzYTBhNWFmNDEyYjU4ZDFi
+    MjBlMzQ4NTkwZTgyMmUwNTc1ZDVlMTQyNjk3ZWMyNGQ4NTNiMDk=

data/Gemfile.lock

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

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

@@ -1,9 +1,9 @@
 <% if ActiveScaffold.js_framework == :jquery %>
+<% require_asset "jquery/date_picker_bridge" %>
+<% require_asset "jquery/tiny_mce_bridge" %>
 <% require_asset "jquery/active_scaffold" %>
 <% require_asset "jquery/jquery.editinplace" %>
 <% require_asset "jquery/jquery-ui-timepicker-addon.js" %>
-<% require_asset "jquery/date_picker_bridge" %>
-<% require_asset "jquery/tiny_mce_bridge" %>
 <% else %>
 <% require_asset "prototype/active_scaffold" %>
 <% require_asset "prototype/dhtml_history" %>

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

@@ -1,22 +1,24 @@
-$(document).on('as:form_loaded', 'form.as_form, form.inplace_form', function(event) {
-    var as_form = $(this).closest("form");
-    as_form.find('textarea.as_mceEditor').each(function(index, elem) {
-      tinyMCE.execCommand('mceAddControl', false, $(elem).attr('id'));
+$(document).ready(function() {
+  $(document).on('as:form_loaded', 'form.as_form, form.inplace_form', function(event) {
+      var as_form = $(this).closest("form");
+      as_form.find('textarea.as_mceEditor').each(function(index, elem) {
+        tinyMCE.execCommand('mceAddControl', false, $(elem).attr('id'));
+      });
+      return true;
+    });
+  $(document).on('as:form_submit', 'form.as_form, form.inplace_form', function(event) {
+      var as_form = $(this).closest("form");
+      if (as_form.has('textarea.as_mceEditor').length > 0) {
+        tinyMCE.triggerSave();
+      }
+      return true;
     });
-    return true;
-  });
-$(document).on('as:form_submit', 'form.as_form, form.inplace_form', function(event) {
-    var as_form = $(this).closest("form");
-    if (as_form.has('textarea.as_mceEditor').length > 0) {
-      tinyMCE.triggerSave();
-    }
-    return true;
-  });
 
-$(document).on('as:form_unloaded', 'form.as_form, form.inplace_form', function(event) {
-    var as_form = $(this).closest("form");
-    as_form.find('textarea.as_mceEditor').each(function(index, elem) {
-      tinyMCE.execCommand('mceRemoveControl', false, $(elem).attr('id'));
+  $(document).on('as:form_unloaded', 'form.as_form, form.inplace_form', function(event) {
+      var as_form = $(this).closest("form");
+      as_form.find('textarea.as_mceEditor').each(function(index, elem) {
+        tinyMCE.execCommand('mceRemoveControl', false, $(elem).attr('id'));
+      });
+      return true;
     });
-    return true;
-  });
+});

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

@@ -1,2 +1,2 @@
 <% scope ||= nil %>
-<%= hidden_field :record, column.name, active_scaffold_input_options(column, scope) %>
+<%= active_scaffold_input_hidden(column, active_scaffold_input_options(column, scope)) %>

data/lib/active_scaffold/config/base.rb

@@ -3,6 +3,14 @@ module ActiveScaffold::Config
     include ActiveScaffold::Configurable
     extend ActiveScaffold::Configurable
 
+    def initialize(core_config)
+      @core = core_config
+      @action_group = self.class.action_group.clone if self.class.action_group
+      # start with the ActionLink defined globally
+      @link = self.class.link.clone if self.class.respond_to?(:link) && self.class.link
+    end
+    attr_reader :core
+
     def self.inherited(subclass)
       class << subclass
         # the crud type of the action. possible values are :create, :read, :update, :delete, and nil.

data/lib/active_scaffold/config/delete.rb

@@ -3,11 +3,7 @@ module ActiveScaffold::Config
     self.crud_type = :delete
 
     def initialize(core_config)
-      @core = core_config
-
-      # start with the ActionLink defined globally
-      @link = self.class.link.clone
-      @action_group = self.class.action_group.clone if self.class.action_group
+      super
       self.refresh_list = self.class.refresh_list
     end
 

data/lib/active_scaffold/config/field_search.rb

@@ -3,14 +3,10 @@ module ActiveScaffold::Config
     self.crud_type = :read
 
     def initialize(core_config)
-      @core = core_config
+      super
 
       @text_search = self.class.text_search
       @or_delimiter = self.class.or_delimiter
-
-      # start with the ActionLink defined globally
-      @link = self.class.link.clone
-      @action_group = self.class.action_group.clone if self.class.action_group
     end
 
 

data/lib/active_scaffold/config/form.rb

@@ -1,12 +1,7 @@
 module ActiveScaffold::Config
   class Form < Base
     def initialize(core_config)
-      @core = core_config
-
-      # start with the ActionLink defined globally
-      @link = self.class.link.clone unless self.class.link.nil?
-      @action_group = self.class.action_group.clone if self.class.action_group
-
+      super
       # no global setting here because multipart should only be set for specific forms
       @multipart = false
     end

data/lib/active_scaffold/config/search.rb

@@ -3,14 +3,10 @@ module ActiveScaffold::Config
     self.crud_type = :read
 
     def initialize(core_config)
-      @core = core_config
+      super
 
       @text_search = self.class.text_search
       @live = self.class.live?
-
-      # start with the ActionLink defined globally
-      @link = self.class.link.clone
-      @action_group = self.class.action_group.clone if self.class.action_group
     end
 
 

data/lib/active_scaffold/config/show.rb

@@ -3,10 +3,7 @@ module ActiveScaffold::Config
     self.crud_type = :read
 
     def initialize(core_config)
-      @core = core_config
-      # start with the ActionLink defined globally
-      @link = self.class.link.clone
-      @action_group = self.class.action_group.clone if self.class.action_group
+      super
     end
 
     # global level configuration

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -30,25 +30,13 @@ module ActiveScaffold
                 # if we get here, it's because the column has a form_ui but not one ActiveScaffold knows about.
                 raise "Unknown form_ui `#{column.form_ui}' for column `#{column.name}'"
               end
-            elsif column.virtual?
-              active_scaffold_input_virtual(column, options)
-
             else # regular model attribute column
               # if we (or someone else) have created a custom render option for the column type, use that
-              if override_input?(column.column.type)
+              if !column.virtual? && override_input?(column.column.type)
                 send(override_input(column.column.type), column, options)
               # final ultimate fallback: use rails' generic input method
               else
-                # for textual fields we pass different options
-                text_types = [:text, :string, :integer, :float, :decimal, :date, :time, :datetime]
-                options = active_scaffold_input_text_options(options) if text_types.include?(column.column.type)
-                if column.column.type == :string && options[:maxlength].blank?
-                  options[:maxlength] = column.column.limit
-                  options[:size] ||= ActionView::Helpers::InstanceTag::DEFAULT_FIELD_OPTIONS["size"]
-                end
-                options[:include_blank] = true if column.column.null and [:date, :datetime, :time].include?(column.column.type)
-                options[:value] = format_number_value(@record.send(column.name), column.options) if column.column.number?
-                text_field(:record, column.name, options.merge(column.options))
+                active_scaffold_input_text_field(column, options)
               end
             end
           end
@@ -94,6 +82,34 @@ module ActiveScaffold
       ##
       ## Form input methods
       ##
+      def active_scaffold_input_text_field(column, options)
+        if column.column.nil?
+          options = active_scaffold_input_text_options(options)
+          if column.association
+            associated = @record.send(column.association.name)
+            options[:value] = associated.id
+          end
+        else
+          text_types = [:text, :string, :integer, :float, :decimal, :date, :time, :datetime]
+          options = active_scaffold_input_text_options(options) if text_types.include?(column.column.type)
+          if column.column.type == :string && options[:maxlength].blank?
+            options[:maxlength] = column.column.limit
+            options[:size] ||= ActionView::Helpers::InstanceTag::DEFAULT_FIELD_OPTIONS["size"]
+          end
+          options[:include_blank] = true if column.column.null and [:date, :datetime, :time].include?(column.column.type)
+          options[:value] = format_number_value(@record.send(column.name), column.options) if column.column.number?
+        end
+
+        text_field(:record, column.name, options.merge(column.options))
+      end
+
+      def active_scaffold_input_hidden(column, options)
+        if column.association
+          associated = @record.send(column.association.name)
+          options[:value] = associated.id
+        end
+        hidden_field(:record, column.name, options)
+      end
 
       def active_scaffold_input_singular_association(column, html_options)
         associated = @record.send(column.association.name)
@@ -223,11 +239,6 @@ module ActiveScaffold
       def active_scaffold_input_textarea(column, options)
         text_area(:record, column.name, options.merge(:cols => column.options[:cols], :rows => column.options[:rows], :size => column.options[:size]))
       end
-      
-      def active_scaffold_input_virtual(column, options)
-        options = active_scaffold_input_text_options(options)
-        text_field :record, column.name, options.merge(column.options)
-      end
 
       #
       # Column.type-based inputs

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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold_vho
 version: !ruby/object:Gem::Version
-  version: 3.2.10
+  version: 3.2.11
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda