[myexperiment-hackers] [2871] branches/datasets: Changed status codes

[noreply]

Revision

2871

Author

fbacall

Date

2011-12-07 10:22:44 -0500 (Wed, 07 Dec 2011)

Log Message

Changed status codes

Modified Paths

• branches/datasets/app/controllers/data_items_controller.rb
• branches/datasets/test/functional/data_items_controller_test.rb

Diff

Modified: branches/datasets/app/controllers/data_items_controller.rb (2870 => 2871)

--- branches/datasets/app/controllers/data_items_controller.rb	2011-12-07 11:00:36 UTC (rev 2870)
+++ branches/datasets/app/controllers/data_items_controller.rb	2011-12-07 15:22:44 UTC (rev 2871)
@@ -22,7 +22,7 @@
       end
     else
       respond_to do |format|
-        format.html {render :partial => "data_sets/errors", :status => 400,
+        format.html {render :partial => "data_sets/errors", :status => :unprocessable_entity,
                             :locals => {:errors => @data_item.errors.full_messages}}
       end
     end
@@ -37,7 +37,7 @@
       end
     else
       respond_to do |format|
-        format.html {render :partial => "data_sets/errors", :status => 400,
+        format.html {render :partial => "data_sets/errors", :status => :unprocessable_entity,
                             :locals => {:errors => @data_item.errors.full_messages}}
       end
     end
@@ -63,7 +63,7 @@
 
     if @port_names.empty?
       respond_to do |format|
-        format.html {render :nothing => true, :status => 400}
+        format.html {render :nothing => true, :status => :unprocessable_entity}
       end
     else
       respond_to do |format|
@@ -127,7 +127,7 @@
   def auth
     unless Authorization.is_authorized?("edit", nil, @data_set, current_user)
       respond_to do |format|
-        format.html { render :nothing => true, :status => 403 }
+        format.html { render :nothing => true, :status => :forbidden }
       end
     end
   end

Modified: branches/datasets/test/functional/data_items_controller_test.rb (2870 => 2871)

--- branches/datasets/test/functional/data_items_controller_test.rb	2011-12-07 11:00:36 UTC (rev 2870)
+++ branches/datasets/test/functional/data_items_controller_test.rb	2011-12-07 15:22:44 UTC (rev 2871)
@@ -59,7 +59,7 @@
     end
     end
 
-    assert_response 400
+    assert_response :unprocessable_entity
   end
 
   test "can't add items to an already occupied port in a data set" do
@@ -77,7 +77,7 @@
     end
     end
 
-    assert_response 400
+    assert_response :unprocessable_entity
   end
 
   test "can't add items to data sets if not authorized" do
@@ -95,7 +95,7 @@
     end
     end
 
-    assert_response 403
+    assert_response :forbidden
   end
 
   test "can replace data in a data set" do