Merge pull request #319 from Ontotext-AD/gdb-5234

GDB-5234: Wrong credentials upon login with valid user (fixed to refe…
Ontotext-AD · Nov 17, 2020 · a806074 · a806074
2 parents ff87ef3 + 16c0673
commit a806074
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "graphdb-workbench",
-    "version": "1.5.0-TR15",
+    "version": "1.5.0-TR16",
     "description": "The web application for GraphDB APIs",
     "scripts": {
         "build": "webpack --config=webpack.config.prod.js",

diff --git a/src/pages/login.html b/src/pages/login.html
@@ -11,13 +11,13 @@ <h1>Login</h1>
 					<div class="form-group mb-2" ng-class="wrongCredentials ? 'has-error' : ''">
 						<div class="input-group">
 							<span class="input-group-addon" tooltip="Username" tooltip-trigger="mouseenter"><em class="icon-user icon-2x text-muted"></em></span>
-							<input id="wb-login-username" ng-model="username" placeholder="Your name" type="text" class="form-control form-control-lg" autofocus required ng-blur="wrongCredentials = false">
+							<input id="wb-login-username" ng-model="$parent.username" placeholder="Your name" type="text" class="form-control form-control-lg" autofocus required ng-blur="wrongCredentials = false">
 						</div>
 					</div>
 					<div class="form-group mb-2"  ng-class="wrongCredentials ? 'has-error' : ''">
 						<div class="input-group">
 							<span class="input-group-addon" tooltip="Password" tooltip-trigger="mouseenter"><em class="icon-lock icon-2x text-muted"></em></span>
-							<input id="wb-login-password" type="password" placeholder="Your password" ng-model="password" class="form-control form-control-lg" required ng-blur="wrongCredentials = false">
+							<input id="wb-login-password" type="password" placeholder="Your password" ng-model="$parent.password" class="form-control form-control-lg" required ng-blur="wrongCredentials = false">
 						</div>
 					</div>
 					<div class="form-group">

diff --git a/test-cypress/package-lock.json b/test-cypress/package-lock.json
diff --git a/test-cypress/package.json b/test-cypress/package.json
@@ -1,6 +1,6 @@
 {
     "name": "graphdb-workbench-tests",
-    "version": "1.5.0-TR15",
+    "version": "1.5.0-TR16",
     "description": "Cypress tests for GraphDB workbench",
     "scripts": {
         "start": "cypress open",