[myexperiment-hackers] [3232] trunk/app/models/network.rb: Avoid null-membership when creating group

[noreply]

Revision

3232

Author

stain

Date

2012-12-06 12:33:15 +0000 (Thu, 06 Dec 2012)

Log Message

Avoid null-membership when creating group

Modified Paths

• trunk/app/models/network.rb

Diff

Modified: trunk/app/models/network.rb (3231 => 3232)

--- trunk/app/models/network.rb	2012-12-06 12:33:08 UTC (rev 3231)
+++ trunk/app/models/network.rb	2012-12-06 12:33:15 UTC (rev 3232)
@@ -230,9 +230,13 @@
   #  (as group owners do not have a membership)
   def update_administrators
     if user_id_changed?
-      Membership.find_by_user_id_and_network_id(user_id, id).try(:destroy) # delete membership of new owner
-      Membership.create(:user_id => user_id_was, :network_id => id,
-                        :administrator => true, :invited_by => User.find(user_id)).accept! # create membership for old owner
+      if (user_id)
+        Membership.find_by_user_id_and_network_id(user_id, id).try(:destroy) # delete membership of new owner
+      end  
+      if (user_id_was)
+        Membership.create(:user_id => user_id_was, :network_id => id,
+                          :administrator => true, :invited_by => User.find(user_id)).accept! # create membership for old owner
+      end
     end
   end