[ARVADOS] updated: 74c691a9aee5de7e1b61bd58adc74c869e0952d5

[git at public.curoverse.com]

Summary of changes:
 .../app/views/users/_setup_popup.html.erb          |   15 ++++++++-------
 services/api/app/models/user.rb                    |   11 ++++++++++-
 2 files changed, 18 insertions(+), 8 deletions(-)

       via  74c691a9aee5de7e1b61bd58adc74c869e0952d5 (commit)
       via  98ffc2fbf2b12e0f7f5413fea31f6d8248544f89 (commit)
      from  7a123a79df7bd5849342a70c6b9268d100b6ee10 (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 74c691a9aee5de7e1b61bd58adc74c869e0952d5
Author: radhika chippada <radhika at radhika.curoverse>
Date:   Wed Apr 2 20:56:54 2014 -0400

    Look for repo_name in VM link

diff --git a/services/api/app/models/user.rb b/services/api/app/models/user.rb
index 0539247..a3e9282 100644
--- a/services/api/app/models/user.rb
+++ b/services/api/app/models/user.rb
@@ -319,7 +319,16 @@ class User < ArvadosModel
                               head_kind: 'arvados#virtualMachine',
                               link_class: 'permission',
                               name: 'can_login')
-      if !login_perms.any?
+
+      perm_exists = false
+      login_perms.each do |perm|
+        if perm.properties[:username] == repo_name
+          perm_exists = true
+          break
+        end
+      end
+
+      if !perm_exists
         login_perm = Link.create(tail_kind: 'arvados#user',
                                  tail_uuid: self.uuid,
                                  head_kind: 'arvados#virtualMachine',

commit 98ffc2fbf2b12e0f7f5413fea31f6d8248544f89
Author: radhika chippada <radhika at radhika.curoverse>
Date:   Wed Apr 2 20:28:14 2014 -0400

    Require only email and openid prefix in the setup popup. The other fields are optional.

diff --git a/apps/workbench/app/views/users/_setup_popup.html.erb b/apps/workbench/app/views/users/_setup_popup.html.erb
index f1c15db..9a1f22b 100644
--- a/apps/workbench/app/views/users/_setup_popup.html.erb
+++ b/apps/workbench/app/views/users/_setup_popup.html.erb
@@ -9,7 +9,6 @@
     <% selected_repo = @current_selections[:repo_name] %>
     <% selected_vm = @current_selections[:vm_uuid] %>
     
-<% puts "\n\n **************** setup_user_url = #{setup_user_url.inspect}" %>
     <%= form_tag setup_user_path, {id: 'setup_form', name: 'setup_form', method: 'get', class: 'form-search', remote: true} do %>
       <input id="user_uuid" maxlength="250" name="user_uuid" type="hidden" value="<%=uuid%>">
       <div>
@@ -69,14 +68,16 @@
   var $input = $('input:text'),
   $register = $('#register');    
   $register.attr('disabled', true);
-
   $input.keyup(function() {
     var trigger = false;
-    $input.each(function() {
-        if (!$(this).val()) {
-            trigger = true;
-        }
-    });
+
+    var email_value = document.forms["setup_form"]["email"].value;
+    var prefix_value = document.forms["setup_form"]["openid_prefix"].value;
+
+    if (email_value == null || email_value == "" || prefix_value == null || prefix_value == "") {
+      trigger = true;
+    }
+
     trigger ? $register.attr('disabled', true) : $register.removeAttr('disabled');
   });
 </script>

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


hooks/post-receive
--