active_scaffold 3.0.5 → 3.0.11

data/lib/active_scaffold/bridges/ancestry/lib/ancestry_bridge.rb

@@ -3,13 +3,12 @@ ActiveScaffold::Config::Core.class_eval do
     initialize_without_ancestry(model_id)
 
     return unless self.model.respond_to? :ancestry_column
-
-    col_config = self.columns[self.model.ancestry_column]
-    unless col_config.nil?
-      col_config.form_ui = :ancestry
-      create.columns.exclude :ancestry
-      list.columns.exclude :ancestry
-    end
+    
+    self.columns << :parent_id
+    self.columns[:parent_id].form_ui = :ancestry
+    update.columns.exclude :ancestry
+    create.columns.exclude :ancestry, :parent_id
+    list.columns.exclude :ancestry, :parent_id
   end
 
   alias_method_chain :initialize, :ancestry
@@ -20,6 +19,8 @@ module ActiveScaffold
     module FormColumnHelpers
       def active_scaffold_input_ancestry(column, options)
         select_options = []
+        select_control_options = {:selected => @record.parent_id}
+        select_control_options[:include_blank] = as_(:_select_) if @record.parent_id.nil?
         traverse_ancestry = proc do|key, value|
           unless key == @record
             select_options << ["#{'__' * key.depth}#{key.to_label}", key.id]
@@ -27,7 +28,7 @@ module ActiveScaffold
           end
         end
         @record.class.arrange.each(&traverse_ancestry)
-        select(:record, :ancestry, select_options, { :selected => @record.send(:ancestry) }, options)
+        select(:record, :ancestry, select_options, select_control_options, options)
       end
     end
   end

data/lib/active_scaffold/bridges/bridge.rb

@@ -44,7 +44,7 @@ module ActiveScaffold
   end
 end
 
-require "#{File.dirname(__FILE__)}/shared/date_bridge"
+require File.join(File.dirname(__FILE__), 'shared', 'date_bridge.rb')
 Dir[File.join(File.dirname(__FILE__), "*/bridge.rb")].each{|bridge_require|
   require bridge_require
 }

data/lib/active_scaffold/bridges/calendar_date_select/lib/as_cds_bridge.rb

@@ -49,14 +49,18 @@ module ActiveScaffold
       end
   
       module ViewHelpers
+        def self.included(base)
+          base.alias_method_chain :active_scaffold_stylesheets, :calendar_date_select
+          base.alias_method_chain :active_scaffold_javascripts, :calendar_date_select
+        end
         # Provides stylesheets to include with +stylesheet_link_tag+
-        def active_scaffold_stylesheets(frontend = :default)
-          super + [calendar_date_select_stylesheets]
+        def active_scaffold_stylesheets_with_calendar_date_select(frontend = :default)
+          active_scaffold_stylesheets_without_calendar_date_select + [calendar_date_select_stylesheets]
         end
   
         # Provides stylesheets to include with +stylesheet_link_tag+
-        def active_scaffold_javascripts(frontend = :default)
-          super + [calendar_date_select_javascripts]
+        def active_scaffold_javascripts_with_calendar_date_select(frontend = :default)
+          active_scaffold_javascripts_without_calendar_date_select + [calendar_date_select_javascripts]
         end
       end
     end

data/lib/active_scaffold/bridges/carrierwave/bridge.rb

@@ -2,8 +2,8 @@ ActiveScaffold::Bridges.bridge "CarrierWave" do
   install do
     require File.join(File.dirname(__FILE__), "lib/form_ui")
     require File.join(File.dirname(__FILE__), "lib/list_ui")
-    require File.join(File.dirname(__FILE__), "lib/carrierwave_bridge")
     require File.join(File.dirname(__FILE__), "lib/carrierwave_bridge_helpers")
+    require File.join(File.dirname(__FILE__), "lib/carrierwave_bridge")
     ActiveScaffold::Config::Core.send :include, ActiveScaffold::Bridges::Carrierwave::Lib::CarrierwaveBridge
   end
 end

data/lib/active_scaffold/bridges/paperclip/bridge.rb

@@ -5,8 +5,8 @@ ActiveScaffold::Bridges.bridge "Paperclip" do
     end
     require File.join(File.dirname(__FILE__), "lib/form_ui")
     require File.join(File.dirname(__FILE__), "lib/list_ui")
-    require File.join(File.dirname(__FILE__), "lib/paperclip_bridge")
     require File.join(File.dirname(__FILE__), "lib/paperclip_bridge_helpers")
+    require File.join(File.dirname(__FILE__), "lib/paperclip_bridge")
     ActiveScaffold::Config::Core.send :include, ActiveScaffold::Bridges::Paperclip::Lib::PaperclipBridge
   end
 end

data/lib/active_scaffold/bridges/paperclip/lib/list_ui.rb

@@ -9,7 +9,7 @@ module ActiveScaffold
         else
           paperclip.original_filename
         end
-        link_to(content, paperclip.url, :popup => true)
+        link_to(content, paperclip.url, {'data-popup' => true, :target => '_blank'})
       end
     end
   end

data/lib/active_scaffold/config/base.rb

@@ -17,12 +17,20 @@ module ActiveScaffold::Config
         end
       end
     end
+
     # delegate
     def crud_type; self.class.crud_type end
 
     # the user property gets set to the instantiation of the local UserSettings class during the automatic instantiation of this class.
     attr_accessor :user
 
+    # define a default action_group for this action
+    # e.g. 'members.crud'
+    class_inheritable_accessor :action_group
+
+    # action_group this action should belong to
+    attr_accessor :action_group
+
     class UserSettings
       def initialize(conf, storage, params)
         # the session hash relevant to this action

data/lib/active_scaffold/config/core.rb

@@ -58,6 +58,7 @@ module ActiveScaffold::Config
 
     # lets you specify whether add a create link for each sti child
     cattr_accessor :sti_create_links
+    @@sti_create_links = true
 
     # instance-level configuration
     # ----------------------------
@@ -151,21 +152,7 @@ module ActiveScaffold::Config
         self.columns[column].form_ui ||= :select
         self.columns[column].options ||= {}
         self.columns[column].options[:options] = self.sti_children.collect do |model_name|
-          [model_name.to_s.camelize.constantize.human_name, model_name.to_s.camelize]
-        end
-      end
-    end
-
-    # To be called after include action modules
-    def _add_sti_create_links
-      new_action_link = @action_links['new']
-      unless new_action_link.nil?
-        @action_links.delete('new')
-        self.sti_children.each do |child|
-          new_sti_link = Marshal.load(Marshal.dump(new_action_link)) # deep clone
-          new_sti_link.label = as_(:create_model, :model => child.to_s.camelize.constantize.human_name)
-          new_sti_link.parameters = {model.inheritance_column => child}
-          @action_links.add(new_sti_link)
+          [model_name.to_s.camelize.constantize.model_name.human, model_name.to_s.camelize]
         end
       end
     end

data/lib/active_scaffold/config/create.rb

@@ -5,6 +5,7 @@ module ActiveScaffold::Config
       super
       self.persistent = self.class.persistent
       self.edit_after_create = self.class.edit_after_create
+      self.refresh_list = self.class.refresh_list
     end
 
     # global level configuration
@@ -26,6 +27,10 @@ module ActiveScaffold::Config
     cattr_accessor :edit_after_create
     @@edit_after_create = false
 
+    # whether we should refresh list after create or not
+    cattr_accessor :refresh_list
+    @@refresh_list = false
+
     # instance-level configuration
     # ----------------------------
     # the label= method already exists in the Form base class
@@ -39,5 +44,8 @@ module ActiveScaffold::Config
 
     # whether the form stays open after a create or not
     attr_accessor :edit_after_create
+
+    # whether we should refresh list after create or not
+    attr_accessor :refresh_list
   end
 end

data/lib/active_scaffold/config/delete.rb

@@ -7,6 +7,8 @@ module ActiveScaffold::Config
 
       # start with the ActionLink defined globally
       @link = self.class.link.clone
+      @action_group = self.class.action_group.clone if self.class.action_group
+      self.refresh_list = self.class.refresh_list
     end
 
     # global level configuration
@@ -14,12 +16,19 @@ module ActiveScaffold::Config
 
     # the ActionLink for this action
     cattr_accessor :link
-    @@link = ActiveScaffold::DataStructures::ActionLink.new('delete', :label => :delete, :type => :member, :confirm => :are_you_sure_to_delete, :crud_type => :delete, :position => false, :security_method => :delete_authorized?)
+    @@link = ActiveScaffold::DataStructures::ActionLink.new('destroy', :label => :delete, :type => :member, :confirm => :are_you_sure_to_delete, :method => :delete, :crud_type => :delete, :position => false, :parameters => {:destroy_action => true}, :security_method => :delete_authorized?)
+
+    # whether we should refresh list after destroy or not
+    cattr_accessor :refresh_list
+    @@refresh_list = false
 
     # instance-level configuration
     # ----------------------------
 
     # the ActionLink for this action
     attr_accessor :link
+
+    # whether we should refresh list after destroy or not
+    attr_accessor :refresh_list
   end
 end

data/lib/active_scaffold/config/field_search.rb

@@ -9,6 +9,7 @@ module ActiveScaffold::Config
 
       # 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

@@ -4,7 +4,8 @@ module ActiveScaffold::Config
       @core = core_config
 
       # start with the ActionLink defined globally
-      @link = self.class.link.clone
+      @link = self.class.link.clone unless self.class.link.nil?
+      @action_group = self.class.action_group.clone if self.class.action_group
 
       # no global setting here because multipart should only be set for specific forms
       @multipart = false

data/lib/active_scaffold/config/nested.rb

@@ -5,6 +5,7 @@ module ActiveScaffold::Config
     def initialize(core_config)
       @core = core_config
       self.shallow_delete = self.class.shallow_delete
+      @action_group = self.class.action_group.clone if self.class.action_group
     end
 
     # global level configuration
@@ -22,7 +23,7 @@ module ActiveScaffold::Config
       unless column.nil? || column.association.nil?
         options.reverse_merge! :security_method => :nested_authorized?, :label => column.association.klass.model_name.human({:count => 2, :default => column.association.klass.name.pluralize})
         action_link = @core.link_for_association(column, options)
-        @core.action_links.add(action_link) unless action_link.nil?
+        @core.action_links.add_to_group(action_link, action_group) unless action_link.nil?
       else
 
       end
@@ -30,7 +31,7 @@ module ActiveScaffold::Config
 
     def add_scoped_link(named_scope, options = {})
       action_link = @core.link_for_association_as_scope(named_scope.to_sym, options)
-      @core.action_links.add(action_link) unless action_link.nil?
+      @core.action_links.add_to_group(action_link, action_group) unless action_link.nil?
     end
 
     # the label for this Nested action. used for the header.

data/lib/active_scaffold/config/search.rb

@@ -10,6 +10,7 @@ module ActiveScaffold::Config
 
       # 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

@@ -6,6 +6,7 @@ module ActiveScaffold::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
     end
 
     # global level configuration

data/lib/active_scaffold/config/update.rb

@@ -4,6 +4,7 @@ module ActiveScaffold::Config
     def initialize(*args)
       super
       self.nested_links = self.class.nested_links
+      self.refresh_list = self.class.refresh_list
     end
 
     # global level configuration
@@ -17,6 +18,10 @@ module ActiveScaffold::Config
     end
     @@link = ActiveScaffold::DataStructures::ActionLink.new('edit', :label => :edit, :type => :member, :security_method => :update_authorized?)
 
+    # whether we should refresh list after update or not
+    cattr_accessor :refresh_list
+    @@refresh_list = false
+
     # instance-level configuration
     # ----------------------------
 
@@ -34,5 +39,8 @@ module ActiveScaffold::Config
       @hide_nested_column.nil? ? true : @hide_nested_column
     end
 
+    # whether we should refresh list after update or not
+    attr_accessor :refresh_list
+ 
   end
 end

data/lib/active_scaffold/constraints.rb

@@ -120,10 +120,15 @@ module ActiveScaffold
 
       condition = constraint_condition_for("#{table}.#{field}", value)
       if association.options[:polymorphic]
-        condition = merge_conditions(
-          condition,
-          constraint_condition_for("#{table}.#{association.name}_type", params[:parent_model].to_s)
-        )
+        begin
+          parent_scaffold = "#{session_info[:parent_scaffold].to_s.camelize}Controller".constantize
+          condition = merge_conditions(
+            condition,
+            constraint_condition_for("#{table}.#{association.name}_type", parent_scaffold.active_scaffold_config.model_id.to_s)
+          )
+        rescue ActiveScaffold::ControllerNotFound
+          nil
+        end
       end
 
       condition

data/lib/active_scaffold/data_structures/action_columns.rb

@@ -1,6 +1,6 @@
 module ActiveScaffold::DataStructures
   # A set of columns. These structures can be nested for organization.
-  class ActionColumns < Set
+  class ActionColumns < ActiveScaffold::DataStructures::Set
     include ActiveScaffold::Configurable
 
     # this lets us refer back to the action responsible for this link, if it exists.

data/lib/active_scaffold/data_structures/action_link.rb

@@ -29,7 +29,16 @@ module ActiveScaffold::DataStructures
     attr_accessor :action
 
     # the controller for this action link. if nil, the current controller should be assumed.
-    attr_accessor :controller
+    attr_writer :controller
+
+    def controller
+      @controller = @controller.call if @controller.is_a?(Proc)
+      @controller
+    end
+
+    def static_controller?
+      !(@controller.is_a?(Proc) || (@controller == :polymorph))
+    end
 
     # a hash of request parameters
     attr_accessor :parameters

data/lib/active_scaffold/data_structures/action_links.rb

@@ -4,6 +4,7 @@ module ActiveScaffold::DataStructures
 
     def initialize
       @set = []
+      @name = :root
     end
 
     # adds an ActionLink, creating one from the arguments if need be
@@ -16,7 +17,10 @@ module ActiveScaffold::DataStructures
       # NOTE: this duplicate check should be done by defining the comparison operator for an Action data structure
       existing = find_duplicate(link)
       unless existing
-        subgroup(link.type, link.type).add_to_set(link)
+        # That s for backwards compatibility if we are in root of action_links
+        # we have to move actionlink into members or collection subgroup
+        group = (name == :root ? subgroup(link.type, link.type) : self)
+        group.add_to_set(link)
         link
       else
         existing
@@ -28,41 +32,72 @@ module ActiveScaffold::DataStructures
       @set << link
     end
 
+    # adds a link to a specific group
+    # groups are represented as a string separated by a dot
+    # eg member.crud
+    def add_to_group(link, group = nil)
+      add_to = root
+      add_to = group.split('.').inject(root){|group, group_name| group.send(group_name)} if group
+      add_to << link unless link.nil?
+    end
+
     # finds an ActionLink by matching the action
     def [](val)
-      @set.find do |item|
+      links = []
+      @set.each do |item|
         if item.is_a?(ActiveScaffold::DataStructures::ActionLinks)
-          item[val]
+          collected = item[val]
+          links << collected unless collected.nil?
         else
-          item.action == val.to_s
+          links << item if item.action == val.to_s
         end
       end
+      links.first
     end
 
     def find_duplicate(link)
-      @set.find do |item|
+      links = []
+      @set.each do |item|
         if item.is_a?(ActiveScaffold::DataStructures::ActionLinks)
-          item.find_duplicate(link)
+          collected = item.find_duplicate(link)
+          links << collected unless collected.nil?
         else
-          item.action == link.action and item.controller == link.controller and item.parameters == link.parameters
+          links << item if item.action == link.action and item.static_controller? && item.controller == link.controller and item.parameters == link.parameters
         end
       end
+      links.first
     end
 
     def delete(val)
-      @set.delete_if do |item|
-        if item.is_a?(ActiveScaffold::DataStructures::ActionLinks)
-          delete(val)
-        else
-          item.action == val.to_s
+      self.each({:include_set => true}) do |link, set|
+        if link.action == val.to_s
+          set.delete_if {|item| item.is_a?(ActiveScaffold::DataStructures::ActionLink) && item.action == val.to_s}
         end
       end
     end
 
+    def delete_group(name)
+      @set.each do |group|
+        if group.name == name
+          @set.delete_if {|item| item.is_a?(ActiveScaffold::DataStructures::ActionLinks) && item.name == name}
+        else
+          group.delete_group(name)
+        end if group.is_a?(ActiveScaffold::DataStructures::ActionLinks)
+      end
+    end
+
     # iterates over the links, possibly by type
-    def each(type = nil)
+    def each(options = {}, &block)
       @set.each {|item|
-        yield item
+        if item.is_a?(ActiveScaffold::DataStructures::ActionLinks)
+          item.each(options, &block)
+        else
+          if options[:include_set]
+            yield item, @set
+          else
+            yield item
+          end
+        end
       }
     end
 
@@ -74,19 +109,24 @@ module ActiveScaffold::DataStructures
 
     def traverse(controller, options = {}, &block)
       traverse_method = options.delete(:reverse).nil? ? :each : :reverse_each
+      options[:level] ||= -1
+      options[:level] += 1
+      first_action = true
       @set.send(traverse_method) do |link|
         if link.is_a?(ActiveScaffold::DataStructures::ActionLinks)
-          # add top node only if there is anything in the list
-          #yield({:kind => :node, :level => 1, :last => false, :link => link})
-          yield(link, nil, {:node => :start_traversing})
-          link.traverse(controller,options, &block)
-          yield(link, nil, {:node => :finished_traversing})
-          #yield({:kind => :completed_group, :level => 1, :last => false, :link => link})
-        elsif controller.nil? || !skip_action_link(controller, link, options[:record])
+          unless link.empty?
+            yield(link, nil, {:node => :start_traversing, :first_action => first_action, :level => options[:level]})
+            link.traverse(controller,options, &block)
+            yield(link, nil, {:node => :finished_traversing, :first_action => first_action, :level => options[:level]})
+            first_action = false
+          end
+        elsif controller.nil? || !skip_action_link(controller, link, *(Array(options[:for])))
           authorized = options[:for].nil? ? true : options[:for].authorized_for?(:crud_type => link.crud_type, :action => link.action)
-          yield(self, link, {:authorized => authorized})
+          yield(self, link, {:authorized => authorized, :first_action => first_action, :level => options[:level]})
+          first_action = false
         end
       end
+      options[:level] -= 1
     end
 
     def collect

data/lib/active_scaffold/data_structures/column.rb

@@ -114,22 +114,14 @@ module ActiveScaffold::DataStructures
       @options ||= {}
     end
 
-    # associate an action_link with this column
-    attr_reader :link
-
-    # set an action_link to nested list or inline form in this column
-    def autolink?
-      @autolink
-    end
-
-    # this should not only delete any existing link but also prevent column links from being automatically added by later routines
-    def clear_link
-      @link = nil
-      @autolink = false
+    def link
+      @link = @link.call(self) if @link.is_a? Proc
+      @link
     end
 
+     # associate an action_link with this column
     def set_link(action, options = {})
-      if action.is_a? ActiveScaffold::DataStructures::ActionLink
+      if action.is_a?(ActiveScaffold::DataStructures::ActionLink) || (action.is_a? Proc)
         @link = action
       else
         options[:label] ||= self.label
@@ -139,6 +131,17 @@ module ActiveScaffold::DataStructures
       end
     end
 
+    # set an action_link to nested list or inline form in this column
+    def autolink?
+      @autolink
+    end
+
+    # this should not only delete any existing link but also prevent column links from being automatically added by later routines
+    def clear_link
+      @link = nil
+      @autolink = false
+    end
+
     # define a calculation for the column. anything that ActiveRecord::Calculations::ClassMethods#calculate accepts will do.
     attr_accessor :calculate
 
@@ -267,6 +270,7 @@ module ActiveScaffold::DataStructures
       @actions_for_association_links = self.class.actions_for_association_links.clone if @association
       @options = {:format => :i18n_number} if @column.try(: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
 

data/lib/active_scaffold/data_structures/nested_info.rb

@@ -5,20 +5,27 @@ module ActiveScaffold::DataStructures
         nil
       else
         session_info = session_storage[:nested].clone
-        session_info[:association] = session_info[:parent_model].reflect_on_association(session_info[:name])
-        unless session_info[:association].nil?
-          ActiveScaffold::DataStructures::NestedInfoAssociation.new(model, session_info)
-        else
-          ActiveScaffold::DataStructures::NestedInfoScope.new(model, session_info)
+        begin
+          session_info[:parent_scaffold] = "#{session_info[:parent_scaffold].to_s.camelize}Controller".constantize
+          session_info[:parent_model] = session_info[:parent_scaffold].active_scaffold_config.model
+          session_info[:association] = session_info[:parent_model].reflect_on_association(session_info[:name])
+          unless session_info[:association].nil?
+            ActiveScaffold::DataStructures::NestedInfoAssociation.new(model, session_info)
+          else
+            ActiveScaffold::DataStructures::NestedInfoScope.new(model, session_info)
+          end
+        rescue ActiveScaffold::ControllerNotFound
+          nil
         end
       end
     end
 
-    attr_accessor :association, :child_association, :parent_model, :parent_id, :constrained_fields, :scope
+    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?
@@ -39,6 +46,10 @@ module ActiveScaffold::DataStructures
       false
     end
 
+    def has_one?
+      false
+    end
+
     def readonly?
       false
     end
@@ -63,6 +74,10 @@ module ActiveScaffold::DataStructures
       association.belongs_to?
     end
 
+    def has_one?
+      association.macro == :has_one
+    end
+
     def readonly?
       if association.options.has_key? :readonly
         association.options[:readonly]

data/lib/active_scaffold/finder.rb

@@ -125,7 +125,7 @@ module ActiveScaffold
         native = '.'
         delimiter = I18n.t('number.format.delimiter')
         separator = I18n.t('number.format.separator')
-
+        return value if value.blank? || !value.is_a?(String)
         unless delimiter == native && !value.include?(separator) && value !~ /\.\d{3}$/
           value.gsub(/[^0-9\-#{I18n.t('number.format.separator')}]/, '').gsub(I18n.t('number.format.separator'), native)
         else
@@ -292,6 +292,7 @@ module ActiveScaffold
     def append_to_query(query, options)
       options.assert_valid_keys :where, :select, :group, :order, :limit, :offset, :joins, :includes, :lock, :readonly, :from
       options.reject{|k, v| v.blank?}.inject(query) do |query, (k, v)|
+        query = query.except(:order) if k.to_sym == :order
         query.send((k.to_sym), v)
       end
     end

data/lib/active_scaffold/helpers/association_helpers.rb

@@ -3,11 +3,11 @@ module ActiveScaffold
     module AssociationHelpers
       # Provides a way to honor the :conditions on an association while searching the association's klass
       def association_options_find(association, conditions = nil)
-        association.klass.where(controller.send(:merge_conditions, conditions, association.options[:conditions])).all
+        association.klass.where(conditions).where(association.options[:conditions]).all
       end
 
       def association_options_count(association, conditions = nil)
-        association.klass.where(controller.send(:merge_conditions, conditions, association.options[:conditions])).count
+        association.klass.where(conditions).where(association.options[:conditions]).count
       end
 
       # returns options for the given association as a collection of [id, label] pairs intended for the +options_for_select+ helper.