fix embedded scaffolds with constraints

sflinter · Mar 30, 2012 · 739cc6e · 739cc6e
1 parent 9d65d03
commit 739cc6e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lib/active_scaffold/actions/core.rb b/lib/active_scaffold/actions/core.rb
@@ -2,6 +2,7 @@ module ActiveScaffold::Actions
   module Core
     def self.included(base)
       base.class_eval do
+        before_filter :register_constraints_with_action_columns, :if => :embedded?
         after_filter :clear_flashes
       end
       base.helper_method :nested?
@@ -17,6 +18,9 @@ def render_field
     end
 
     protected
+    def embedded?
+      @embedded ||= params.delete(:embedded)
+    end
 
     def nested?
       false

diff --git a/lib/active_scaffold/actions/list.rb b/lib/active_scaffold/actions/list.rb
@@ -23,7 +23,7 @@ def list
 
     protected
     def list_respond_to_html
-      if params.delete(:embedded)
+      if embedded?
         render :action => 'list', :layout => false
       else
         render :action => 'list'
@@ -32,8 +32,7 @@ def list_respond_to_html
     def list_respond_to_js
       if params[:adapter]
         render(:partial => 'list_with_header')
-      elsif params[:embedded]
-        params.delete(:embedded)
+      elsif embedded?
         render(:partial => 'list_with_header')
       else
         render :action => 'refresh_list', :formats => [:js]