Fixes PipelineInstancesControllerTest. application_controller#create now does
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 5 Jun 2014 19:50:26 +0000 (15:50 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 5 Jun 2014 19:50:26 +0000 (15:50 -0400)
the right thing based on requested response format.  refs #2882

apps/workbench/app/controllers/application_controller.rb

index ae802f840e66ab8a91d76611f05eaebc69077ca4..b109e5c8acecc7f930525dd94211f0de97630f44 100644 (file)
@@ -146,8 +146,17 @@ class ApplicationController < ActionController::Base
     @new_resource_attrs ||= {}
     @new_resource_attrs.reject! { |k,v| k.to_s == 'uuid' }
     @object ||= model_class.new @new_resource_attrs, params["options"]
-    @object.save!
-    redirect_to @object
+    if @object.save
+      respond_to do |f|
+        f.json { render json: @object }
+        f.html {
+          redirect_to @object
+        }
+        f.js { render }
+      end
+    else
+      self.render_error status: 422
+    end
   end
 
   def destroy