active_scaffold 3.3.2 → 3.3.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 33153bffc906bb3250c092c0e566b40ad97e8069
+  data.tar.gz: f281d1909186146d7d937fc1f8592c66f27bac8c
+SHA512:
+  metadata.gz: 09f9192c00510733988bf1c61ed16d1da71b465cdba3256549a4f96bd2133dbac1ddbcfb23db93978ca7fa863712fe46619c3cb23ed7c55fd17326aa32fbaa40
+  data.tar.gz: 4c558220d20826e976986d4b5cf9c51571179a74e27394c69aee41ae43088f3960386ce403757fed4305d69a4c6cabae81a511802be82175484111292c0c2003

data/CHANGELOG

@@ -1,3 +1,12 @@
+= 3.3.3
+- Allow to override select options in active_scaffold_search_select
+- Load effects from jQuery UI when using jquery-rails 3 gem
+- Fix searching on nested scaffolds (broken on 3.3.2)
+- Fix searching when includes is set to nil
+- Send parent_controller for render_field requests on subforms for persisted records, as new records were already sending it
+- Avoid loading some JS when jquery-ui is not available
+- Load CSS from jquery ui rails gem
+
 = 3.3.2
 - Fix subforms inside subforms
 - Fix draggable for jquery-rails 3 gem

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

@@ -4,18 +4,21 @@
 <% if Jquery::Rails.const_defined? 'JQUERY_UI_VERSION' %>
 <% require_asset "jquery-ui" %>
 <% require_asset "jquery-ui-timepicker-addon" %>
+<% require_asset "jquery/date_picker_bridge" %>
+<% require_asset "jquery/draggable_lists" %>
 <% elsif Jquery.const_defined? 'Ui' %>
 <% require_asset "jquery.ui.core" %>
+<% require_asset "jquery.ui.effect" %>
 <% require_asset "jquery.ui.sortable" %>
 <% require_asset "jquery.ui.draggable" %>
 <% require_asset "jquery.ui.droppable" %>
 <% require_asset "jquery.ui.datepicker" %>
 <% require_asset "jquery-ui-timepicker-addon" %>
+<% require_asset "jquery/date_picker_bridge" %>
+<% require_asset "jquery/draggable_lists" %>
 <% end %>
 <% require_asset "jquery/active_scaffold" %>
 <% require_asset "jquery/jquery.editinplace" %>
-<% require_asset "jquery/date_picker_bridge" %>
-<% require_asset "jquery/draggable_lists" %>
 <% when :prototype %>
 <% require_asset "effects" %>
 <% require_asset "controls" %>

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

@@ -207,11 +207,6 @@ jQuery(document).ready(function($) {
   	ActiveScaffold.delete_subform_record($(this).data('delete-id'));
   });
 
-  jQuery(document).on('click', 'a[data-popup]', function(e) {
-    window.open(jQuery(this).attr('href'));
-    e.preventDefault();
-  });
-
   jQuery(document).on("click", '.hover_click', function(event) {
     var element = jQuery(this);
     var ul_element = element.children('ul').first();
@@ -1080,6 +1075,10 @@ ActiveScaffold.ActionLink.Record = ActiveScaffold.ActionLink.Abstract.extend({
     }
 
     var colspan = this.target.children().length;
+    if (content && this.position) {
+      content = jQuery(content);
+      content.find('.inline-adapter-cell:first').attr('colspan', colspan);
+    }
     if (this.position == 'after') {
       this.target.after(content);
       this.set_adapter(this.target.next());
@@ -1091,7 +1090,6 @@ ActiveScaffold.ActionLink.Record = ActiveScaffold.ActionLink.Abstract.extend({
     else {
       return false;
     }
-    this.adapter.find('.inline-adapter-cell:first').attr('colspan', colspan);
     ActiveScaffold.highlight(this.adapter.find('td'));
   },
 

data/app/assets/javascripts/jquery/date_picker_bridge.js.erb

@@ -1,23 +1,25 @@
 <%# encoding: utf-8 %>
 <%= ActiveScaffold::Bridges[:date_picker].localization %>
-Object.getPrototypeOf($.datepicker)._attachDatepicker_without_inlineSettings = Object.getPrototypeOf($.datepicker)._attachDatepicker;
-$.extend(Object.getPrototypeOf($.datepicker), {
-  _attachDatepicker: function(target, settings) {
-    var inlineSettings = {}, $target = $(target);
-    for (var attrName in this._defaults) {
-      if(this._defaults.hasOwnProperty(attrName)){
-        var attrValue = $target.data(attrName.toLowerCase());
-        if (attrValue) {
-          try {
-            inlineSettings[attrName] = eval(attrValue);
-          } catch (err) {
-            inlineSettings[attrName] = attrValue;
+jQuery(function($) {
+  Object.getPrototypeOf($.datepicker)._attachDatepicker_without_inlineSettings = Object.getPrototypeOf($.datepicker)._attachDatepicker;
+  $.extend(Object.getPrototypeOf($.datepicker), {
+    _attachDatepicker: function(target, settings) {
+      var inlineSettings = {}, $target = $(target);
+      for (var attrName in this._defaults) {
+        if(this._defaults.hasOwnProperty(attrName)){
+          var attrValue = $target.data(attrName.toLowerCase());
+          if (attrValue) {
+            try {
+              inlineSettings[attrName] = eval(attrValue);
+            } catch (err) {
+              inlineSettings[attrName] = attrValue;
+            }
           }
         }
       }
+      this._attachDatepicker_without_inlineSettings(target, $.extend({}, settings || {}, inlineSettings));
     }
-    this._attachDatepicker_without_inlineSettings(target, $.extend({}, settings || {}, inlineSettings));
-  }
+  });
 });
 jQuery(document).on("focus", "input.date_picker", function(){
   var date_picker = jQuery(this);

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

@@ -282,11 +282,6 @@ document.observe("dom:loaded", function() {
     Element[element.value == 'REPLACE' ? 'hide' : 'show'](element.next('span'));
     return true;
   });
-  document.on("click", "a[data-popup]", function(event, element) {
-    if (event.stopped) return;
-    window.open($(element).href);
-    event.stop();
-  });
   document.on("click", ".hover_click", function(event, element) {
     var ul_element = element.down('ul');
     if (ul_element.getStyle('display') === 'none') {

data/app/assets/stylesheets/active_scaffold.css.scss

@@ -9,6 +9,6 @@
 
 @import 'active_scaffold_layout';
 @import 'active_scaffold_images';
-@import 'jquery-ui';
+@import 'active_scaffold_jquery_ui';
 @import 'active_scaffold_extensions';
 @import 'active_scaffold_colors';

data/app/assets/stylesheets/active_scaffold_jquery_ui.css.erb

@@ -0,0 +1,7 @@
+<% if Jquery::Rails.const_defined? 'JQUERY_UI_VERSION' %>
+<% require_asset "jquery-ui" %>
+<% require_asset "jquery-ui-theme" %>
+<% elsif Jquery.const_defined? 'Ui' %>
+<% require_asset "jquery.ui.datepicker" %>
+<% require_asset "jquery-ui-theme" %>
+<% end %>

data/lib/active_scaffold.rb

@@ -228,7 +228,7 @@ module ActiveScaffold
         active_scaffold_config.action_links.collection.delete('new')
         active_scaffold_config.sti_children.each do |child|
           new_sti_link = Marshal.load(Marshal.dump(new_action_link)) # deep clone
-          new_sti_link.label = child.to_s.camelize.constantize.model_name.human
+          new_sti_link.label = as_(:create_model, :model => child.to_s.camelize.constantize.model_name.human)
           new_sti_link.parameters = {:parent_sti => controller_path}
           new_sti_link.controller = Proc.new { active_scaffold_controller_for(child.to_s.camelize.constantize).controller_path }
           active_scaffold_config.action_links.collection.create.add(new_sti_link)

data/lib/active_scaffold/actions/update.rb

@@ -53,11 +53,12 @@ module ActiveScaffold::Actions
           if update_refresh_list?
             do_refresh_list
           else
+            @updated_record = @record
             # get_row so associations are cached like in list action
             @record = get_row rescue nil # if record doesn't fullfil current conditions remove it from list
           end
         end
-        flash.now[:info] = as_(:updated_model, :model => @record.to_label) if active_scaffold_config.update.persistent
+        flash.now[:info] = as_(:updated_model, :model => (@updated_record || @record).to_label) if active_scaffold_config.update.persistent
       end
       render :action => 'on_update'
     end

data/lib/active_scaffold/attribute_params.rb

@@ -129,8 +129,8 @@ module ActiveScaffold
         end
       elsif column.plural_association?
         column_plural_assocation_value_from_value(column, Array(value))
-      elsif column.number? && [:i18n_number, :currency].include?(column.options[:format]) && column.form_ui != :number
-        self.class.i18n_number_to_native_format(value)
+      elsif column.number? && column.options[:format] && column.form_ui != :number
+        column.number_to_native(value)
       else
         # convert empty strings into nil. this works better with 'null => true' columns (and validations),
         # and 'null => false' columns should just convert back to an empty string.

data/lib/active_scaffold/bridges/date_picker.rb

@@ -8,7 +8,7 @@ module ActiveScaffold::Bridges
       ActiveScaffold.js_framework == :jquery && jquery_ui_included?
     end
     def self.jquery_ui_included?
-      Jquery::Rails.const_defined?('JQUERY_UI_VERSION') || Jquery.const_defined?('Ui')
+      Jquery::Rails.const_defined?('JQUERY_UI_VERSION') || Jquery.const_defined?('Ui') if Object.const_defined?('Jquery')
     end
     def self.localization
       "jQuery(function($){

data/lib/active_scaffold/config/core.rb

@@ -173,8 +173,6 @@ module ActiveScaffold::Config
 
     # To be called after your finished configuration
     def _load_action_columns
-      #ActiveScaffold::DataStructures::ActionColumns.class_eval {include ActiveScaffold::DataStructures::ActionColumns::AfterConfiguration}
-
       # then, register the column objects
       self.actions.each do |action_name|
         action = self.send(action_name)

data/lib/active_scaffold/config/nested.rb

@@ -25,7 +25,7 @@ module ActiveScaffold::Config
     # Add a nested ActionLink
     def add_link(attribute, options = {})
       column = @core.columns[attribute.to_sym]
-      unless column.nil? || column.association.nil?
+      if column && column.association
         label = if column.polymorphic_association?
           column.label
         else
@@ -35,8 +35,11 @@ module ActiveScaffold::Config
         action_group = options.delete(:action_group) || self.action_group
         action_link = @core.link_for_association(column, options)
         @core.action_links.add_to_group(action_link, action_group) unless action_link.nil?
-      else
-        # TODO: raise exception
+        action_link
+      elsif column.nil?
+        raise ArgumentError.new("unknown column #{attribute}")
+      elsif column.association.nil?
+        raise ArgumentError.new("column #{attribute} is not an association")
       end
     end
     

data/lib/active_scaffold/constraints.rb

@@ -62,7 +62,7 @@ module ActiveScaffold
           elsif column.association
             if column.association.macro == :has_and_belongs_to_many
               active_scaffold_habtm_joins.concat column.includes
-            else
+            elsif !column.association.options[:polymorphic]
               active_scaffold_includes.concat column.includes
             end
             hash_conditions.merge!(condition_from_association_constraint(column.association, v))
@@ -116,7 +116,7 @@ module ActiveScaffold
       condition = {"#{table}.#{field}" => value}
       if association.options[:polymorphic]
         raise ActiveScaffold::MalformedConstraint, polymorphic_constraint_error(association), caller unless params[:parent_model]
-        condition["#{table}.#{association.name}_type"] = params[:parent_model].constantize.model.to_s
+        condition["#{table}.#{association.name}_type"] = params[:parent_model].constantize.to_s
       end
 
       condition

data/lib/active_scaffold/data_structures/action_columns.rb

@@ -59,88 +59,84 @@ module ActiveScaffold::DataStructures
       Array(@set)
     end
 
-    # A package of stuff to add after the configuration block. This is an attempt at making a certain level of functionality inaccessible during configuration, to reduce possible breakage from misuse.
-    # The bulk of the package is a means of connecting the referential column set (ActionColumns) with the actual column objects (Columns). This lets us iterate over the set and yield real column objects.
-    #module AfterConfiguration
-      # Redefine the each method to yield actual Column objects.
-      # It will skip constrained and unauthorized columns.
-      #
-      # Options:
-      #  * :flatten - whether to recursively iterate on nested sets. default is false.
-      #  * :for - the record (or class) being iterated over. used for column-level security. default is the class.
-      def each(options = {}, &proc)
-        options[:for] ||= @columns.active_record_class unless @columns.nil?
-        self.unauthorized_columns = []
-        @set.each do |item|
-          unless item.is_a?(ActiveScaffold::DataStructures::ActionColumns) || @columns.nil?
-            item = (@columns[item] || ActiveScaffold::DataStructures::Column.new(item.to_sym, @columns.active_record_class))
-            next if self.skip_column?(item, options)
-          end
-          if item.is_a? ActiveScaffold::DataStructures::ActionColumns
-            if options[:flatten]
-              item.each(options, &proc)
-            elsif !options[:skip_groups]
-              yield item
-            end
-          else
+    # Redefine the each method to yield actual Column objects.
+    # It will skip constrained and unauthorized columns.
+    #
+    # Options:
+    #  * :flatten - whether to recursively iterate on nested sets. default is false.
+    #  * :for - the record (or class) being iterated over. used for column-level security. default is the class.
+    def each(options = {}, &proc)
+      options[:for] ||= @columns.active_record_class unless @columns.nil?
+      self.unauthorized_columns = []
+      @set.each do |item|
+        unless item.is_a?(ActiveScaffold::DataStructures::ActionColumns) || @columns.nil?
+          item = (@columns[item] || ActiveScaffold::DataStructures::Column.new(item.to_sym, @columns.active_record_class))
+          next if self.skip_column?(item, options)
+        end
+        if item.is_a? ActiveScaffold::DataStructures::ActionColumns
+          if options[:flatten]
+            item.each(options, &proc)
+          elsif !options[:skip_groups]
             yield item
           end
+        else
+          yield item
         end
       end
-      
-      def collect_visible(options = {}, &proc)
-        columns = []
-        options[:for] ||= @columns.active_record_class
-        self.unauthorized_columns = []
-        @set.each do |item|
-          unless item.is_a? ActiveScaffold::DataStructures::ActionColumns || @columns.nil?
-            item = (@columns[item] || ActiveScaffold::DataStructures::Column.new(item.to_sym, @columns.active_record_class))
-            next if self.skip_column?(item, options)
-          end
-          if item.is_a? ActiveScaffold::DataStructures::ActionColumns and options.has_key?(:flatten) and options[:flatten]
-            columns += item.collect_visible(options, &proc)
-          else
-            columns << (block_given? ? yield(item) : item)
-          end
+    end
+    
+    def collect_visible(options = {}, &proc)
+      columns = []
+      options[:for] ||= @columns.active_record_class
+      self.unauthorized_columns = []
+      @set.each do |item|
+        unless item.is_a? ActiveScaffold::DataStructures::ActionColumns || @columns.nil?
+          item = (@columns[item] || ActiveScaffold::DataStructures::Column.new(item.to_sym, @columns.active_record_class))
+          next if self.skip_column?(item, options)
         end
-        columns
-      end      
-      
-      def skip_column?(column, options)
-        result = false
-        # skip if this matches a constrained column
-        result = true if constraint_columns.include?(column.name.to_sym)
-        # skip this field if it's not authorized
-        unless options[:for].authorized_for?(:action => options[:action], :crud_type => options[:crud_type] || self.action.try(:crud_type), :column => column.name)
-          self.unauthorized_columns << column.name.to_sym
-          result = true
+        if item.is_a? ActiveScaffold::DataStructures::ActionColumns and options.has_key?(:flatten) and options[:flatten]
+          columns += item.collect_visible(options, &proc)
+        else
+          columns << (block_given? ? yield(item) : item)
         end
-        return result
       end
-
-      # registers a set of column objects (recursively, for all nested ActionColumns)
-      def set_columns(columns)
-        @columns = columns
-        # iterate over @set instead of self to avoid dealing with security queries
-        @set.each do |item|
-          item.set_columns(columns) if item.respond_to? :set_columns
-        end
+      columns
+    end      
+    
+    def skip_column?(column, options)
+      result = false
+      # skip if this matches a constrained column
+      result = true if constraint_columns.include?(column.name.to_sym)
+      # skip this field if it's not authorized
+      unless options[:for].authorized_for?(:action => options[:action], :crud_type => options[:crud_type] || self.action.try(:crud_type), :column => column.name)
+        self.unauthorized_columns << column.name.to_sym
+        result = true
       end
+      return result
+    end
 
-      attr_writer :constraint_columns
-      def constraint_columns
-        @constraint_columns ||= []
+    # registers a set of column objects (recursively, for all nested ActionColumns)
+    def set_columns(columns)
+      @columns = columns
+      # iterate over @set instead of self to avoid dealing with security queries
+      @set.each do |item|
+        item.set_columns(columns) if item.respond_to? :set_columns
       end
-      
-      attr_writer :unauthorized_columns
-      def unauthorized_columns
-        @unauthorized_columns ||= []
-      end
-      
-      def length
-        ((@set - self.constraint_columns) - self.unauthorized_columns).length
-      end
-    #end
+    end
+
+    attr_writer :constraint_columns
+    def constraint_columns
+      @constraint_columns ||= []
+    end
+    
+    attr_writer :unauthorized_columns
+    def unauthorized_columns
+      @unauthorized_columns ||= []
+    end
+    
+    def length
+      ((@set - self.constraint_columns) - self.unauthorized_columns).length
+    end
 
     protected
 

data/lib/active_scaffold/data_structures/column.rb

@@ -177,7 +177,7 @@ module ActiveScaffold::DataStructures
     def includes=(value)
       @includes = case value
         when Array then value 
-        else [value] # automatically convert to an array
+        else value ? [value] : value # not convert nil to [nil]
       end
     end
 
@@ -201,14 +201,18 @@ module ActiveScaffold::DataStructures
     #   search = "CONCAT(a, b)" define your own sql for searching. this should be the "left-side" of a WHERE condition. the operator and value will be supplied by ActiveScaffold.
     #   search = [:a, :b]       searches in both fields
     def search_sql=(value)
-      @search_sql = (value == true || value.is_a?(Proc)) ? value : Array(value)
+      @search_sql = if value
+        (value == true || value.is_a?(Proc)) ? value : Array(value)
+      else
+        value
+      end
     end
     def search_sql
       self.initialize_search_sql if @search_sql === true
       @search_sql
     end
     def searchable?
-      search_sql != false && search_sql != nil
+      !!search_sql
     end
 
     # to modify the default order of columns

data/lib/active_scaffold/data_structures/sorting.rb

@@ -35,8 +35,9 @@ module ActiveScaffold::DataStructures
       direction ||= 'ASC'
       direction = direction.to_s.upcase
       column = get_column(column_name)
+      raise ArgumentError, "Could not find column #{column_name}" if column.nil?
       raise ArgumentError, "Sorting direction unknown" unless [:ASC, :DESC].include? direction.to_sym
-      @clauses << [column, direction.untaint] if column and column.sortable?
+      @clauses << [column, direction.untaint] if column.sortable?
       raise ArgumentError, "Can't mix :method- and :sql-based sorting" if mixed_sorting?
     end