Popup closes on submit

diff --git a/apps/workbench/app/controllers/users_controller.rb b/apps/workbench/app/controllers/users_controller.rb
index 7a70d22a11d44056c1cba45b50b60caafbac3442..f86992018109417af0cbd44b132abb6b4939c043 100644 (file)
--- 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 (file)
index 0000000..c4059f0
--- /dev/null
+++ b/apps/workbench/app/views/users/setup.js.erb
@@ -0,0 +1 @@
+$("#modal-window").modal("hide");