[ARVADOS] updated: 7bad9628b44c4f7bbdcfa3649110fa535c7b2aa3

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/controllers/users_controller.rb |    7 +++++++
 apps/workbench/app/models/user.rb                  |    2 +-
 .../app/views/users/_setup_popup.html.erb          |   12 ++++++------
 .../workbench/app/views/users/_show_admin.html.erb |    9 ++-------
 apps/workbench/app/views/users/setup_popup.js.erb  |    5 +++++
 apps/workbench/config/routes.rb                    |    1 +
 6 files changed, 22 insertions(+), 14 deletions(-)

       via  7bad9628b44c4f7bbdcfa3649110fa535c7b2aa3 (commit)
      from  94da3d49e1d5c0be59111bfcda77844d9a5c83b3 (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 7bad9628b44c4f7bbdcfa3649110fa535c7b2aa3
Author: radhika chippada <radhika at radhika.curoverse>
Date:   Mon Mar 31 10:53:20 2014 -0400

    Setup popup display

diff --git a/apps/workbench/app/controllers/users_controller.rb b/apps/workbench/app/controllers/users_controller.rb
index 5396702..0e66dd6 100644
--- a/apps/workbench/app/controllers/users_controller.rb
+++ b/apps/workbench/app/controllers/users_controller.rb
@@ -152,4 +152,11 @@ class UsersController < ApplicationController
     show
   end
 
+  def setup_popup
+    respond_to do |format|
+      format.html
+      format.js
+    end
+  end
+
 end
diff --git a/apps/workbench/app/models/user.rb b/apps/workbench/app/models/user.rb
index 6009b19..24d3958 100644
--- a/apps/workbench/app/models/user.rb
+++ b/apps/workbench/app/models/user.rb
@@ -48,7 +48,7 @@ class User < ArvadosBase
   def setup
     $arvados_api_client.api(self.class,
                             "/setup",
-                            {uuid: self.uuid})
+                            {uuid: self.uuid, repo_name: 'abcdefg'})
   end
 
 end
diff --git a/apps/workbench/app/views/users/_setup_popup.html.erb b/apps/workbench/app/views/users/_setup_popup.html.erb
index 167d4a8..b6e9e00 100644
--- a/apps/workbench/app/views/users/_setup_popup.html.erb
+++ b/apps/workbench/app/views/users/_setup_popup.html.erb
@@ -1,15 +1,15 @@
-
-<div id="modal-window" class="modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
  <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
     <h3 id="myModalLabel">Modal header</h3>
   </div>
+
   <div class="modal-body">
-    Enter something: <input type="text" id="myInput">
+       <form method="POST" class="form-horizontal" onsubmit="return false">
+           <input id="repository_name" maxlength="250" name="repositoryname" type="text">
+       </form>
   </div>
   <div class="modal-footer">
-    <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
-    <button class="btn  btn-primary">Save changes</button>
+    <button id="save-button" class="btn" onclick="save_user()">Save</button>
+    <button class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button>
   </div>
-</div>
 
diff --git a/apps/workbench/app/views/users/_show_admin.html.erb b/apps/workbench/app/views/users/_show_admin.html.erb
index 077de78..fd979b8 100644
--- a/apps/workbench/app/views/users/_show_admin.html.erb
+++ b/apps/workbench/app/views/users/_show_admin.html.erb
@@ -15,11 +15,6 @@ account.</p>
 <p>As an admin, you can setup this user. Please input a VM and repository for the user. If you had previously provided any of these items, they are pre-filled for you and you can leave them as is if you would like to reuse them.</p>
 
 <blockquote>
-
-<div>
-<a href="#" class="btn btn-primary" data-toggle="modal"
-   data-target="#modal-window">Setup <%= "#{@object.full_name}" %> </a>
- <%= render :partial => 'setup_popup' %>
-</div>
-
+<%= link_to "Setup #{@object.full_name}", setup_popup_path,  {class: 'btn btn-primary', :remote => true, 'data-toggle' =>  "modal", 'data-target' => '#modal-window'}  %>
+<div id="modal-window" class="modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"></div>
 </blockquote>
diff --git a/apps/workbench/app/views/users/setup_popup.js.erb b/apps/workbench/app/views/users/setup_popup.js.erb
index a928e96..2eca58b 100644
--- a/apps/workbench/app/views/users/setup_popup.js.erb
+++ b/apps/workbench/app/views/users/setup_popup.js.erb
@@ -1 +1,6 @@
 $("#modal-window").html("<%= escape_javascript(render 'setup_popup') %>");
+
+function save_user () {
+  $('#modal-window').modal('hide'); 
+  repo_name = document.getElementById ("repository_name").value;
+};
diff --git a/apps/workbench/config/routes.rb b/apps/workbench/config/routes.rb
index 7b73346..fbda8d4 100644
--- a/apps/workbench/config/routes.rb
+++ b/apps/workbench/config/routes.rb
@@ -7,6 +7,7 @@ ArvadosWorkbench::Application.routes.draw do
     get 'signatures', on: :collection
   end
   get '/user_agreements/signatures' => 'user_agreements#signatures'
+  get 'users/setup_popup' => 'users#setup_popup', :as => :setup_popup
   resources :nodes
   resources :humans
   resources :traits

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


hooks/post-receive
--