[ARVADOS] updated: 2.1.0-793-g44d2d5e6d
Git user
git at public.arvados.org
Fri May 14 19:13:53 UTC 2021
Summary of changes:
apps/workbench/app/views/users/welcome.html.erb | 54 ++++++++++++++-----------
lib/config/config.default.yml | 6 +--
lib/config/generated_config.go | 6 +--
3 files changed, 32 insertions(+), 34 deletions(-)
via 44d2d5e6d2b509551e37c7f748d8f79fcdf177f3 (commit)
via a900901fa7ed5201d0bf34cc4cd559f82ba25aa1 (commit)
from 3a84f583582cf9f3e050b5c92b14843d6a6c4ef5 (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 44d2d5e6d2b509551e37c7f748d8f79fcdf177f3
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Fri May 14 15:13:25 2021 -0400
17499: Adjust the default welcome page text used by wb1/wb2
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index 17fecf158..50a965a9a 100644
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -1429,15 +1429,11 @@ Clusters:
<img src="/arvados-logo-big.png" style="width: 20%; float: right; padding: 1em;" />
<h2>Please log in.</h2>
- <p>The "Log in" button below will show you a sign-in
- page. After you log in, you will be redirected back to
- Arvados Workbench.</p>
-
<p>If you have never used Arvados Workbench before, logging in
for the first time will automatically create a new
account.</p>
- <i>Arvados Workbench uses your name and email address only for
+ <i>Arvados Workbench uses your information only for
identification, and does not retrieve any other personal
information.</i>
diff --git a/lib/config/generated_config.go b/lib/config/generated_config.go
index de233a866..5216f8161 100644
--- a/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@ -1435,15 +1435,11 @@ Clusters:
<img src="/arvados-logo-big.png" style="width: 20%; float: right; padding: 1em;" />
<h2>Please log in.</h2>
- <p>The "Log in" button below will show you a sign-in
- page. After you log in, you will be redirected back to
- Arvados Workbench.</p>
-
<p>If you have never used Arvados Workbench before, logging in
for the first time will automatically create a new
account.</p>
- <i>Arvados Workbench uses your name and email address only for
+ <i>Arvados Workbench uses your information only for
identification, and does not retrieve any other personal
information.</i>
commit a900901fa7ed5201d0bf34cc4cd559f82ba25aa1
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Fri May 14 15:03:46 2021 -0400
17499: Adjust formatting. improve error reporting.
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
diff --git a/apps/workbench/app/views/users/welcome.html.erb b/apps/workbench/app/views/users/welcome.html.erb
index 36b457af0..2842cd884 100644
--- a/apps/workbench/app/views/users/welcome.html.erb
+++ b/apps/workbench/app/views/users/welcome.html.erb
@@ -7,31 +7,33 @@ SPDX-License-Identifier: AGPL-3.0 %>
<%= javascript_tag do %>
async function controller_password_authenticate(event) {
event.preventDefault()
- document.getElementById('login-authenticate-error').innerHTML = '';
- const resp = await fetch('<%= "#{Rails.configuration.Services.Controller.ExternalURL}" %>arvados/v1/users/authenticate', {
- method: 'POST',
+ document.getElementById('login-authenticate-error').innerHTML = '';
+ const resp = await fetch('<%= "#{Rails.configuration.Services.Controller.ExternalURL}" %>arvados/v1/users/authenticate', {
+ method: 'POST',
- headers: {'Content-Type': 'application/json'},
- body: JSON.stringify({
- username: document.getElementById('login-username').value,
- password: document.getElementById('login-password').value,
- }),
- })
+ headers: {'Content-Type': 'application/json'},
+ body: JSON.stringify({
+ username: document.getElementById('login-username').value,
+ password: document.getElementById('login-password').value,
+ }),
+ })
if (!resp.ok) {
const respj = await resp.json()
- document.getElementById('login-authenticate-error').innerHTML = `<p>${respj.errors[0]}</p>`;
- return
- }
- var redir = document.getElementById('login-return-to').value
- if (redir.indexOf('?') > 0) {
- redir += '&'
- } else {
- redir += '?'
- }
+ document.getElementById('login-authenticate-error').innerHTML = `<p>${respj.errors[0]}</p>`;
+ return
+ }
+ var redir = document.getElementById('login-return-to').value
+ if (redir.indexOf('?') > 0) {
+ redir += '&'
+ } else {
+ redir += '?'
+ }
const respj = await resp.json()
- document.location = redir + "api_token=v2/" + respj.uuid + "/" + respj.api_token
+ document.location = redir + "api_token=v2/" + respj.uuid + "/" + respj.api_token
+ }
+ function clear_authenticate_error() {
+ document.getElementById('login-authenticate-error').innerHTML = "";
}
- // document.getElementById('login-form-tag').
<% end %>
<div class="row">
@@ -54,11 +56,15 @@ SPDX-License-Identifier: AGPL-3.0 %>
<% when Rails.configuration.Login.LDAP.Enable %>
<% when Rails.configuration.Login.Test.Enable %>
<form id="login-form-tag" onsubmit="controller_password_authenticate(event)">
- <p>username <input type="text" class="form-control" name="login-username" value="" id="login-username" style="width: 50%"></input></p>
- <p>password <input type="password" class="form-control" name="login-password" value="" id="login-password" style="width: 50%"></input></p>
+ <p>username <input type="text" class="form-control" name="login-username"
+ value="" id="login-username" style="width: 50%"
+ oninput="clear_authenticate_error()"></input></p>
+ <p>password <input type="password" class="form-control" name="login-password" value=""
+ id="login-password" style="width: 50%"
+ oninput="clear_authenticate_error()"></input></p>
<input type="hidden" name="return_to" value="<%= "#{Rails.configuration.Services.Workbench1.ExternalURL}" %>" id="login-return-to">
- <p id="login-authenticate-error"></p>
- <button type="submit" class="btn btn-primary">Login</button>
+ <span style="color: red"><p id="login-authenticate-error"></p></span>
+ <button type="submit" class="btn btn-primary">Login</button>
</form>
<% end %>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list