active_scaffold 3.0.21 → 3.0.22

data/frontends/default/views/_form_association_footer.html.erb~

@@ -0,0 +1,38 @@
+<%
+@record = parent_record
+
+show_add_existing = column_show_add_existing(column)
+show_add_new = column_show_add_new(column, associated, @record)
+
+return unless show_add_new or show_add_existing
+
+edit_associated_url = url_for(:action => 'edit_associated', :id => parent_record.id, :association => column.name, :associated_id => '--ID--', :escape => false, :eid => params[:eid], :parent_controller => params[:parent_controller], :parent_id => params[:parent_id]) if show_add_existing
+add_new_url = url_for(:action => 'edit_associated', :id => parent_record.id, :association => column.name, :escape => false, :eid => params[:eid], :parent_controller => params[:parent_controller], :parent_id => params[:parent_id]) if show_add_new
+
+-%>
+<div class="footer-wrapper">
+  <div class="footer">
+    <% if show_add_new -%>
+    <% if column.plural_association?
+         add_label = as_(:create_another, :model => column.association.klass.model_name.human)
+         add_class = 'as_create_another'
+       else
+         add_label = as_(:replace_with_new)
+         add_class = 'as_replace_with_new'
+       end
+       create_another_id = "#{sub_form_id(:association => column.name)}-create-another" %>
+    <%= tag(:input, {:id => create_another_id, :type => 'button', :value => add_label, :href => add_new_url.html_safe, 'data-remote' => true, :class => add_class, :style=> "display: none;"}) %>
+    <%= javascript_tag("ActiveScaffold.show('#{create_another_id}');") %>
+    <% end -%>
+
+    <%= '|' if show_add_new and show_add_existing %>
+
+    <% if show_add_existing -%>
+      <% select_options = options_for_select(options_for_association(column.association)) 
+          add_existing_id = "#{sub_form_id(:association => column.name)}-add-existing" %>
+      <%= select_tag 'associated_id', '<option value="">'.html_safe + as_(:_select_) + '</option>'.html_safe + select_options %>
+      <%= tag(:input, {:id => add_existing_id, :type => 'button', :value => as_(:add_existing), :href => edit_associated_url.html_safe, 'data-remote' => true, :class=> column.plural_association? ? 'as_add_existing' : 'as_replace_existing', :style => "display: none;"}) %>
+      <%= javascript_tag("ActiveScaffold.show('#{add_existing_id}');") %>
+    <% end -%>
+  </div>
+</div>

data/frontends/default/views/_render_field.js.rjs

@@ -1,4 +1,7 @@
 column = active_scaffold_config.columns[render_field.to_sym]
+@rendered ||= Set.new
+return if @rendered.include? column.name
+@rendered << column.name
 if column_renders_as(column) == :subform
   options = {:is_subform => true, :field_class => "#{column.name}-sub-form"}
 else

data/lib/active_scaffold/actions/core.rb

@@ -29,8 +29,8 @@ module ActiveScaffold::Actions
     end
 
     def render_field_for_update_columns
-      @record = new_model
       column = active_scaffold_config.columns[params[:column]]
+      @record = params[:id] && column.send_form_on_update_column ? find_if_allowed(params[:id], :update) : new_model
       unless column.nil?
         if column.send_form_on_update_column
           hash = if params[:scope]
@@ -40,7 +40,7 @@ module ActiveScaffold::Actions
           else
             params[:record]
           end
-          @record = update_record_from_params(@record, active_scaffold_config.update.columns, hash)
+          @record = update_record_from_params(@record, active_scaffold_config.send(params[:id] ? :update : :create).columns, hash)
         else
           value = column_value_from_param_value(@record, column, params[:value])
           @record.send "#{column.name}=", value

data/lib/active_scaffold/actions/core.rb~

@@ -0,0 +1,191 @@
+module ActiveScaffold::Actions
+  module Core
+    def self.included(base)
+      base.class_eval do
+        after_filter :clear_flashes
+      end
+      base.helper_method :nested?
+      base.helper_method :beginning_of_chain
+      base.helper_method :new_model
+    end
+    def render_field
+      if params[:in_place_editing]
+        render_field_for_inplace_editing
+      else
+        render_field_for_update_columns
+      end
+    end
+    
+    protected
+
+    def nested?
+      false
+    end
+
+    def render_field_for_inplace_editing
+      register_constraints_with_action_columns(nested.constrained_fields, active_scaffold_config.update.hide_nested_column ? [] : [:update]) if nested?
+      @record = find_if_allowed(params[:id], :update)
+      render :inline => "<%= active_scaffold_input_for(active_scaffold_config.columns[params[:update_column].to_sym]) %>"
+    end
+
+    def render_field_for_update_columns
+      @record = new_model
+      column = active_scaffold_config.columns[params[:column]]
+      unless column.nil?
+        if column.send_form_on_update_column
+          hash = if params[:scope]
+            hash = params[:scope].gsub('[','').split(']').inject(params[:record]) do |hash, index|
+              hash[index]
+            end
+          else
+            params[:record]
+          end
+          @record = update_record_from_params(@record, active_scaffold_config.send(params[:id] ? :update : :create).columns, hash)
+        else
+          value = column_value_from_param_value(@record, column, params[:value])
+          @record.send "#{column.name}=", value
+        end
+        after_render_field(@record, column)
+        source_id = params.delete(:source_id)
+        render :locals => {:source_id => source_id, :columns => column.update_columns, :scope => params[:scope]}
+      end
+    end
+    
+    # override this method if you want to do something after render_field
+    def after_render_field(record, column); end
+
+    def authorized_for?(options = {})
+      active_scaffold_config.model.authorized_for?(options)
+    end
+
+    def clear_flashes
+      if request.xhr?
+        flash.keys.each do |flash_key|
+          flash[flash_key] = nil
+        end
+      end
+    end
+
+    def default_formats
+      [:html, :js, :json, :xml, :yaml]
+    end
+    # Returns true if the client accepts one of the MIME types passed to it
+    # ex: accepts? :html, :xml
+    def accepts?(*types)
+      for priority in request.accepts.compact
+        if priority == Mime::ALL
+          # Because IE always sends */* in the accepts header and we assume
+          # that if you really wanted XML or something else you would say so
+          # explicitly, we will assume */* to only ask for :html
+          return types.include?(:html)
+        elsif types.include?(priority.to_sym)
+          return true
+        end
+      end
+      false
+    end
+
+    def response_status
+      if successful?
+        action_name == 'create' ? 201 : 200
+      else
+        422
+      end
+    end
+
+    # API response object that will be converted to XML/YAML/JSON using to_xxx
+    def response_object
+      @response_object = successful? ? (@record || @records) : @record.errors
+    end
+
+    # Success is the existence of certain variables and the absence of errors (when applicable).
+    # Success can also be defined.
+    def successful?
+      if @successful.nil?
+        @records or (@record and @record.errors.count == 0 and @record.no_errors_in_associated?)
+      else
+        @successful
+      end
+    end
+
+    def successful=(val)
+      @successful = (val) ? true : false
+    end
+
+    # Redirect to the main page (override if the ActiveScaffold is used as a component on another controllers page) for Javascript degradation
+    def return_to_main
+      redirect_to main_path_to_return
+    end
+
+    # Override this method on your controller to define conditions to be used when querying a recordset (e.g. for List). The return of this method should be any format compatible with the :conditions clause of ActiveRecord::Base's find.
+    def conditions_for_collection
+    end
+  
+    # Override this method on your controller to define joins to be used when querying a recordset (e.g. for List).  The return of this method should be any format compatible with the :joins clause of ActiveRecord::Base's find.
+    def joins_for_collection
+    end
+  
+    # Override this method on your controller to provide custom finder options to the find() call. The return of this method should be a hash.
+    def custom_finder_options
+      {}
+    end
+  
+    #Overide this method on your controller to provide model with named scopes
+    def beginning_of_chain
+      active_scaffold_config.model
+    end
+        
+    # Builds search conditions by search params for column names. This allows urls like "contacts/list?company_id=5".
+    def conditions_from_params
+      conditions = nil
+      params.reject {|key, value| [:controller, :action, :id, :page, :sort, :sort_direction].include?(key.to_sym)}.each do |key, value|
+        next unless active_scaffold_config.model.column_names.include?(key)
+        if value.is_a?(Array)
+          conditions = merge_conditions(conditions, ["#{active_scaffold_config.model.table_name}.#{key.to_s} in (?)", value])
+        else
+          conditions = merge_conditions(conditions, ["#{active_scaffold_config.model.table_name}.#{key.to_s} = ?", value])
+        end
+      end
+      conditions
+    end
+
+    def new_model
+      model = beginning_of_chain
+      if model.columns_hash[model.inheritance_column]
+        build_options = {model.inheritance_column.to_sym => active_scaffold_config.model_id} if nested? && nested.association && nested.association.collection?
+        params = self.params # in new action inheritance_column must be in params
+        params = params[:record] || {} unless params[model.inheritance_column] # in create action must be inside record key
+        model = params.delete(model.inheritance_column).camelize.constantize if params[model.inheritance_column]
+      end
+      model.respond_to?(:build) ? model.build(build_options || {}) : model.new
+    end
+
+    private
+    def respond_to_action(action)
+      respond_to do |type|
+        action_formats.each do |format|
+          type.send(format){ send("#{action}_respond_to_#{format}") }
+        end
+      end
+    end
+
+    def action_formats
+      @action_formats ||= if respond_to? "#{action_name}_formats", true
+        send("#{action_name}_formats")
+      else
+        (default_formats + active_scaffold_config.formats).uniq
+      end
+    end
+
+    def response_code_for_rescue(exception)
+      case exception
+        when ActiveScaffold::RecordNotAllowed
+          "403 Record Not Allowed"
+        when ActiveScaffold::ActionNotAllowed
+          "403 Action Not Allowed"
+        else
+          super
+      end
+    end
+  end
+end

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 0
-    PATCH = 21
+    PATCH = 22
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 43
   prerelease: 
   segments: 
   - 3
   - 0
-  - 21
-  version: 3.0.21
+  - 22
+  version: 3.0.22
 platform: ruby
 authors: 
 - Many, see README
@@ -15,13 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-29 00:00:00 +02:00
+date: 2011-08-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: shoulda
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,12 +28,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id001
+  prerelease: false
   type: :development
-  version_requirements: *id001
+  name: shoulda
 - !ruby/object:Gem::Dependency 
-  name: bundler
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -46,12 +44,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  requirement: *id002
+  prerelease: false
   type: :development
-  version_requirements: *id002
+  name: bundler
 - !ruby/object:Gem::Dependency 
-  name: rcov
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -60,12 +58,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id003
+  prerelease: false
   type: :development
-  version_requirements: *id003
+  name: rcov
 - !ruby/object:Gem::Dependency 
-  name: render_component_vho
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -74,12 +72,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id004
+  prerelease: false
   type: :runtime
-  version_requirements: *id004
+  name: render_component_vho
 - !ruby/object:Gem::Dependency 
-  name: verification
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -88,12 +86,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id005
+  prerelease: false
   type: :runtime
-  version_requirements: *id005
+  name: verification
 - !ruby/object:Gem::Dependency 
-  name: rails
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -104,8 +102,10 @@ dependencies:
         - 0
         - 0
         version: 3.0.0
+  requirement: *id006
+  prerelease: false
   type: :runtime
-  version_requirements: *id006
+  name: rails
 description: Save time and headaches, and create a more easily maintainable set of pages, with ActiveScaffold. ActiveScaffold handles all your CRUD (create, read, update, delete) user interface needs, leaving you more time to focus on more challenging (and interesting!) problems.
 email: activescaffold@googlegroups.com
 executables: []
@@ -195,6 +195,7 @@ files:
 - frontends/default/views/_search_attribute.html.erb
 - frontends/default/views/action_confirmation.html.erb
 - frontends/default/views/_base_form.html.erb~
+- frontends/default/views/_form_association_footer.html.erb~
 - lib/active_scaffold.rb
 - lib/active_scaffold_env.rb
 - lib/active_scaffold/actions/common_search.rb
@@ -209,6 +210,7 @@ files:
 - lib/active_scaffold/actions/show.rb
 - lib/active_scaffold/actions/subform.rb
 - lib/active_scaffold/actions/update.rb
+- lib/active_scaffold/actions/core.rb~
 - lib/active_scaffold/attribute_params.rb
 - lib/active_scaffold/config/base.rb
 - lib/active_scaffold/config/core.rb