active_scaffold 3.2.20 → 3.3.0.rc

data/lib/active_scaffold/bridges/date_picker/helper.rb

@@ -12,7 +12,7 @@ module ActiveScaffold::Bridges
         /%m/ => 'mm',
         /%y/ => 'y',
         /%Y/ => 'yy',
-        /%H/ => 'hh', # options ampm => false
+        /%H/ => 'HH', # options ampm => false
         /%I/ => 'hh', # options ampm => true
         /%M/ => 'mm',
         /%p/ => 'tt',
@@ -101,6 +101,7 @@ module ActiveScaffold::Bridges
           nil
         end
         js_format = rails_format.dup
+        js_format.gsub! /([ ]|^)([^% ]\S*)/, " '\\2'"
         DATE_FORMAT_CONVERSION.each do |key, value|
           js_format.gsub!(key, value)
         end
@@ -110,13 +111,13 @@ module ActiveScaffold::Bridges
       def self.split_datetime_format(datetime_format)
         date_format = datetime_format
         time_format = nil
-        time_start_indicators = %w{hh mm tt ss}
+        time_start_indicators = %w{HH hh mm tt ss}
         unless datetime_format.nil?
           start_indicator = time_start_indicators.detect {|indicator| datetime_format.include?(indicator)}
           unless start_indicator.nil?
             pos_time_format = datetime_format.index(start_indicator)
-            date_format = datetime_format.to(pos_time_format - 1)
-            time_format = datetime_format.from(pos_time_format)
+            date_format = datetime_format.to(pos_time_format - 1).strip
+            time_format = datetime_format.from(pos_time_format).strip
           end
         end
         return date_format, time_format
@@ -158,7 +159,7 @@ module ActiveScaffold::Bridges
           options = active_scaffold_input_text_options(options.merge(column.options))
           options[:class] << " #{column.search_ui.to_s}"
           options[:style] = (options[:show].nil? || options[:show]) ? nil : "display: none"
-          format = options.delete(:format) || column.search_ui == :date_picker ? :default : :picker
+          format = options.delete(:format) || (column.search_ui == :date_picker ? :default : :picker)
           datepicker_format_options(column, format, options)
           text_field_tag("#{options[:name]}[#{name}]", value ? l(value, :format => format) : nil, options.merge(:id => "#{options[:id]}_#{name}", :name => "#{options[:name]}[#{name}]"))
         end
@@ -169,7 +170,7 @@ module ActiveScaffold::Bridges
           options = active_scaffold_input_text_options(options.merge(column.options))
           options[:class] << " #{column.form_ui.to_s}"
           value = controller.class.condition_value_for_datetime(@record.send(column.name), column.form_ui == :date_picker ? :to_date : :to_time)
-          format = options.delete(:format) || column.form_ui == :date_picker ? :default : :picker
+          format = options.delete(:format) || (column.form_ui == :date_picker ? :default : :picker)
           datepicker_format_options(column, format, options)
           options[:value] = (value ? l(value, :format => format) : nil)
           text_field(:record, column.name, options)

data/lib/active_scaffold/bridges/dragonfly/form_ui.rb

@@ -12,7 +12,7 @@ module ActiveScaffold
             js_remove_file_code = "$(this).previous().value='true'; $(this).up().hide().next().show(); return false;";
           end
           
-          content = active_scaffold_column_dragonfly(column, @record)
+          content = active_scaffold_column_dragonfly(@record, column)
           content_tag(:div,
             content + " | " +
               hidden_field(:record, "remove_#{column.name}", :value => "false") +

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

@@ -1,7 +1,7 @@
 module ActiveScaffold
   module Helpers
     module ListColumnHelpers
-      def active_scaffold_column_dragonfly(column, record)
+      def active_scaffold_column_dragonfly(record, column)
         attachment = record.send("#{column.name}")
         return nil unless attachment.present?
         content = if attachment.image?

data/lib/active_scaffold/bridges/file_column.rb

@@ -1,6 +1,6 @@
 class ActiveScaffold::Bridges::FileColumn < ActiveScaffold::DataStructures::Bridge
   def self.install
-    if ActiveScaffold::Config::Core.instance_methods.include?("initialize_with_file_column".send(::ActiveScaffold::METHOD_CONVERSION))
+    if ActiveScaffold::Config::Core.instance_methods.include?("initialize_with_file_column")
       raise RuntimeError, "We've detected that you have active_scaffold_file_column_bridge installed.  This plugin has been moved to core.  Please remove active_scaffold_file_column_bridge to prevent any conflicts"
     end
     require File.join(File.dirname(__FILE__), "file_column/as_file_column_bridge")

data/lib/active_scaffold/bridges/file_column/as_file_column_bridge.rb

@@ -24,7 +24,7 @@ module ActiveScaffold::Config
       }
     end
     
-    alias_method_chain :initialize, :file_column unless self.instance_methods.include?("initialize_without_file_column".send(::ActiveScaffold::METHOD_CONVERSION))
+    alias_method_chain :initialize, :file_column unless self.instance_methods.include?("initialize_without_file_column")
     
     def configure_file_column_field(field)
       # set list_ui first because it gets its default value from form_ui

data/lib/active_scaffold/bridges/file_column/file_column_helpers.rb

@@ -4,12 +4,12 @@ module ActiveScaffold
       module FileColumnHelpers
         class << self
           def file_column_fields(klass)
-            klass.instance_methods.select{|m| m.to_s =~ /_just_uploaded\?$/}.collect{|m| m[0..-16].to_sym }
+            klass.instance_methods.grep(/_just_uploaded\?$/).collect{|m| m[0..-16].to_sym }
           end
           
           def generate_delete_helpers(klass)
             file_column_fields(klass).each { |field|
-              klass.send :class_eval, <<-EOF, __FILE__, __LINE__ + 1  unless klass.methods.include?("#{field}_with_delete=".send(::ActiveScaffold::METHOD_CONVERSION))
+              klass.send :class_eval, <<-EOF, __FILE__, __LINE__ + 1  unless klass.methods.include?("#{field}_with_delete=")
                 attr_reader :delete_#{field}
                 
                 def delete_#{field}=(value)

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

@@ -2,18 +2,18 @@ module ActiveScaffold
   module Helpers
     # Helpers that assist with the rendering of a List Column
     module ListColumnHelpers
-      def active_scaffold_column_download_link_with_filename(column, record)
+      def active_scaffold_column_download_link_with_filename(record, column)
         return nil if record.send(column.name).nil?
-        active_scaffold_column_download_link(column, record, File.basename(record.send(column.name)))
+        active_scaffold_column_download_link(record, column, File.basename(record.send(column.name)))
       end
       
-      def active_scaffold_column_download_link(column, record, label = nil)
+      def active_scaffold_column_download_link(record, column, label = nil)
         return nil if record.send(column.name).nil?
         label||=as_(:download)
         link_to( label, url_for_file_column(record, column.name.to_s), :popup => true)
       end
       
-      def active_scaffold_column_thumbnail(column, record)
+      def active_scaffold_column_thumbnail(record, column)
         return nil if record.send(column.name).nil?
         link_to( 
           image_tag(url_for_file_column(record, column.name.to_s, "thumb"), :border => 0), 

data/lib/active_scaffold/bridges/paperclip.rb

@@ -1,6 +1,6 @@
 class ActiveScaffold::Bridges::Paperclip < ActiveScaffold::DataStructures::Bridge
   def self.install
-    if ActiveScaffold::Config::Core.instance_methods.include?("initialize_with_paperclip".send(::ActiveScaffold::METHOD_CONVERSION))
+    if ActiveScaffold::Config::Core.instance_methods.include?("initialize_with_paperclip")
       raise RuntimeError, "We've detected that you have active_scaffold_paperclip_bridge installed. This plugin has been moved to core. Please remove active_scaffold_paperclip_bridge to prevent any conflicts"
     end
     require File.join(File.dirname(__FILE__), "paperclip/form_ui")

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

@@ -12,7 +12,7 @@ module ActiveScaffold
             js_remove_file_code = "$(this).previous().value='true'; $(this).up().hide().next().show(); return false;";
           end
           
-          content = active_scaffold_column_paperclip(column, @record)
+          content = active_scaffold_column_paperclip(@record, column)
           content_tag(:div,
             content + " | " +
               hidden_field(:record, "delete_#{column.name}", :value => "false") +

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

@@ -1,7 +1,7 @@
 module ActiveScaffold
   module Helpers
     module ListColumnHelpers
-      def active_scaffold_column_paperclip(column, record)
+      def active_scaffold_column_paperclip(record, column)
         paperclip = record.send("#{column.name}")
         return nil unless paperclip.file?
         content = if paperclip.styles.include?(ActiveScaffold::Bridges::Paperclip::PaperclipBridgeHelpers.thumbnail_style)

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

@@ -6,7 +6,7 @@ module ActiveScaffold
         self.thumbnail_style = :thumbnail
 
         def self.generate_delete_helper(klass, field)
-          klass.class_eval <<-EOF, __FILE__, __LINE__ + 1 unless klass.instance_methods.include?("delete_#{field}=".send(::ActiveScaffold::METHOD_CONVERSION))
+          klass.class_eval <<-EOF, __FILE__, __LINE__ + 1 unless klass.instance_methods.include?("delete_#{field}=")
             attr_reader :delete_#{field}
 
             def delete_#{field}=(value)

data/lib/active_scaffold/bridges/shared/date_bridge.rb

@@ -114,7 +114,7 @@ module ActiveScaffold
                 unless operator.nil?
                   ["%{search_sql} #{value[:opt]} ?", from_value.to_s(:db)] unless from_value.nil?
                 else
-                  ["%{search_sql} BETWEEN ? AND ?", from_value.to_s(:db), to_value.to_s(:db)] unless from_value.nil? || to_value.nil?
+                  ["%{search_sql} BETWEEN ? AND ?", from_value.to_s(:db), to_value.to_s(:db)] unless from_value.nil? && to_value.nil?  
                 end
               end
             end

data/lib/active_scaffold/bridges/tiny_mce/helpers.rb

@@ -16,7 +16,7 @@ class ActiveScaffold::Bridges::TinyMce
         options[:class] = "#{options[:class]} mceEditor #{column.options[:class]}".strip
 				
 				settings = { :theme => 'simple' }.merge(column.options[:tinymce] || {})
-        settings = settings.to_json
+				settings = settings.to_s.gsub(/:(.+?)\=\>/, '\1:')
 				settings = "tinyMCE.settings = #{settings};"
 
         html = []

data/lib/active_scaffold/config/core.rb

@@ -25,6 +25,10 @@ module ActiveScaffold::Config
     cattr_accessor :theme
     @@theme = :default
 
+    # enable caching of action link urls
+    cattr_accessor :cache_action_link_urls
+    @@cache_action_link_urls = true
+
     # lets you disable the DHTML history
     def self.dhtml_history=(val)
       @@dhtml_history = val
@@ -91,6 +95,9 @@ module ActiveScaffold::Config
     # lets you override the global ActiveScaffold theme for a specific controller
     attr_accessor :theme
 
+    # enable caching of action link urls
+    attr_accessor :cache_action_link_urls
+
     # lets you specify whether add a create link for each sti child for a specific controller
     attr_accessor :sti_create_links
     def add_sti_create_links?
@@ -139,6 +146,7 @@ module ActiveScaffold::Config
       # inherit the global frontend
       @frontend = self.class.frontend
       @theme = self.class.theme
+      @cache_action_link_urls = self.class.cache_action_link_urls
       @sti_create_links = self.class.sti_create_links
 
       # inherit from the global set of action links
@@ -154,8 +162,7 @@ module ActiveScaffold::Config
       # then, register the column objects
       self.actions.each do |action_name|
         action = self.send(action_name)
-        next unless action.respond_to? :columns
-        action.columns.set_columns(self.columns)
+        action.columns.set_columns(self.columns) if action.respond_to?(:columns)
       end
     end
 

data/lib/active_scaffold/config/list.rb

@@ -23,6 +23,7 @@ module ActiveScaffold::Config
       @wrap_tag = self.class.wrap_tag
       @always_show_search = self.class.always_show_search
       @always_show_create = self.class.always_show_create
+      @messages_above_header = self.class.messages_above_header
     end
 
     # global level configuration
@@ -39,17 +40,14 @@ module ActiveScaffold::Config
     cattr_accessor :page_links_outer_window
     @@page_links_outer_window = 0
     
-    class << self
-      def page_links_window=(value)
-        ActiveSupport::Deprecation.warn("Use page_links_inner_window", caller(1))
-        self.page_links_inner_window = value
-      end
-    end
-
     # what string to use when a field is empty
     cattr_accessor :empty_field_text
     @@empty_field_text = '-'
 
+    # display messages above table header
+    cattr_accessor :messages_above_header
+    @@messages_above_header = false
+
     # what string to use to join records from plural associations
     cattr_accessor :association_join_text
     @@association_join_text = ', '
@@ -67,7 +65,7 @@ module ActiveScaffold::Config
 
     # the ActionLink to reset search
     cattr_reader :reset_link
-    @@reset_link = ActiveScaffold::DataStructures::ActionLink.new('index', :label => :click_to_reset, :type => :collection, :position => false)
+    @@reset_link = ActiveScaffold::DataStructures::ActionLink.new('index', :label => :click_to_reset, :type => :collection, :position => false, :parameters => {:search => ''})
 
     # wrap normal cells (not inplace editable columns or with link) with a tag
     # it allows for more css styling
@@ -102,11 +100,6 @@ module ActiveScaffold::Config
     # how many page links around current page to show
     attr_accessor :page_links_outer_window
     
-    def page_links_window=(value)
-      ActiveSupport::Deprecation.warn("Use page_links_inner_window", caller(1))
-      self.page_links_inner_window = value
-    end
-
     # What kind of pagination to use:
     # * true: The usual pagination
     # * :infinite: Treat the source as having an infinite number of pages (i.e. don't count the records; useful for large tables where counting is slow and we don't really care anyway)
@@ -116,6 +109,9 @@ module ActiveScaffold::Config
     # what string to use when a field is empty
     attr_accessor :empty_field_text
 
+    # display messages above table header
+    attr_accessor :messages_above_header
+
     # what string to use to join records from plural associations
     attr_accessor :association_join_text
 

data/lib/active_scaffold/config/nested.rb

@@ -6,25 +6,34 @@ module ActiveScaffold::Config
       super
       @label = :add_existing_model
       @shallow_delete = self.class.shallow_delete
+      @ignore_order_from_association = self.class.ignore_order_from_association
     end
 
     # global level configuration
     # --------------------------
     cattr_accessor :shallow_delete
     @@shallow_delete = true
+    
+    cattr_accessor :ignore_order_from_association
 
     # instance-level configuration
     # ----------------------------
     attr_accessor :shallow_delete
+    
+    attr_accessor :ignore_order_from_association
 
     # Add a nested ActionLink
     def add_link(attribute, options = {})
       column = @core.columns[attribute.to_sym]
       unless column.nil? || column.association.nil?
-        options.reverse_merge! :security_method => :nested_authorized?, :label => column.association.klass.model_name.human({:count => column.singular_association? ? 1 : 2, :default => column.association.klass.name.pluralize})
+        label = if column.polymorphic_association?
+          column.label
+        else
+          column.association.klass.model_name.human({:count => column.singular_association? ? 1 : 2, :default => column.association.klass.name.pluralize})
+        end
+        options.reverse_merge! :security_method => :nested_authorized?, :label => label
         action_group = options.delete(:action_group) || self.action_group
         action_link = @core.link_for_association(column, options)
-        action_link.action ||= :index
         @core.action_links.add_to_group(action_link, action_group) unless action_link.nil?
       else
         # TODO: raise exception

data/lib/active_scaffold/data_structures/action_columns.rb

@@ -16,6 +16,16 @@ module ActiveScaffold::DataStructures
       @label.to_s.underscore
     end
 
+    # this is so that array.delete and array.include?, etc., will work by column name
+    def ==(other) #:nodoc:
+      # another ActionColumns
+      if other.class == self.class
+        self.label == other.label
+      else
+        @label.to_s == other.to_s
+      end
+    end
+
     # Whether this column set is collapsed by default in contexts where collapsing is supported
     attr_accessor :collapsed
     
@@ -39,7 +49,7 @@ module ActiveScaffold::DataStructures
 
     def names
       if @columns
-        self.collect(&:name)
+        self.collect_visible(:flatten => true) { |c| c.name }
       else
         names_without_auth_check
       end
@@ -66,8 +76,12 @@ module ActiveScaffold::DataStructures
             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]
-            item.each(options, &proc)
+          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
@@ -84,9 +98,9 @@ module ActiveScaffold::DataStructures
             next if self.skip_column?(item, options)
           end
           if item.is_a? ActiveScaffold::DataStructures::ActionColumns and options.has_key?(:flatten) and options[:flatten]
-            columns = columns + item.collect(options, &proc)
+            columns += item.collect_visible(options, &proc)
           else
-            columns << item
+            columns << (block_given? ? yield(item) : item)
           end
         end
         columns

data/lib/active_scaffold/data_structures/action_link.rb

@@ -172,13 +172,20 @@ module ActiveScaffold::DataStructures
     # nested action_links are referencing a column
     attr_accessor :column
     
+    # don't close the panel when another action link is open 
+    attr_writer :keep_open
+    def keep_open?
+      @keep_open
+    end
+    
     # indicates that this a nested_link
     def nested_link?
       @column || (parameters && parameters[:named_scope])
     end
     
-    # Internal use: generated eid for this action_link
-    attr_accessor :eid
+    def name_to_cache_link_url
+      @name_to_cache_link_url ||= :"#{controller || 'self'}_#{action}#{'_' if parameters.present?}#{parameters.map{|k,v| "#{k}_#{v}"}.join('_')}_link_url"
+    end
     
     
   end

data/lib/active_scaffold/data_structures/action_links.rb

@@ -88,8 +88,9 @@ module ActiveScaffold::DataStructures
 
     # iterates over the links, possibly by type
     def each(options = {}, &block)
-      @set.each {|item|
-        if item.is_a?(ActiveScaffold::DataStructures::ActionLinks)
+      method = options[:reverse] ? :reverse_each : :each
+      @set.send(method) do |item|
+        if item.is_a?(ActiveScaffold::DataStructures::ActionLinks) && !options[:groups]
           item.each(options, &block)
         else
           if options[:include_set]
@@ -98,7 +99,7 @@ module ActiveScaffold::DataStructures
             yield item
           end
         end
-      }
+      end
     end
     
     def collect_by_type(type = nil)
@@ -107,34 +108,6 @@ module ActiveScaffold::DataStructures
       links
     end
 
-    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)
-          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])))
-          security_method = link.security_method_set? || controller.respond_to?(link.security_method)
-          authorized = if security_method
-            controller.send(link.security_method, *(Array(options[:for])))
-          else
-            options[:for].nil? ? true : options[:for].authorized_for?(:crud_type => link.crud_type, :action => link.action)
-          end
-          next unless authorized || link.type == :member
-          yield(self, link, {:authorized => authorized, :first_action => first_action, :level => options[:level]})
-          first_action = false
-        end
-      end
-      options[:level] -= 1
-    end
-
     def collect
       @set
     end
@@ -178,14 +151,10 @@ module ActiveScaffold::DataStructures
 
     protected
 
-    def skip_action_link(controller, link, *args)
-      !link.ignore_method.nil? && controller.respond_to?(link.ignore_method) && controller.send(link.ignore_method, *args)
-    end
-
     # called during clone or dup. makes the clone/dup deeper.
     def initialize_copy(from)
       @set = []
       from.instance_variable_get('@set').each { |link| @set << link.clone }
     end
   end
-end
+end