active_scaffold 3.2.7 → 3.2.8

data/lib/active_scaffold/actions/create.rb

@@ -48,8 +48,7 @@ module ActiveScaffold::Actions
           end
         else
           if !nested? && active_scaffold_config.actions.include?(:list) && active_scaffold_config.list.always_show_create
-            do_list
-            render(:action => 'list')
+            list
           else
             render(:action => 'create')
           end
@@ -58,10 +57,7 @@ module ActiveScaffold::Actions
     end
 
     def create_respond_to_js
-      if successful? && active_scaffold_config.create.refresh_list && !render_parent?
-        do_search if respond_to? :do_search
-        do_list
-      end
+      do_refresh_list if successful? && active_scaffold_config.create.refresh_list && !render_parent?
       render :action => 'on_create'
     end
 
@@ -84,26 +80,27 @@ module ActiveScaffold::Actions
       apply_constraints_to_record(@record)
       if nested?
         create_association_with_parent(@record)
-        register_constraints_with_action_columns(nested.constrained_fields)
+        register_constraints_with_action_columns
       end
       @record
     end
 
     # A somewhat complex method to actually create a new record. The complexity is from support for subforms and associated records.
     # If you want to customize this behavior, consider using the +before_create_save+ and +after_create_save+ callbacks.
-    def do_create
+    def do_create(hash = nil)
+      hash ||= params[:record]
       begin
         active_scaffold_config.model.transaction do
-          @record = update_record_from_params(new_model, active_scaffold_config.create.columns, params[:record])
+          @record = update_record_from_params(new_model, active_scaffold_config.create.columns, hash)
           apply_constraints_to_record(@record, :allow_autosave => true)
           if nested?
             create_association_with_parent(@record) 
-            register_constraints_with_action_columns(nested.constrained_fields)
+            register_constraints_with_action_columns
           end
           create_save
         end
-      rescue ActiveRecord::RecordInvalid
-        flash[:error] = $!.message
+      rescue ActiveRecord::ActiveRecordError => ex
+        flash[:error] = ex.message
         self.successful = false
       end
     end

data/lib/active_scaffold/actions/delete.rb

@@ -23,10 +23,7 @@ module ActiveScaffold::Actions
     end
 
     def destroy_respond_to_js
-      if successful? && active_scaffold_config.delete.refresh_list && !render_parent?
-        do_search if respond_to? :do_search
-        do_list
-      end
+      do_refresh_list if successful? && active_scaffold_config.delete.refresh_list && !render_parent?
       render(:action => 'destroy')
     end
 

data/lib/active_scaffold/actions/list.rb

@@ -16,7 +16,11 @@ module ActiveScaffold::Actions
     end
 
     def list
-      do_list
+      if %w(index list).include? action_name
+        do_list
+      else
+        do_refresh_list
+      end
       @nested_auto_open = active_scaffold_config.list.nested_auto_open
       respond_to_action(:list)
     end
@@ -33,7 +37,7 @@ module ActiveScaffold::Actions
       if params[:adapter] || embedded?
         render(:partial => 'list_with_header')
       else
-        render :action => 'refresh_list', :formats => [:js]
+        render :partial => 'refresh_list', :formats => [:js]
       end
     end
     def list_respond_to_xml
@@ -78,6 +82,11 @@ module ActiveScaffold::Actions
       end
       @page, @records = page, page.items
     end
+    
+    def do_refresh_list
+      do_search if respond_to? :do_search
+      do_list
+    end
 
     def each_record_in_page
       _page = active_scaffold_config.list.user.page
@@ -89,13 +98,7 @@ module ActiveScaffold::Actions
 
     def each_record_in_scope
       do_search if respond_to? :do_search
-      finder_options = { :order => "#{active_scaffold_config.model.connection.quote_table_name(active_scaffold_config.model.table_name)}.#{active_scaffold_config.model.primary_key} ASC",
-        :conditions => all_conditions,
-        :joins => joins_for_finder}
-      finder_options.merge! custom_finder_options
-      finder_options.merge! :include => (active_scaffold_includes.blank? ? nil : active_scaffold_includes)
-      klass = beginning_of_chain
-      klass.all(finder_options).each {|record| yield record}
+      append_to_query(beginning_of_chain, finder_options).all.each {|record| yield record}
     end
 
     # The default security delegates to ActiveRecordPermissions.
@@ -117,6 +120,7 @@ module ActiveScaffold::Actions
         @record = find_if_allowed(params[:id], :read) if params[:id] && params[:id] && params[:id].to_i > 0
         respond_to_action(:action_confirmation)
       else
+        @action_link = active_scaffold_config.action_links[action_name]
         if params[:id] && params[:id] && params[:id].to_i > 0
           crud_type ||= (request.post? || request.put?) ? :update : :delete
           @record = find_if_allowed(params[:id], crud_type)
@@ -139,12 +143,11 @@ module ActiveScaffold::Actions
     end
 
     def action_update_respond_to_html
-      do_search if respond_to? :do_search
-      do_list
       redirect_to :action => 'index'
     end
 
     def action_update_respond_to_js
+      do_refresh_list unless @record.present?
       render(:action => 'on_action_update')
     end
 
@@ -171,7 +174,7 @@ module ActiveScaffold::Actions
     alias_method :index_formats, :list_formats
 
     def row_formats
-      ([:html] + active_scaffold_config.formats + active_scaffold_config.list.formats).uniq
+      ([:html, :js] + active_scaffold_config.formats + active_scaffold_config.list.formats).uniq
     end
 
     def action_update_formats

data/lib/active_scaffold/actions/mark.rb

@@ -13,17 +13,16 @@ module ActiveScaffold::Actions
       else
         do_unmark
       end
+      do_list
       respond_to_action(:mark_all)
     end
     protected
 
     def mark_all_respond_to_html
-      do_list
       list_respond_to_html
     end
 
     def mark_all_respond_to_js
-      do_list
       render :action => 'on_mark_all', :locals => {:mark_all => mark_all?}
     end
  

data/lib/active_scaffold/actions/nested.rb

@@ -27,8 +27,9 @@ module ActiveScaffold::Actions
       if params[:parent_scaffold] && (params[:association] || params[:named_scope])
         @nested = ActiveScaffold::DataStructures::NestedInfo.get(active_scaffold_config.model, params)
         unless @nested.nil?
+          active_scaffold_constraints.merge! @nested.constraints  
           active_scaffold_constraints[:id] = params[:id] if @nested.belongs_to?
-          register_constraints_with_action_columns(@nested.constrained_fields,  active_scaffold_config.list.hide_nested_column ? [] : [:list])
+          register_constraints_with_action_columns
         end
       end
     end

data/lib/active_scaffold/actions/update.rb

@@ -48,10 +48,7 @@ module ActiveScaffold::Actions
     end
     def update_respond_to_js
       if successful?
-        if update_refresh_list? && !render_parent?
-          do_search if respond_to? :do_search
-          do_list
-        end
+        do_refresh_list if update_refresh_list? && !render_parent?
         flash.now[:info] = as_(:updated_model, :model => @record.to_label) if active_scaffold_config.update.persistent
       end
       render :action => 'on_update'
@@ -68,7 +65,7 @@ module ActiveScaffold::Actions
     # A simple method to find and prepare a record for editing
     # May be overridden to customize the record (set default values, etc.)
     def do_edit
-      register_constraints_with_action_columns(nested.constrained_fields, active_scaffold_config.update.hide_nested_column ? [] : [:update]) if nested?
+      register_constraints_with_action_columns(active_scaffold_config.update.hide_nested_column ? [] : [:update]) if nested?
       @record = find_if_allowed(params[:id], :update)
     end
 
@@ -94,15 +91,15 @@ module ActiveScaffold::Actions
             raise ActiveRecord::Rollback, "don't save habtm associations unless record is valid"
           end
         end
-      rescue ActiveRecord::RecordInvalid
-        flash[:error] = $!.message
-        self.successful = false
       rescue ActiveRecord::StaleObjectError
         @record.errors.add(:base, as_(:version_inconsistency))
         self.successful = false
       rescue ActiveRecord::RecordNotSaved
         @record.errors.add(:base, as_(:record_not_saved)) if @record.errors.empty?
         self.successful = false
+      rescue ActiveRecord::ActiveRecordError => ex
+        flash[:error] = ex.message
+        self.successful = false
       end
     end
 

data/lib/active_scaffold/config/list.rb

@@ -19,7 +19,9 @@ module ActiveScaffold::Config
       @association_join_text = self.class.association_join_text
       @pagination = self.class.pagination
       @show_search_reset = true
+      @reset_link = self.class.reset_link.clone
       @mark_records = self.class.mark_records
+      @wrap_tag = self.class.wrap_tag
     end
 
     # global level configuration
@@ -61,6 +63,15 @@ module ActiveScaffold::Config
     # Add a checkbox in front of each record to mark them and use them with a batch action later
     cattr_accessor :mark_records
 
+    # the ActionLink to reset search
+    cattr_accessor :reset_link
+    @@reset_link = ActiveScaffold::DataStructures::ActionLink.new('index', :label => :click_to_reset, :type => :collection, :position => false)
+
+    # wrap normal cells (not inplace editable columns or with link) with a tag
+    # it allows for more css styling
+    cattr_accessor :wrap_tag
+    @@wrap_tag = nil
+
     # instance-level configuration
     # ----------------------------
 
@@ -101,6 +112,9 @@ module ActiveScaffold::Config
     # show a link to reset the search next to filtered message
     attr_accessor :show_search_reset
 
+    # the ActionLink to reset search
+    attr_reader :reset_link
+
     # Add a checkbox in front of each record to mark them and use them with a batch action later
     attr_accessor :mark_records
 
@@ -161,6 +175,10 @@ module ActiveScaffold::Config
     # will open nested players view if there are 2 or less records in parent
     attr_accessor :nested_auto_open
     
+    # wrap normal cells (not inplace editable columns or with link) with a tag
+    # it allows for more css styling
+    attr_accessor :wrap_tag
+    
     class UserSettings < UserSettings
       def initialize(conf, storage, params)
         super(conf,storage,params)

data/lib/active_scaffold/constraints.rb

@@ -8,23 +8,13 @@ module ActiveScaffold
       @active_scaffold_constraints ||= active_scaffold_session_storage[:constraints] || {}
     end
 
-    def set_active_scaffold_constraints
-      associations_by_params = {}
-      active_scaffold_config.model.reflect_on_all_associations.each do |association|
-        associations_by_params[association.klass.name.foreign_key] = association.name unless association.options[:polymorphic]
-      end
-      params.each do |key, value|
-        active_scaffold_constraints[associations_by_params[key]] = value if associations_by_params.include? key
-      end
-    end
-
     # For each enabled action, adds the constrained columns to the ActionColumns object (if it exists).
     # This lets the ActionColumns object skip constrained columns.
     #
     # If the constraint value is a Hash, then we assume the constraint is a multi-level association constraint (the reverse of a has_many :through) and we do NOT register the constraint column.
-    def register_constraints_with_action_columns(association_constrained_fields = [], exclude_actions = [])
+    def register_constraints_with_action_columns(exclude_actions = [])
       constrained_fields = active_scaffold_constraints.reject{|k, v| v.is_a? Hash}.keys.collect{|k| k.to_sym}
-      constrained_fields = constrained_fields | association_constrained_fields
+      exclude_actions << :list unless active_scaffold_config.list.hide_nested_column
       if self.class.uses_active_scaffold?
         # we actually want to do this whether constrained_fields exist or not, so that we can reset the array when they don't
         active_scaffold_config.actions.each do |action_name|

data/lib/active_scaffold/data_structures/column.rb

@@ -67,7 +67,10 @@ module ActiveScaffold::DataStructures
     attr_accessor :send_form_on_update_column
 
     # column to be updated in a form when this column changes
-    attr_accessor :update_column
+    def update_column=(column_name)
+      ActiveSupport::Deprecation.warn "Use update_columns= instead of update_column="
+      self.update_columns = column_name
+    end
 
     # send all the form instead of only new value when this column change
     cattr_accessor :send_form_on_update_column
@@ -165,7 +168,7 @@ module ActiveScaffold::DataStructures
     attr_reader :includes
     def includes=(value)
       @includes = case value
-        when Array, Hash then value 
+        when Array then value 
         else [value] # automatically convert to an array
       end
     end

data/lib/active_scaffold/data_structures/nested_info.rb

@@ -19,7 +19,7 @@ module ActiveScaffold::DataStructures
       end
     end
     
-    attr_accessor :association, :child_association, :parent_model, :parent_scaffold, :parent_id, :constrained_fields, :scope
+    attr_accessor :association, :child_association, :parent_model, :parent_scaffold, :parent_id, :constrained_fields, :constraints, :scope
         
     def initialize(model, nested_info)
       @parent_model = nested_info[:parent_model]
@@ -108,16 +108,16 @@ module ActiveScaffold::DataStructures
     protected
     
     def iterate_model_associations(model)
-      @constrained_fields = []
-      @constrained_fields << association.foreign_key.to_sym unless association.belongs_to?
+      @constraints = {}
+      @constraints[association.foreign_key.to_sym] = parent_id unless association.belongs_to?
       model.reflect_on_all_associations.each do |current|
         if !current.belongs_to? && association.foreign_key == current.association_foreign_key
-          constrained_fields << current.name.to_sym
+          constraints[current.name.to_sym] = parent_id
           @child_association = current if current.klass == @parent_model
         end
         if association.foreign_key == current.foreign_key
           # show columns for has_many and has_one child associationes
-          constrained_fields << current.name.to_sym if current.belongs_to?
+          constraints[current.name.to_sym] = parent_id if current.belongs_to?
           if association.options[:as] and current.options[:polymorphic]
             @child_association = current if association.options[:as].to_sym == current.name
           else
@@ -125,6 +125,7 @@ module ActiveScaffold::DataStructures
           end
         end
       end
+      @constrained_fields = @constraints.keys
     end
   end
   

data/lib/active_scaffold/finder.rb

@@ -121,11 +121,17 @@ module ActiveScaffold
           Date.strptime(value, I18n.t('date.formats.default')) rescue nil
         else
           parts = Date._parse(value)
-          time_parts = [[:hour, '%H'], [:min, '%M'], [:sec, '%S']].collect {|part, format_part| format_part if parts[part].present?}.compact
-          format = "#{I18n.t('date.formats.default')} #{time_parts.join(':')} #{'%z' if parts[:offset].present?}"
+          format = I18n.translate 'time.formats.picker', :default => '' if ActiveScaffold.js_framework == :jquery
+          if format.blank?
+            time_parts = [[:hour, '%H'], [:min, '%M'], [:sec, '%S']].collect {|part, format_part| format_part if parts[part].present?}.compact
+            format = "#{I18n.t('date.formats.default')} #{time_parts.join(':')} #{'%z' if parts[:offset].present?}"
+          else
+            format += ' %z' if parts[:offset].present? && format !~ /%z/i
+          end
           time = DateTime.strptime(value, format)
-          time = Time.zone.local_to_utc(time) unless parts[:offset]
-          time.in_time_zone.send(conversion) rescue nil
+          time = Time.zone.local_to_utc(time).in_time_zone unless parts[:offset]
+          time = time.send(conversion) unless conversion == :to_time
+          time
         end unless value.nil? || value.blank?
       end
 
@@ -265,8 +271,6 @@ module ActiveScaffold
     # * :per_page
     # * :page
     def finder_options(options = {})
-      options.assert_valid_keys :sorting, :per_page, :page, :count_includes, :pagination, :select
-
       search_conditions = all_conditions
       full_includes = (active_scaffold_includes.blank? ? nil : active_scaffold_includes)
 
@@ -291,8 +295,8 @@ module ActiveScaffold
 
     # returns a Paginator::Page (not from ActiveRecord::Paginator) for the given parameters
     # See finder_options for valid options
-    # TODO: this should reside on the model, not the controller
     def find_page(options = {})
+      options.assert_valid_keys :sorting, :per_page, :page, :count_includes, :pagination
       options[:per_page] ||= 999999999
       options[:page] ||= 1
 

data/lib/active_scaffold/helpers/controller_helpers.rb

@@ -59,7 +59,7 @@ module ActiveScaffold
         if nested_singular_association?
           {:controller => nested.parent_scaffold.controller_path, :action => :row, :id => nested.parent_id}
         elsif params[:parent_sti]
-          options = {:controller => params[:parent_sti], :action => render_parent_action(params[:parent_sti])}
+          options = {:controller => params[:parent_sti], :action => render_parent_action}
           if render_parent_action(params[:parent_sti]) == :index
             options.merge(params.slice(:eid))
           else
@@ -68,17 +68,27 @@ module ActiveScaffold
         end
       end
 
-      def render_parent_action(controller_path = nil)
+      def render_parent_action
         begin
           @parent_action = :row
-          parent_controller = "#{controller_path.to_s.camelize}Controller".constantize
-          @parent_action = :index if action_name == 'create' && parent_controller.active_scaffold_config.actions.include?(:create) && parent_controller.active_scaffold_config.create.refresh_list == true
-          @parent_action = :index if action_name == 'update' && parent_controller.active_scaffold_config.actions.include?(:update) && parent_controller.active_scaffold_config.update.refresh_list == true
-          @parent_action = :index if action_name == 'destroy' && parent_controller.active_scaffold_config.actions.include?(:delete) && parent_controller.active_scaffold_config.delete.refresh_list == true
+          if params[:parent_sti]
+            parent_controller = "#{params[:parent_sti].to_s.camelize}Controller".constantize
+            @parent_action = :index if action_name == 'create' && parent_controller.active_scaffold_config.actions.include?(:create) && parent_controller.active_scaffold_config.create.refresh_list == true
+            @parent_action = :index if action_name == 'update' && parent_controller.active_scaffold_config.actions.include?(:update) && parent_controller.active_scaffold_config.update.refresh_list == true
+            @parent_action = :index if action_name == 'destroy' && parent_controller.active_scaffold_config.actions.include?(:delete) && parent_controller.active_scaffold_config.delete.refresh_list == true
+          end
         rescue ActiveScaffold::ControllerNotFound
         end if @parent_action.nil?
         @parent_action
       end
+
+      def render_parent_controller
+        if nested_singular_association?
+          nested.parent_scaffold.controller_path
+        else
+          params[:parent_sti]
+        end
+      end
       
       def build_associated(column, record)
         if column.singular_association?

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -15,11 +15,11 @@ module ActiveScaffold
       def active_scaffold_render_input(column, options)
         begin
           # first, check if the dev has created an override for this specific field
-          if override_form_field?(column)
-            send(override_form_field(column), @record, options)
+          if (method = override_form_field(column))
+            send(method, @record, options)
           # second, check if the dev has specified a valid form_ui for this column
-          elsif column.form_ui and override_input?(column.form_ui)
-            send(override_input(column.form_ui), column, options)
+          elsif column.form_ui and (method = override_input(column.form_ui))
+            send(method, column, options)
           # fallback: we get to make the decision
           else
             if column.association
@@ -36,8 +36,8 @@ module ActiveScaffold
 
             else # regular model attribute column
               # if we (or someone else) have created a custom render option for the column type, use that
-              if override_input?(column.column.type)
-                send(override_input(column.column.type), column, options)
+              if (method = override_input(column.column.type))
+                send(method, column, options)
               # final ultimate fallback: use rails' generic input method
               else
                 # for textual fields we pass different options
@@ -229,26 +229,16 @@ module ActiveScaffold
       end
 
       def override_form_field(column)
-        method_with_class = override_form_field_name(column, true)
-        return method_with_class if respond_to?(method_with_class)
-        method = override_form_field_name(column)
-        method if respond_to?(method)
+        override_helper column, 'form_column'
       end
       alias_method :override_form_field?, :override_form_field
 
-      # the naming convention for overriding form fields with helpers
-      def override_form_field_name(column, class_prefix = false)
-        "#{clean_class_name(column.active_record_class.name) + '_' if class_prefix}#{clean_column_name(column.name)}_form_column"
-      end
-
-      def override_input?(form_ui)
-        respond_to?(override_input(form_ui))
-      end
-
       # the naming convention for overriding form input types with helpers
       def override_input(form_ui)
-        "active_scaffold_input_#{form_ui}"
+        method = "active_scaffold_input_#{form_ui}"
+        method if respond_to? method
       end
+      alias_method :override_input?, :override_input
 
       def form_partial_for_column(column, renders_as = nil)
         renders_as ||= column_renders_as(column)