[ARVADOS] updated: a38af725d9acfeb593880c3e42a61b7085f88e3f
git at public.curoverse.com
git at public.curoverse.com
Thu Apr 3 07:39:31 EDT 2014
Summary of changes:
.../app/views/users/_setup_popup.html.erb | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
via a38af725d9acfeb593880c3e42a61b7085f88e3f (commit)
via c39f0be318a332c28240724273080fd529fe9a3a (commit)
from 7b125f2521051c64cc54f80ab01051865f1c8641 (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 a38af725d9acfeb593880c3e42a61b7085f88e3f
Author: radhika chippada <radhika at radhika.curoverse>
Date: Thu Apr 3 07:39:06 2014 -0400
Submit button enabled when existing user
diff --git a/apps/workbench/app/views/users/_setup_popup.html.erb b/apps/workbench/app/views/users/_setup_popup.html.erb
index 1995388..28b2f42 100644
--- a/apps/workbench/app/views/users/_setup_popup.html.erb
+++ b/apps/workbench/app/views/users/_setup_popup.html.erb
@@ -5,7 +5,6 @@
<% end %>
<% disable_email = uuid != nil %>
<% identity_url_prefix = @current_selections[:identity_url_prefix] %>
- <% disable_url_prefix = (identity_url_prefix != nil) %>
<% selected_repo = @current_selections[:repo_name] %>
<% selected_vm = @current_selections[:vm_uuid] %>
@@ -25,7 +24,7 @@
<% end %>
</tr>
<tr>
- <% if disable_url_prefix %>
+ <% if disable_email %>
<td> Identity URL Prefix   </td>
<td> <input id="openid_prefix" maxlength="250" name="openid_prefix" type="text"
value="<%=identity_url_prefix%>" disabled=true > </td>
@@ -72,18 +71,22 @@
var $input = $('input:text'),
$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_value == null || email_value == "" || prefix_value == null || 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;
+ 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_value == null || email_value == "" || prefix_value == null || prefix_value == "") {
+ if (email_disabled == true) {
+ trigger = false;
+ } else if (email_value == null || email_value == "" || prefix_value == null || prefix_value == "") {
trigger = true;
}
commit c39f0be318a332c28240724273080fd529fe9a3a
Author: radhika chippada <radhika at radhika.curoverse>
Date: Thu Apr 3 07:17:03 2014 -0400
popup submit button
diff --git a/apps/workbench/app/views/users/_setup_popup.html.erb b/apps/workbench/app/views/users/_setup_popup.html.erb
index e7e9990..1995388 100644
--- a/apps/workbench/app/views/users/_setup_popup.html.erb
+++ b/apps/workbench/app/views/users/_setup_popup.html.erb
@@ -70,14 +70,19 @@
<script>
var $input = $('input:text'),
- $register = $('#register');
- $register.attr('disabled', true);
+ $register = $('#register');
+
+ 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 == "") {
+ $register.attr('disabled', true);
+ }
+
$input.keyup(function() {
var trigger = false;
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;
}
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list