[myexperiment-hackers] [3281] trunk: fixed issue with group code relying on clients for user id

[noreply]

Revision

3281

Author

dgc

Date

2012-12-27 17:06:18 +0000 (Thu, 27 Dec 2012)

Log Message

fixed issue with group code relying on clients for user id

Modified Paths

• trunk/app/controllers/networks_controller.rb
• trunk/test/functional/networks_controller_test.rb

Diff

Modified: trunk/app/controllers/networks_controller.rb (3280 => 3281)

--- trunk/app/controllers/networks_controller.rb	2012-12-27 16:59:48 UTC (rev 3280)
+++ trunk/app/controllers/networks_controller.rb	2012-12-27 17:06:18 UTC (rev 3281)
@@ -404,6 +404,9 @@
 
   # POST /networks
   def create
+
+    params[:network][:user_id] = current_user
+
     @network = Network.new(params[:network])
 
     respond_to do |format|
@@ -423,6 +426,9 @@
 
   # PUT /networks/1
   def update
+
+    params[:network].delete(:user_id)
+
     respond_to do |format|
       if @network.update_attributes(params[:network])
         @network.refresh_tags(convert_tags_to_gem_format(params[:network][:tag_list]), current_user) if params[:network][:tag_list]

Modified: trunk/test/functional/networks_controller_test.rb (3280 => 3281)

--- trunk/test/functional/networks_controller_test.rb	2012-12-27 16:59:48 UTC (rev 3280)
+++ trunk/test/functional/networks_controller_test.rb	2012-12-27 17:06:18 UTC (rev 3281)
@@ -26,7 +26,7 @@
     old_count = Network.count
 
     login_as(:john)
-    post :create, :network => { :user_id => users(:john).id, :title => 'test network', :unique_name => 'test_network', :new_member_policy => 'open', :description => "..." }
+    post :create, :network => { :title => 'test network', :unique_name => 'test_network', :new_member_policy => 'open', :description => "..." }
 
     assert_equal old_count+1, Network.count    
     assert_redirected_to network_path(assigns(:network))
@@ -47,7 +47,7 @@
   def test_should_update_network
     login_as(:john)
     put :update, :id => 1, 
-                 :network => { :user_id => users(:john).id, :title => 'test network', :unique_name => 'update_network', :new_member_policy => 'open', :description => ".?."}
+                 :network => { :title => 'test network', :unique_name => 'update_network', :new_member_policy => 'open', :description => ".?."}
 
     assert_redirected_to network_path(assigns(:network))
   end