From: radhika chippada <radhika@radhika.curoverse>
Date: Tue, 1 Apr 2014 03:46:42 +0000 (-0400)
Subject: Popup closes on submit
X-Git-Tag: 1.1.0~2690^2~54
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/1697fcdd746eb5a30127275e533c3d799aa9f681

Popup closes on submit
---

diff --git a/apps/workbench/app/controllers/users_controller.rb b/apps/workbench/app/controllers/users_controller.rb
index 7a70d22a11..f869920181 100644
--- a/apps/workbench/app/controllers/users_controller.rb
+++ b/apps/workbench/app/controllers/users_controller.rb
@@ -146,10 +146,17 @@ class UsersController < ApplicationController
   end
 
   def setup
-    if current_user.andand.is_admin
-      @object.setup
+    respond_to do |format|
+      if current_user.andand.is_admin
+        if @object.setup
+          format.js
+        else
+          self.render_error status: 422
+        end
+      else
+        self.render_error status: 422
+      end
     end
-    show
   end
 
   def setup_popup
diff --git a/apps/workbench/app/views/users/setup.js.erb b/apps/workbench/app/views/users/setup.js.erb
new file mode 100644
index 0000000000..c4059f0c83
--- /dev/null
+++ b/apps/workbench/app/views/users/setup.js.erb
@@ -0,0 +1 @@
+$("#modal-window").modal("hide");