don't update an association when params[:associations] is nil

wfarr · Dec 9, 2010 · 8ab4a13 · 8ab4a13
1 parent 171055a
commit 8ab4a13
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/app/controllers/rails_admin/main_controller.rb b/app/controllers/rails_admin/main_controller.rb
@@ -260,12 +260,14 @@ def get_attributes
 
     def update_all_associations
       @abstract_model.associations.each do |association|
-        ids = (params[:associations] || {}).delete(association[:name])
-        case association[:type]
-        when :has_one
-          update_association(association, ids)
-        when :has_many, :has_and_belongs_to_many
-          update_associations(association, ids.to_a)
+        if params[:associations] && params[:associations].has_key?(association[:name]) 
+          ids = (params[:associations] || {}).delete(association[:name])
+          case association[:type]
+          when :has_one
+            update_association(association, ids)
+          when :has_many, :has_and_belongs_to_many
+            update_associations(association, ids.to_a)
+          end
         end
       end
     end