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 f1c15db3df32080835c0521b6374bf17c61a8e2d..9a1f22bea73e31e42721ebe5c66db13f105db29f 100644 (file)
--- 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>