[ARVADOS] updated: 209e7175c04eb7f54ef720f4a78f259237c6b9a5

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/controllers/users_controller.rb |   13 ++++++++++---
 apps/workbench/app/views/users/setup.js.erb        |    1 +
 2 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 apps/workbench/app/views/users/setup.js.erb

       via  209e7175c04eb7f54ef720f4a78f259237c6b9a5 (commit)
      from  aa0b1d304248ee224f2b32784e2a8857969f9a18 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 209e7175c04eb7f54ef720f4a78f259237c6b9a5
Author: radhika chippada <radhika at radhika.curoverse>
Date:   Mon Mar 31 23:46:42 2014 -0400

    Popup closes on submit

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

-----------------------------------------------------------------------


hooks/post-receive
--