active_scaffold 3.0.12 → 3.0.21

data/lib/active_scaffold/data_structures/action_links.rb

@@ -100,7 +100,7 @@ module ActiveScaffold::DataStructures
         end
       }
     end
-
+    
     def collect_by_type(type = nil)
       links = []
       subgroup(type).each(type) {|link| links << link}
@@ -182,4 +182,4 @@ module ActiveScaffold::DataStructures
       from.instance_variable_get('@set').each { |link| @set << link.clone }
     end
   end
-end
+end

data/lib/active_scaffold/data_structures/column.rb

@@ -19,7 +19,7 @@ module ActiveScaffold::DataStructures
 
     # Whether to enable add_existing for this column
     attr_accessor :allow_add_existing
-
+    
     # Any extra parameters this particular column uses.  This is for create/update purposes.
     def params
       # lazy initialize
@@ -52,9 +52,9 @@ module ActiveScaffold::DataStructures
     def required?
       @required
     end
-
+    
     attr_reader :update_columns
-
+    
     # update dependent columns after value change in form
     #  update_columns = :name
     #  update_columns = [:name, :age]
@@ -62,6 +62,10 @@ module ActiveScaffold::DataStructures
       @update_columns = Array(column_names)
     end
 
+    # send all the form instead of only new value when this column change
+    cattr_accessor :send_form_on_update_column
+    attr_accessor :send_form_on_update_column
+
     # sorting on a column can be configured four ways:
     #   sort = true               default, uses intelligent sorting sql default
     #   sort = false              sometimes sorting doesn't make sense
@@ -153,7 +157,10 @@ module ActiveScaffold::DataStructures
     # a collection of associations to pre-load when finding the records on a page
     attr_reader :includes
     def includes=(value)
-      @includes = value.is_a?(Array) ? value : [value] # automatically convert to an array
+      @includes = case value
+        when Array, Hash then value 
+        else [value] # automatically convert to an array
+      end
     end
 
     # a collection of columns to load when eager loading is disabled, if it's nil all columns will be loaded
@@ -202,7 +209,7 @@ module ActiveScaffold::DataStructures
     cattr_accessor :actions_for_association_links
     @@actions_for_association_links = [:new, :edit, :show]
     attr_accessor :actions_for_association_links
-
+    
     cattr_accessor :association_form_ui
     @@association_form_ui = nil
 
@@ -241,6 +248,11 @@ module ActiveScaffold::DataStructures
     def virtual?
       column.nil? && association.nil?
     end
+    
+    attr_writer :number
+    def number?
+      @number
+    end
 
     # this is so that array.delete and array.include?, etc., will work by column name
     def ==(other) #:nodoc:
@@ -268,18 +280,20 @@ module ActiveScaffold::DataStructures
       @associated_number = self.class.associated_number
       @show_blank_record = self.class.show_blank_record
       @actions_for_association_links = self.class.actions_for_association_links.clone if @association
-      @options = {:format => :i18n_number} if @column.try(:number?)
+      
+      self.number = @column.try(:number?)
+      @options = {:format => :i18n_number} if self.number?
       @form_ui = :checkbox if @column and @column.type == :boolean
       @form_ui = :textarea if @column and @column.type == :text
       @allow_add_existing = true
       @form_ui = self.class.association_form_ui if @association && self.class.association_form_ui
-
+      
       # default all the configurable variables
       self.css_class = ''
       self.required = active_record_class.validators_on(self.name).map(&:class).include? ActiveModel::Validations::PresenceValidator
       self.sort = true
       self.search_sql = true
-
+      
       @weight = estimate_weight
 
       self.includes = (association and not polymorphic_association?) ? [association.name] : []
@@ -312,7 +326,7 @@ module ActiveScaffold::DataStructures
         end
       end
     end
-
+    
     def initialize_search_sql
       self.search_sql = unless self.virtual?
         if association.nil?
@@ -332,13 +346,13 @@ module ActiveScaffold::DataStructures
     def field
       @field ||= [@active_record_class.connection.quote_column_name(@table), field_name].join('.')
     end
-
+    
     def estimate_weight
       if singular_association?
         400
       elsif plural_association?
         500
-      elsif [:created_at, :updated_at].include?(self.name)
+      elsif [:created_at, :updated_at].include?(self.name) 
         600
       elsif [:name, :label, :title].include?(self.name)
         100

data/lib/active_scaffold/data_structures/nested_info.rb

@@ -1,7 +1,7 @@
 module ActiveScaffold::DataStructures
   class NestedInfo
     def self.get(model, session_storage)
-      if session_storage[:nested].nil?
+      if session_storage[:nested].nil? 
         nil
       else
         session_info = session_storage[:nested].clone
@@ -19,29 +19,29 @@ module ActiveScaffold::DataStructures
         end
       end
     end
-
+    
     attr_accessor :association, :child_association, :parent_model, :parent_scaffold, :parent_id, :constrained_fields, :scope
-
+        
     def initialize(model, session_info)
       @parent_model = session_info[:parent_model]
       @parent_id = session_info[:parent_id]
       @parent_scaffold = session_info[:parent_scaffold]
     end
-
+    
     def new_instance?
       result = @new_instance.nil?
       @new_instance = false
       result
     end
-
+    
     def parent_scope
       parent_model.find(parent_id)
     end
-
+    
     def habtm?
-      false
+      false 
     end
-
+    
     def belongs_to?
       false
     end
@@ -49,7 +49,7 @@ module ActiveScaffold::DataStructures
     def has_one?
       false
     end
-
+    
     def readonly?
       false
     end
@@ -58,18 +58,18 @@ module ActiveScaffold::DataStructures
       false
     end
   end
-
+  
   class NestedInfoAssociation < NestedInfo
     def initialize(model, session_info)
       super(model, session_info)
       @association = session_info[:association]
       iterate_model_associations(model)
     end
-
+    
     def habtm?
-      association.macro == :has_and_belongs_to_many
+      association.macro == :has_and_belongs_to_many 
     end
-
+    
     def belongs_to?
       association.belongs_to?
     end
@@ -77,7 +77,7 @@ module ActiveScaffold::DataStructures
     def has_one?
       association.macro == :has_one
     end
-
+    
     def readonly?
       if association.options.has_key? :readonly
         association.options[:readonly]
@@ -93,31 +93,31 @@ module ActiveScaffold::DataStructures
     def default_sorting
       association.options[:order]
     end
-
+    
     protected
-
+    
     def iterate_model_associations(model)
-      @constrained_fields = []
+      @constrained_fields = [] 
       @constrained_fields << association.primary_key_name.to_sym unless association.belongs_to?
       model.reflect_on_all_associations.each do |current|
         if !current.belongs_to? && association.primary_key_name == current.association_foreign_key
           constrained_fields << current.name.to_sym
-          @child_association = current
+          @child_association = current if current.klass == @parent_model
         end
         if association.primary_key_name == current.primary_key_name
           # show columns for has_many and has_one child associationes
-          constrained_fields << current.name.to_sym if current.belongs_to?
+          constrained_fields << current.name.to_sym if current.belongs_to? 
           @child_association = current
         end
       end
     end
   end
-
+  
   class NestedInfoScope < NestedInfo
     def initialize(model, session_info)
       super(model, session_info)
       @scope = session_info[:name]
-      @constrained_fields = []
+      @constrained_fields = [] 
     end
   end
 end

data/lib/active_scaffold/data_structures/set.rb

@@ -53,11 +53,10 @@ module ActiveScaffold::DataStructures
     def length
       @set.length
     end
-
+    
     def empty?
       @set.empty?
     end
 
   end
-
-end
+end

data/lib/active_scaffold/data_structures/sorting.rb

@@ -7,7 +7,7 @@ module ActiveScaffold::DataStructures
       @columns = columns
       @clauses = []
     end
-
+    
     def set_default_sorting(model)
       model_scope = model.send(:current_scoped_methods)
       order_clause = model_scope.arel.order_clauses.join(",") if model_scope
@@ -26,7 +26,7 @@ module ActiveScaffold::DataStructures
       clear
       set_sorting_from_order_clause(order_clause, table_name)
     end
-
+    
     # add a clause to the sorting, assuming the column is sortable
     def add(column_name, direction = nil)
       direction ||= 'ASC'
@@ -121,21 +121,21 @@ module ActiveScaffold::DataStructures
     def mixed_sorting?
       sorts_by_method? and sorts_by_sql?
     end
-
+    
     def default_sorting?
       @default_sorting
     end
 
     def set_sorting_from_order_clause(order_clause, model_table_name = nil)
       clear
-      order_clause.split(',').each do |criterion|
+      order_clause.to_s.split(',').each do |criterion|
         unless criterion.blank?
           order_parts = extract_order_parts(criterion)
           add(order_parts[:column_name], order_parts[:direction]) unless different_table?(model_table_name, order_parts[:table_name])
         end
       end
     end
-
+    
     def extract_order_parts(criterion_parts)
       column_name_part, direction_part = criterion_parts.strip.split(' ')
       column_name_parts = column_name_part.split('.')
@@ -144,11 +144,11 @@ module ActiveScaffold::DataStructures
       order[:table_name] = remove_quotes(column_name_parts[-2]) if column_name_parts.length >= 2
       order
     end
-
+    
     def different_table?(model_table_name, order_table_name)
       !order_table_name.nil? && model_table_name != order_table_name
     end
-
+    
     def remove_quotes(sql_name)
       if sql_name.starts_with?('"') || sql_name.starts_with?('`')
         sql_name[1, (sql_name.length - 2)]
@@ -156,7 +156,7 @@ module ActiveScaffold::DataStructures
         sql_name
       end
     end
-
+    
     def extract_direction(direction_part)
       if direction_part.to_s.upcase == 'DESC'
         'DESC'

data/lib/{extensions → active_scaffold/extensions}/action_controller_rendering.rb

@@ -5,8 +5,9 @@ module ActionController #:nodoc:
       if self.class.uses_active_scaffold? and params[:adapter] and @rendering_adapter.nil?
         @rendering_adapter = true # recursion control
         # if we need an adapter, then we render the actual stuff to a string and insert it into the adapter template
+        opts = args.blank? ? Hash.new : args.first
         render :partial => params[:adapter][1..-1],
-        :locals => {:payload => render_to_string(args.first.merge(:layout => false), &block)},
+        :locals => {:payload => render_to_string(opts.merge(:layout => false), &block)},
                :use_full_path => true, :layout => false
         @rendering_adapter = nil # recursion control
       else
@@ -18,3 +19,4 @@ module ActionController #:nodoc:
     # Rails 2.x implementation is post-initialization on :active_scaffold method
   end
 end
+

data/lib/{extensions → active_scaffold/extensions}/action_view_rendering.rb

@@ -38,15 +38,19 @@ module ActionView::Rendering #:nodoc:
   #
   def render_with_active_scaffold(*args, &block)
     if args.first == :super
+      last_view = @view_stack.last
       options = args[1] || {}
       options[:locals] ||= {}
-      options[:locals].reverse_merge!(@last_view[:locals] || {})
-      if @last_view[:templates].nil?
-        @last_view[:templates] = lookup_context.find_all_templates(@last_view[:view], controller_path, !@last_view[:is_template])
-        @last_view[:templates].shift
+      options[:locals].reverse_merge!(last_view[:locals] || {})
+      if last_view[:templates].nil?
+        last_view[:templates] = lookup_context.find_all_templates(last_view[:view], controller_path, !last_view[:is_template])
+        last_view[:templates].shift
       end
-      options[:template] = @last_view[:templates].shift
-      render_without_active_scaffold options
+      options[:template] = last_view[:templates].shift
+      @view_stack << last_view
+      result = render_without_active_scaffold options
+      @view_stack.pop
+      result
     elsif args.first.is_a?(Hash) and args.first[:active_scaffold]
       require 'digest/md5'
       options = args.first
@@ -58,36 +62,44 @@ module ActionView::Rendering #:nodoc:
       session["as:#{eid}"] = {:constraints => constraints, :conditions => conditions, :list => {:label => args.first[:label]}}
       options[:params] ||= {}
       options[:params].merge! :eid => eid, :embedded => true
-
+      
       id = "as_#{eid}-content"
       url_options = {:controller => remote_controller.to_s, :action => 'index'}.merge(options[:params])
-
-      if respond_to? :render_component
-        render_component url_options
+      
+      if controller.respond_to?(:render_component_into_view)
+        controller.send(:render_component_into_view, url_options)
       else
-        content_tag(:div, {:id => id}) do
+        content_tag(:div, :id => id, :class => 'active-scaffold-component') do
           url = url_for(url_options)
-          link_to(remote_controller.to_s, url, {:remote => true, :id => id}) <<
-            if ActiveScaffold.js_framework == :prototype
+          content_tag(:div, :class => 'active-scaffold-header') do
+            content_tag :h2, link_to(active_scaffold_config_for(remote_controller).list.label, url, :remote => true, :id => id)
+          end <<
+          if ActiveScaffold.js_framework == :prototype
             javascript_tag("new Ajax.Updater('#{id}', '#{url}', {method: 'get', evalScripts: true});")
           elsif ActiveScaffold.js_framework == :jquery
             javascript_tag("$('##{id}').load('#{url}');")
           end
         end
       end
-
+      
     else
       options = args.first
       if options.is_a?(Hash)
-        @last_view = {:view => options[:partial], :is_template => false} if options[:partial]
-        @last_view = {:view => options[:template], :is_template => !!options[:template]} if @last_view.nil? && options[:template]
-        @last_view[:locals] = options[:locals] if !@last_view.nil? && options[:locals]
+        current_view = {:view => options[:partial], :is_template => false} if options[:partial]
+        current_view = {:view => options[:template], :is_template => !!options[:template]} if current_view.nil? && options[:template]
+        current_view[:locals] = options[:locals] if !current_view.nil? && options[:locals]
+        if current_view.present?
+          @view_stack ||= []
+          @view_stack << current_view
+        end
       end
-      render_without_active_scaffold(*args, &block)
+      result = render_without_active_scaffold(*args, &block)
+      @view_stack.pop if current_view.present?
+      result
     end
   end
   alias_method_chain :render, :active_scaffold
-
+  
 
   def partial_pieces(partial_path)
     if partial_path.include?('/')
@@ -96,18 +108,4 @@ module ActionView::Rendering #:nodoc:
       return controller.class.controller_path, partial_path
     end
   end
-
-  # This is the template finder logic, keep it updated with however we find stuff in rails
-  # currently this very similar to the logic in ActionBase::Base.render for options file
-  # TODO: Work with rails core team to find a better way to check for this.
-  def template_exists?(template_name, lookup_overrides = false)
-    begin
-      method = 'find_template'
-      method << '_without_active_scaffold' unless lookup_overrides
-      self.view_paths.send(method, template_name, @template_format)
-      return true
-    rescue ActionView::MissingTemplate => e
-      return false
-    end
-  end
 end