active_scaffold 3.4.37 → 3.4.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4cba196e4425cbbb6fbf33eb6e53865030e87cf
-  data.tar.gz: ebf4fdae5434832d4c412c9d67f58a9d13aca510
+  metadata.gz: f85e22fd8b8ed0d15b333d211f081e24ee2484d6
+  data.tar.gz: 8b490194e7d7adc60a00d0a3c14d718948078c69
 SHA512:
-  metadata.gz: dfc1186e00611b378bd728334cb52c9279df90bd02572abb27b31a3b39957181cd9aaae180397c186fa75850cbc8b44357b8f69797371ffc026ca833991a5776
-  data.tar.gz: 9a1ab9e777c2703f022c36e6d031a16a7af211af985cd37aad4e22286814603782eccb881e61b96c022ff80f870c1e2b82844c6e6569cf973f6cc81a0da17ab2
+  metadata.gz: 4e238be107e91bde560a8eef3e60ce62d5018c3918a03779c3782f12f770e47ee68bafa96253b520629f437630e2e828f5e88266eb545117378024435fef4099
+  data.tar.gz: faf799e2a71c5c80fa71f6c8bd0f2fe84b580e01b793f52ac259520d90b2a5bc4e890383553e560a596f0c2388677c2935fa44febc3e97da9dd69f398fc7de1f

data/CHANGELOG

@@ -1,3 +1,11 @@
+= 3.4.38
+- ensure add_existing and delete_existing are removed when list is not nested
+- add :percentage list_ui, use jquery ui slider, set slider options on column.options[:slider], :value_method (default to column name), :min_method and :max_method to get value, min and max options from record
+- fix default required for column with :checkbox form_ui and inclusion validator on rails 3.2
+- fix search on habtm column on postgresql
+- fix for format_number_value with nil
+- add includes for sorting columns only if columns is not displayed, add to includes for postgresql, to outer_joins for others
+
 = 3.4.37
 - return valid css class for subgroups, e.g. when name with dot is used for translation scopes
 - check permissions for add existing and delete existing, use nested parent record authorized for update nested association column

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

@@ -296,12 +296,14 @@ jQuery(document).ready(function($) {
   ActiveScaffold.live_search(document);
   ActiveScaffold.auto_paginate(document);
   ActiveScaffold.draggable_lists('.draggable-lists', document);
+  ActiveScaffold.sliders(document);
   if (ActiveScaffold.config.warn_changes) ActiveScaffold.setup_warn_changes();
   jQuery(document).on('as:element_updated', function(e) {
     ActiveScaffold.load_embedded(e.target);
     ActiveScaffold.enable_js_form_buttons(e.target);
     ActiveScaffold.live_search(e.target);
     ActiveScaffold.draggable_lists('.draggable-lists', e.target);
+    ActiveScaffold.sliders(e.target);
   });
   jQuery(document).on('as:element_updated', '.active-scaffold', function(e) {
     if (e.target != this) return;
@@ -314,6 +316,7 @@ jQuery(document).ready(function($) {
     ActiveScaffold.live_search(action_link.adapter);
     ActiveScaffold.auto_paginate(action_link.adapter);
     ActiveScaffold.draggable_lists('.draggable-lists', action_link.adapter);
+    ActiveScaffold.sliders(action_link.adapter);
   });
 });
 
@@ -443,6 +446,13 @@ var ActiveScaffold = {
   enable_js_form_buttons: function(element) {
     jQuery('.as-js-button', element).show();
   },
+  sliders: function(element) {
+    $('.as-slider', element).each(function() {
+      var opts = $(this).data('slider');
+      $(this).slider(opts); 
+      if (opts.disabled) $(this).find('.ui-slider-handle').hide();
+    });
+  },
   load_embedded: function(element) {
     jQuery('.active-scaffold-component .load-embedded', element).each(function(index, item) {
       item = jQuery(item);

data/app/assets/stylesheets/active_scaffold-ie.scss

@@ -52,3 +52,7 @@ float: none;
 .active-scaffold li.form-element dt {
 padding: 4px 0;
 }
+
+.as-slider.ui-state-disabled {
+  filter: alpha(Opacity=100);
+}

data/app/assets/stylesheets/active_scaffold_layout.css

@@ -212,6 +212,18 @@ display:inline;
 text-align: right;
 }
 
+.as-slider { display: block; }
+.as-slider .ui-slider-range {
+  border: 0;
+  height: 100%;
+  border-radius: 5px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+.as-slider.ui-state-disabled {
+  opacity: 1;
+}
+
 /* Table :: Actions (Edit, Delete)
    ============================= */
 .active-scaffold tr.record td.actions {

data/lib/active_scaffold/actions/field_search.rb

@@ -47,13 +47,14 @@ module ActiveScaffold::Actions
           filtered_columns = []
           text_search = active_scaffold_config.field_search.text_search
           columns = active_scaffold_config.field_search.columns
+          count_includes = active_scaffold_config.list.user.count_includes
           search_params.each do |key, value|
             next unless columns.include? key
             column = active_scaffold_config.columns[key]
             search_condition = self.class.condition_for_column(column, value, text_search)
             next if search_condition.blank?
 
-            if active_scaffold_config.list.user.count_includes.nil? && column.includes.present? && list_columns.include?(column)
+            if count_includes.nil? && column.includes.present? && list_columns.include?(column)
               active_scaffold_references << column.includes
             elsif column.search_joins.present?
               active_scaffold_outer_joins << column.search_joins

data/lib/active_scaffold/actions/list.rb

@@ -64,7 +64,7 @@ module ActiveScaffold::Actions
     end
 
     # The actual algorithm to prepare for the list view
-    def set_includes_for_columns(action = :list)
+    def set_includes_for_columns(action = :list, sorting = active_scaffold_config.list.user.sorting)
       @cache_associations = true
       columns =
         if respond_to?(:"#{action}_columns", true)
@@ -72,12 +72,33 @@ module ActiveScaffold::Actions
         else
           active_scaffold_config.send(action).columns.collect_visible(:flatten => true)
         end
-      sorting = active_scaffold_config.list.user.sorting
-      columns_for_joins, columns_for_includes = columns.select { |c| c.includes.present? }.partition do |c|
-        sorting.sorts_on?(c) || (c.plural_association? && c.association.macro == :has_and_belongs_to_many && c.association.respond_to?(:scope) && c.association.scope)
+      joins_cols, preload_cols = columns.select { |c| c.includes.present? }.partition do |col|
+        includes_need_join?(col, sorting)
       end
-      active_scaffold_preload.concat columns_for_includes.map(&:includes).flatten.uniq
-      active_scaffold_references.concat columns_for_joins.map(&:includes).flatten.uniq
+      active_scaffold_references.concat joins_cols.map(&:includes).flatten.uniq
+      active_scaffold_preload.concat preload_cols.map(&:includes).flatten.uniq
+      set_includes_for_sorting(columns, sorting) if Rails::VERSION::MAJOR >= 4 && sorting.sorts_by_sql?
+    end
+
+    def set_includes_for_sorting(columns, sorting)
+      sorting.each do |col, _|
+        if col.includes.present? && !columns.include?(col)
+          if active_scaffold_config.model.connection.needs_order_expressions_in_select?
+            active_scaffold_references << col.includes
+          else
+            active_scaffold_outer_joins << col.includes
+          end
+        end
+      end
+    end
+
+    def includes_need_join?(column, sorting = active_scaffold_config.list.user.sorting)
+      sorting.sorts_on?(column) || scoped_habtm?(column)
+    end
+
+    def scoped_habtm?(column)
+      assoc = column.association if column.plural_association?
+      assoc && assoc.macro == :has_and_belongs_to_many && assoc.respond_to?(:scope) && assoc.scope
     end
 
     def get_row(crud_type_or_security_options = :read)

data/lib/active_scaffold/actions/nested.rb

@@ -53,8 +53,7 @@ module ActiveScaffold::Actions
     end
 
     def include_habtm_actions
-      return unless nested?
-      if nested.habtm?
+      if nested? && nested.habtm?
         # Production mode is ok with adding a link everytime the scaffold is nested - we are not ok with that.
         active_scaffold_config.action_links.add('new_existing', :label => :add_existing, :type => :collection, :security_method => :add_existing_authorized?) unless active_scaffold_config.action_links['new_existing']
         if active_scaffold_config.nested.shallow_delete

data/lib/active_scaffold/actions/search.rb

@@ -26,11 +26,11 @@ module ActiveScaffold::Actions
           @filtered = !search_conditions.blank?
           active_scaffold_conditions.concat search_conditions if @filtered
 
-          references, outer_joins = columns.partition { |column| column.includes.present? && list_columns.include?(column) }
-          outer_joins.collect!(&:search_joins)
-          references.collect!(&:includes)
-          active_scaffold_outer_joins.concat outer_joins.flatten.uniq.compact
-          active_scaffold_references.concat references.flatten.uniq.compact
+          references, outer_joins = columns.partition do |column|
+            column.includes.present? && list_columns.include?(column)
+          end
+          active_scaffold_references.concat references.map(&:includes).flatten.uniq.compact
+          active_scaffold_outer_joins.concat outer_joins.map(&:search_joins).flatten.uniq.compact
 
           active_scaffold_config.list.user.page = nil
         else

data/lib/active_scaffold/data_structures/column.rb

@@ -426,7 +426,8 @@ module ActiveScaffold::DataStructures
     end
 
     def inclusion_validator_for_checkbox?(val)
-      @form_ui == :checkbox && [[true, false], [false, true]].include?(val.options[:with] || val.options[:within])
+      @form_ui == :checkbox &&
+        [[true, false], [false, true]].include?(val.options[:with] || val.options[:within] || val.options[:in])
     end
 
     def default_select_columns

data/lib/active_scaffold/engine.rb

@@ -20,9 +20,17 @@ module ActiveScaffold
     initializer 'active_scaffold.active_record' do
       ActiveSupport.on_load :active_record do
         include ActiveScaffold::ActiveRecordPermissions::ModelUserAccess::Model
-        ActiveRecord::Associations::Association.send :include, ActiveScaffold::Tableless::Association
-        ActiveRecord::Associations::CollectionAssociation.send :include, ActiveScaffold::Tableless::CollectionAssociation
-        ActiveRecord::Associations::SingularAssociation.send :include, ActiveScaffold::Tableless::SingularAssociation
+        module ActiveRecord::Associations
+          Association.send :include, ActiveScaffold::Tableless::Association
+          CollectionAssociation.send :include, ActiveScaffold::Tableless::CollectionAssociation
+          SingularAssociation.send :include, ActiveScaffold::Tableless::SingularAssociation
+        end
+        module ActiveRecord::ConnectionAdapters
+          AbstractAdapter.send :include, ActiveScaffold::ConnectionAdapters::AbstractAdapter
+          if defined?(PostgreSQLAdapter)
+            PostgreSQLAdapter.send :include, ActiveScaffold::ConnectionAdapters::PostgreSQLAdapter
+          end
+        end
       end
     end
 

data/lib/active_scaffold/extensions/connection_adapter.rb

@@ -0,0 +1,15 @@
+module ActiveScaffold
+  module ConnectionAdapters
+    module AbstractAdapter
+      def needs_order_expressions_in_select?
+        false
+      end
+    end
+
+    module PostgreSQLAdapter
+      def needs_order_expressions_in_select?
+        true
+      end
+    end
+  end
+end

data/lib/active_scaffold/finder.rb

@@ -352,11 +352,6 @@ module ActiveScaffold
         :select => options[:select]
       }
       if Rails::VERSION::MAJOR >= 4
-        if options[:sorting].try(:sorts_by_sql?)
-          options[:sorting].each do |col, _|
-            finder_options[:outer_joins] << col.includes if col.includes.present?
-          end
-        end
         finder_options.merge!(:references => active_scaffold_references)
       end
 

data/lib/active_scaffold/helpers/id_helpers.rb

@@ -14,8 +14,8 @@ module ActiveScaffold
         nested_parent_record.id
       end
 
-      def nested_id
-        "#{nested.parent_scaffold.controller_path}-#{nested_parent_id}-#{params[:controller]}" if nested?
+      def nested_id(controller = params[:controller])
+        "#{nested.parent_scaffold.controller_path}-#{nested_parent_id}-#{controller}" if nested?
       end
 
       def active_scaffold_id

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -84,6 +84,14 @@ module ActiveScaffold
         options.delete(:disabled) if inplace_edit?(record, column)
         check_box(:record, column.name, options)
       end
+      
+      def active_scaffold_column_percentage(record, column)
+        options = column.options[:slider] || {}
+        options = options.merge(min: record.send(options[:min_method])) if options[:min_method]
+        options = options.merge(max: record.send(options[:max_method])) if options[:max_method]
+        value = record.send(options[:value_method]) if options[:value_method]
+        as_slider options.merge(value: value || record.send(column.name))
+      end
 
       def column_override(column)
         override_helper column, 'column'
@@ -124,17 +132,19 @@ module ActiveScaffold
       end
 
       def format_number_value(value, options = {})
-        value = case options[:format]
-          when :size
-            number_to_human_size(value, options[:i18n_options] || {})
-          when :percentage
-            number_to_percentage(value, options[:i18n_options] || {})
-          when :currency
-            number_to_currency(value, options[:i18n_options] || {})
-          when :i18n_number
-            send("number_with_#{value.is_a?(Integer) ? 'delimiter' : 'precision'}", value, options[:i18n_options] || {})
-          else
-            value
+        if value
+          value = case options[:format]
+            when :size
+              number_to_human_size(value, options[:i18n_options] || {})
+            when :percentage
+              number_to_percentage(value, options[:i18n_options] || {})
+            when :currency
+              number_to_currency(value, options[:i18n_options] || {})
+            when :i18n_number
+              send("number_with_#{value.is_a?(Integer) ? 'delimiter' : 'precision'}", value, options[:i18n_options] || {})
+            else
+              value
+          end
         end
         clean_column_value(value)
       end

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -541,6 +541,10 @@ module ActiveScaffold
       def format_column_calculation(column, calculation)
         "#{"#{as_(column.calculate)}: " unless column.calculate.is_a? Proc}#{format_column_value nil, column, calculation}"
       end
+      
+      def as_slider(options)
+        content_tag(:span, '', class: 'as-slider', data: {slider: options})
+      end
 
       def clean_column_name(name)
         name.to_s.gsub('?', '')

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 4
-    PATCH = 37
+    PATCH = 38
 
     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.37
+  version: 3.4.38
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-12 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -302,6 +302,7 @@ files:
 - lib/active_scaffold/extensions/action_controller_rendering.rb
 - lib/active_scaffold/extensions/action_controller_rescueing.rb
 - lib/active_scaffold/extensions/action_view_rendering.rb
+- lib/active_scaffold/extensions/connection_adapter.rb
 - lib/active_scaffold/extensions/left_outer_joins.rb
 - lib/active_scaffold/extensions/localize.rb
 - lib/active_scaffold/extensions/name_option_for_datetime.rb