During setup of an existing user, create oid login permission, if it does not already...

[arvados.git] / apps / workbench / app / views / users / _setup_popup.html.erb

diff --git a/apps/workbench/app/views/users/_setup_popup.html.erb b/apps/workbench/app/views/users/_setup_popup.html.erb
index f1c15db3df32080835c0521b6374bf17c61a8e2d..aed57da978c70317de1d8a54c61c484723eab0c0 100644 (file)
--- a/apps/workbench/app/views/users/_setup_popup.html.erb
+++ b/apps/workbench/app/views/users/_setup_popup.html.erb
@@ -5,19 +5,20 @@
     <% end %>
     <% disable_email = uuid != nil %>
     <% identity_url_prefix = @current_selections[:identity_url_prefix] %>
-    <% disable_url_prefix = (identity_url_prefix != nil) %>
+    <% disable_url_prefix = identity_url_prefix != nil %>
     <% 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 %>
+    <%= 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>
         <table><tbody>
           <tr>
             <% if disable_email %>
               <td> Email </td>
-              <td> <input id="email" maxlength="250" name="email" type="text" value="<%=email%>" disabled=true > </td>
+              <td> <input id="email" maxlength="250" name="email" type="text" value="<%=email%>" 
+                    disabled=true > </td>
             <% else %>
               <td> Email </td>
               <td> <input id="email" maxlength="250" name="email" type="text" > </td>
@@ -26,10 +27,12 @@
           <tr>
             <% if disable_url_prefix %>
               <td> Identity URL Prefix &nbsp </td>
-              <td> <input id="openid_prefix" maxlength="250" name="openid_prefix" type="text" value="<%=identity_url_prefix%>" disabled=true > </td>
+              <td> <input id="openid_prefix" maxlength="250" name="openid_prefix" type="text" 
+                    value="<%=identity_url_prefix%>" disabled=true > </td>
             <% else %>
               <td> Openid Prefix </td>
-              <td> <input id="openid_prefix" maxlength="250" name="openid_prefix" type="text" value="https://www.google.com/accounts/o8/id"> </td>
+              <td> <input id="openid_prefix" maxlength="250" name="openid_prefix" type="text" 
+                    value="<%= Rails.configuration.default_openid_prefix %>"> </td>
             <% end %>
           </tr>
           <tr>
@@ -67,16 +70,25 @@
 
 <script>
   var $input = $('input:text'),
-  $register = $('#register');    
-  $register.attr('disabled', true);
+  $register = $('#register');
+
+  var email_disabled = document.forms["setup_form"]["email"].disabled;
+  var email_value = document.forms["setup_form"]["email"].value;
+  var prefix_value = document.forms["setup_form"]["openid_prefix"].value;
+  if ((email_disabled == false) && (email_value == null || email_value == "" || prefix_value == null || prefix_value == "")) {
+    $register.attr('disabled', true);
+  }
 
   $input.keyup(function() {
     var trigger = false;
-    $input.each(function() {
-        if (!$(this).val()) {
-            trigger = true;
-        }
-    });
+
+    var email_disabled = document.forms["setup_form"]["email"].disabled;
+    var email_value = document.forms["setup_form"]["email"].value;
+    var prefix_value = document.forms["setup_form"]["openid_prefix"].value;
+    if ((email_disabled == false) && (email_value == null || email_value == "" || prefix_value == null || prefix_value == "")) {
+      trigger = true;
+    }
+
     trigger ? $register.attr('disabled', true) : $register.removeAttr('disabled');
   });
 </script>