active_scaffold 3.0.12 → 3.0.21

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

@@ -2,7 +2,18 @@ module ActiveScaffold
   module TinyMceBridge
     module ViewHelpers
       def active_scaffold_includes(*args)
-        tiny_mce_js = javascript_tag(%|
+        if ActiveScaffold.js_framework == :jquery
+          tiny_mce_js = javascript_tag(%|
+var action_link_close = ActiveScaffold.ActionLink.Abstract.prototype.close;
+ActiveScaffold.ActionLink.Abstract.prototype.close = function() {
+  $(this.adapter).find('textarea.mceEditor').each(function(index, elem) {
+    tinyMCE.execCommand('mceRemoveControl', false, $(elem).attr('id'));
+  });
+  action_link_close.apply(this);
+};
+          |) if using_tiny_mce?
+        else
+          tiny_mce_js = javascript_tag(%|
 var action_link_close = ActiveScaffold.ActionLink.Abstract.prototype.close;
 ActiveScaffold.ActionLink.Abstract.prototype.close = function() {
   this.adapter.select('textarea.mceEditor').each(function(elem) {
@@ -10,7 +21,8 @@ ActiveScaffold.ActionLink.Abstract.prototype.close = function() {
   });
   action_link_close.apply(this);
 };
-        |) if using_tiny_mce?
+          |) if using_tiny_mce?
+        end
         super(*args) + (include_tiny_mce_if_needed || '') + (tiny_mce_js || '')
       end
     end
@@ -25,7 +37,11 @@ ActiveScaffold.ActionLink.Abstract.prototype.close = function() {
       end
 
       def onsubmit
-        submit_js = 'tinyMCE.triggerSave();this.select("textarea.mceEditor").each(function(elem) { tinyMCE.execCommand("mceRemoveControl", false, elem.id); });' if using_tiny_mce?
+        if ActiveScaffold.js_framework == :jquery
+          submit_js = 'tinyMCE.triggerSave();$(\'textarea.mceEditor\').each(function(index, elem) { tinyMCE.execCommand(\'mceRemoveControl\', false, $(elem).attr(\'id\')); });' if using_tiny_mce?
+        else
+          submit_js = 'tinyMCE.triggerSave();this.select(\'textarea.mceEditor\').each(function(elem) { tinyMCE.execCommand(\'mceRemoveControl\', false, elem.id); });' if using_tiny_mce?
+        end
         [super, submit_js].compact.join ';'
       end
     end

data/lib/active_scaffold/config/base.rb

@@ -41,17 +41,17 @@ module ActiveScaffold::Config
         @conf = conf
       end
     end
-
+    
     def formats
       @formats ||= []
     end
-
+    
     def formats=(val)
       @formats=val
     end
-
+    
     private
-
+    
     def columns=(val)
       @columns = ActiveScaffold::DataStructures::ActionColumns.new(*val)
       @columns.action = self

data/lib/active_scaffold/config/core.rb

@@ -211,6 +211,10 @@ module ActiveScaffold::Config
       Dir.entries(javascript_dir).reject { |e| !e.match(/\.js$/) or (!self.dhtml_history? and e.match('dhtml_history')) }
     end
 
+    def self.available_frontends
+      frontends_dir = File.join(Rails.root, "vendor", "plugins", ActiveScaffold::Config::Core.plugin_directory, "frontends")
+      Dir.entries(frontends_dir).reject { |e| e.match(/^\./) } # Get rid of files that start with .
+    end
   end
 end
 

data/lib/active_scaffold/config/create.rb

@@ -38,7 +38,7 @@ module ActiveScaffold::Config
       model ||= @core.label(:count => 1)
       @label ? as_(@label) : as_(:create_model, :model => model)
     end
-
+    
     # whether the form stays open after a create or not
     attr_accessor :persistent
 

data/lib/active_scaffold/config/field_search.rb

@@ -50,26 +50,26 @@ module ActiveScaffold::Config
     # * false: LIKE ?
     # Default is :full
     attr_accessor :text_search
-
+    
     # the ActionLink for this action
     attr_accessor :link
-
+    
     # rarely searched columns may be placed in a hidden subgroup
      def optional_columns=(optionals)
       @optional_columns= Array(optionals)
     end
-
+    
     def optional_columns
       @optional_columns ||= []
     end
-
+    
     # default search params
-    # default_params = {:title => {"from"=>"test", "to"=>"", "opt"=>"%?%"}}
+    # default_params = {:title => {"from"=>"test", "to"=>"", "opt"=>"%?%"}} 
     attr_accessor :default_params
-
+    
     # human conditions
     # instead of just filtered you may show the user a humanized search condition statment
     attr_accessor :human_conditions
-
+    
   end
 end

data/lib/active_scaffold/config/form.rb

@@ -6,6 +6,7 @@ module ActiveScaffold::Config
       # start with the ActionLink defined globally
       @link = self.class.link.clone unless self.class.link.nil?
       @action_group = self.class.action_group.clone if self.class.action_group
+      @show_unauthorized_columns = self.class.show_unauthorized_columns
 
       # no global setting here because multipart should only be set for specific forms
       @multipart = false
@@ -13,10 +14,15 @@ module ActiveScaffold::Config
 
     # global level configuration
     # --------------------------
+    # show value of unauthorized columns instead of skip them
+    class_inheritable_accessor :show_unauthorized_columns
 
     # instance-level configuration
     # ----------------------------
 
+    # show value of unauthorized columns instead of skip them
+    attr_accessor :show_unauthorized_columns
+    
     # the ActionLink for this action
     attr_accessor :link
 
@@ -35,9 +41,9 @@ module ActiveScaffold::Config
       end
       @columns
     end
-
+    
     public :columns=
-
+    
     # whether the form should be multipart
     attr_writer :multipart
     def multipart?

data/lib/active_scaffold/config/list.rb

@@ -9,13 +9,14 @@ module ActiveScaffold::Config
       # full configuration path is: defaults => global table => local table
       @per_page = self.class.per_page
       @page_links_window = self.class.page_links_window
-
+      
       # originates here
       @sorting = ActiveScaffold::DataStructures::Sorting.new(@core.columns)
       @sorting.set_default_sorting(@core.model)
 
       # inherit from global scope
       @empty_field_text = self.class.empty_field_text
+      @association_join_text = self.class.association_join_text
       @pagination = self.class.pagination
       @show_search_reset = true
     end
@@ -34,6 +35,10 @@ module ActiveScaffold::Config
     cattr_accessor :empty_field_text
     @@empty_field_text = '-'
 
+    # what string to use to join records from plural associations
+    cattr_accessor :association_join_text
+    @@association_join_text = ', '
+
     # 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)
@@ -49,7 +54,7 @@ module ActiveScaffold::Config
       self.columns = @core.columns._inheritable unless @columns # lazy evaluation
       @columns
     end
-
+    
     public :columns=
 
     # how many rows to show at once
@@ -67,6 +72,9 @@ module ActiveScaffold::Config
     # what string to use when a field is empty
     attr_accessor :empty_field_text
 
+    # what string to use to join records from plural associations
+    attr_accessor :association_join_text
+
     # show a link to reset the search next to filtered message
     attr_accessor :show_search_reset
 
@@ -79,7 +87,7 @@ module ActiveScaffold::Config
     def sorting
       @sorting ||= ActiveScaffold::DataStructures::Sorting.new(@core.columns)
     end
-
+    
     # overwrite the includes used for the count sql query
     attr_accessor :count_includes
 
@@ -98,29 +106,35 @@ module ActiveScaffold::Config
     def filtered_message
       @filtered_message ? @filtered_message : :filtered
     end
-
+    
     attr_writer :always_show_search
     def always_show_search
       @always_show_search && !search_partial.blank?
     end
-
+    
     def search_partial
       return "search" if @core.actions.include?(:search)
       return "field_search" if @core.actions.include?(:field_search)
     end
-
+    
     # always show create
     attr_writer :always_show_create
     def always_show_create
       @always_show_create && @core.actions.include?(:create)
     end
 
+    # if list view is nested hide nested_column
+    attr_writer :hide_nested_column
+    def hide_nested_column
+      @hide_nested_column.nil? ? true : @hide_nested_column
+    end
+    
     # might be set to open nested_link automatically in view
     # conf.nested.add_link(:players)
     # conf.list.nested_auto_open = {:players => 2}
     # will open nested players view if there are 2 or less records in parent
     attr_accessor :nested_auto_open
-
+    
     class UserSettings < UserSettings
       # This label has alread been localized.
       def label
@@ -165,7 +179,7 @@ module ActiveScaffold::Config
           return default_sorting
         end
       end
-
+      
       def count_includes
         @conf.count_includes
       end

data/lib/active_scaffold/config/mark.rb

@@ -2,21 +2,34 @@ module ActiveScaffold::Config
   class Mark < Base
     self.crud_type = :read
 
+    # What kind of mark all mode to use:
+    # * :search: de-/mark all records using current search conditions
+    # * :page: de-/mark all records on current page
+    cattr_accessor :mark_all_mode
+    @@mark_all_mode = :search
+
+    attr_accessor :mark_all_mode
+    
     def initialize(core_config)
       @core = core_config
-      @core.model.send(:include, ActiveScaffold::MarkedModel) unless @core.model.ancestors.include?(ActiveScaffold::MarkedModel)
-      add_mark_column
+      @mark_all_mode = self.class.mark_all_mode
+      if core_config.actions.include?(:update)
+        @core.model.send(:include, ActiveScaffold::MarkedModel) unless @core.model.ancestors.include?(ActiveScaffold::MarkedModel)
+        add_mark_column
+      else
+        raise "Mark action requires update action in controller for model: #{core_config.model.to_s}"
+      end
     end
-
+    
     protected
-
+    
     def add_mark_column
       @core.columns.add :marked
       @core.columns[:marked].label = 'M'
       @core.columns[:marked].form_ui = :checkbox
       @core.columns[:marked].inplace_edit = true
       @core.columns[:marked].sort = false
-      @core.list.columns = [:marked] + @core.list.columns.names unless @core.list.columns.include? :marked
+      @core.list.columns = [:marked] + @core.list.columns.names_without_auth_check unless @core.list.columns.include? :marked
     end
   end
 end

data/lib/active_scaffold/config/nested.rb

@@ -21,14 +21,14 @@ module ActiveScaffold::Config
     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 => 2, :default => column.association.klass.name.pluralize})
+        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_to_group(action_link, action_group) unless action_link.nil?
       else
-
+        
       end
     end
-
+    
     def add_scoped_link(named_scope, options = {})
       action_link = @core.link_for_association_as_scope(named_scope.to_sym, options)
       @core.action_links.add_to_group(action_link, action_group) unless action_link.nil?

data/lib/active_scaffold/config/search.rb

@@ -42,7 +42,7 @@ module ActiveScaffold::Config
     def columns
       # we want to delay initializing to the @core.columns set for as long as possible. Too soon and .search_sql will not be available to .searchable?
       unless @columns
-        self.columns = @core.columns.collect{|c| c.name if c.searchable? and c.column and c.column.text?}.compact
+        self.columns = @core.columns.collect{|c| c.name if @core.columns._inheritable.include?(c.name) and c.searchable? and c.column and c.column.text?}.compact
       end
       @columns
     end

data/lib/active_scaffold/config/show.rb

@@ -29,7 +29,7 @@ module ActiveScaffold::Config
       self.columns = @core.columns._inheritable unless @columns # lazy evaluation
       @columns
     end
-
+    
     public :columns=
   end
 end

data/lib/active_scaffold/data_structures/action_columns.rb

@@ -15,7 +15,7 @@ module ActiveScaffold::DataStructures
 
     # Whether this column set is collapsed by default in contexts where collapsing is supported
     attr_accessor :collapsed
-
+    
     # nests a subgroup in the column set
     def add_subgroup(label, &proc)
       columns = ActiveScaffold::DataStructures::ActionColumns.new
@@ -38,6 +38,10 @@ module ActiveScaffold::DataStructures
       self.collect(&:name)
     end
 
+    def names_without_auth_check
+      Array(@set)
+    end
+
     protected
 
     def collect_columns
@@ -73,7 +77,7 @@ module ActiveScaffold::DataStructures
           end
         end
       end
-
+      
       def collect_visible(options = {}, &proc)
         columns = []
         options[:for] ||= @columns.active_record_class
@@ -90,8 +94,8 @@ module ActiveScaffold::DataStructures
           end
         end
         columns
-      end
-
+      end      
+      
       def skip_column?(column, options)
         result = false
         # skip if this matches a constrained column
@@ -119,12 +123,12 @@ module ActiveScaffold::DataStructures
       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

data/lib/active_scaffold/data_structures/action_link.rb

@@ -17,6 +17,7 @@ module ActiveScaffold::DataStructures
       self.html_options = {}
       self.column = nil
       self.image = nil
+      self.dynamic_parameters = nil
 
       # apply quick properties
       options.each_pair do |k, v|
@@ -27,7 +28,7 @@ module ActiveScaffold::DataStructures
 
     # the action-path for this link. what page to request? this is required!
     attr_accessor :action
-
+    
     # the controller for this action link. if nil, the current controller should be assumed.
     attr_writer :controller
 
@@ -43,6 +44,9 @@ module ActiveScaffold::DataStructures
     # a hash of request parameters
     attr_accessor :parameters
 
+    # a block for dynamic_parameters
+    attr_accessor :dynamic_parameters
+
     # the RESTful method
     attr_accessor :method
 
@@ -51,7 +55,7 @@ module ActiveScaffold::DataStructures
     def label
       @label.is_a?(Symbol) ? as_(@label) : @label
     end
-
+    
     # image to use {:name => 'arrow.png', :size => '16x16'}
     attr_accessor :image
 
@@ -63,7 +67,7 @@ module ActiveScaffold::DataStructures
     def confirm?
       @confirm ? true : false
     end
-
+    
     # if the action uses a DHTML based (i.e. 2-phase) confirmation
     attr_writer :dhtml_confirm
     def dhtml_confirm
@@ -83,9 +87,9 @@ module ActiveScaffold::DataStructures
     def security_method_set?
       !!@security_method
     end
-
+    
     attr_accessor :ignore_method
-
+    
     # the crud type of the (eventual?) action. different than :method, because this crud action may not be imminent.
     # this is used to determine record-level authorization (e.g. record.authorized_for?(:crud_type => link.crud_type).
     # options are :create, :read, :update, and :delete
@@ -154,18 +158,18 @@ module ActiveScaffold::DataStructures
 
     # html options for the link
     attr_accessor :html_options
-
+    
     # nested action_links are referencing a column
     attr_accessor :column
-
+    
     # 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
-
-
+    
+    
   end
 end