Skip to content

Commit

Permalink
Removing username modification behaviour on login page (#459)
Browse files Browse the repository at this point in the history
Related-Issue: #459
Closes: #459
Projected-Results-Impact: none
  • Loading branch information
holtgrewe committed Apr 26, 2022
1 parent 849883d commit 5d8a417
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 58 deletions.
2 changes: 2 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@ End-User Summary
- Starting with development of Bollonaster (VarFish v2)
- Documenting problem with extra annotations in ``20210728` data release (#450).
Includes instructions on how to apply patch to get ``20210728b``.
- Removing problematic username modification behaviour on login page (#459).

Full Change List
================

- Starting with development of Bollonaster (VarFish v2)
- Documenting problem with extra annotations in ``20210728` data release (#450).
Includes instructions on how to apply patch to get ``20210728b``.
- Removing problematic username modification behaviour on login page (#459).

------
v1.2.0
Expand Down
58 changes: 0 additions & 58 deletions varfish/static/js/login.js
Original file line number Diff line number Diff line change
@@ -1,58 +0,0 @@
/* Autofill domain in login username ---------------------------------------- */

$(document).ready(function() {
$('#sodar-login-username').keyup(function(event) {
var maxLength = 255;
v = $(this).val();

// Fill domain
if (event.keyCode !== 8 && v.length > 3 &&
v.indexOf('@') > 0 && v.indexOf('@') < v.length - 1) {
var domainName = null;

if (v.charAt(v.indexOf('@') + 1).toUpperCase() === 'C') {
$(this).removeClass('text-danger');
$('#sodar-login-submit').removeClass('disabled');
domainName = 'CHARITE';
}

else if (v.charAt(v.indexOf('@') + 1).toUpperCase() === 'M') {
$(this).removeClass('text-danger');
$('#sodar-login-submit').removeClass('disabled');
domainName = 'MDC-BERLIN';
}

// Gently inform the user of an invalid domain :)
else {
$(this).addClass('text-danger');
$('#sodar-login-submit').addClass('disabled');
}

if (domainName !== null) {
$(this).val(v.substring(0, v.indexOf('@') + 1) + domainName);
$(this).attr('maxlength', $(this).val().length);
}
}

// Erase domain if backspace is pressed
else if (event.keyCode === 8 && v.indexOf('@') > 0) {
$(this).val(v.substring(0, v.indexOf('@') + 1));
$(this).addClass('text-danger');
$('#sodar-login-submit').addClass('disabled');
$(this).attr('maxlength', maxLength);
}

// Don't allow login if there is an empty domain
if (v.indexOf('@') === v.length - 1) {
$(this).addClass('text-danger');
$('#sodar-login-submit').addClass('disabled');
}

// User without domain is OK (only for local admin/test users)
else if (v.indexOf('@') === -1) {
$(this).removeClass('text-danger');
$('#sodar-login-submit').removeClass('disabled');
$(this).attr('maxlength', maxLength);
}
});
});

0 comments on commit 5d8a417

Please sign in to comment.