mirror of
https://github.com/datahub-project/datahub.git
synced 2025-10-14 18:38:27 +00:00
DSS-6551 Fixes issue with play session cookie not containing username. Small updates to wordinng in Ownership ui
This commit is contained in:
parent
a39558c388
commit
9e87ca6cd5
@ -193,6 +193,8 @@ public class Application extends Controller
|
||||
return badRequest("Missing or invalid [credentials]");
|
||||
}
|
||||
|
||||
session().clear();
|
||||
|
||||
// Create a uuid string for this session if one doesn't already exist
|
||||
// to be appended to the Result object
|
||||
String uuid = session("uuid");
|
||||
@ -207,8 +209,9 @@ public class Application extends Controller
|
||||
return badRequest("Invalid credentials");
|
||||
}
|
||||
|
||||
session().clear();
|
||||
|
||||
// Adds the username to the session cookie
|
||||
session("user", username);
|
||||
// Contruct an ObjectNode with the username and uuid token to be sent with the response
|
||||
ObjectNode data = Json.newObject();
|
||||
data.put("username", username);
|
||||
|
@ -2,10 +2,10 @@
|
||||
<button class="nacho-button nacho-button--large-inverse"
|
||||
title={{if requiredMinNotConfirmed
|
||||
"Need at least two confirmed owners to make changes"
|
||||
"Save Changes"}}
|
||||
"Confirm Owners"}}
|
||||
disabled={{requiredMinNotConfirmed}}
|
||||
{{action "updateOwners"}}>
|
||||
Save Changes
|
||||
Confirm Owners
|
||||
</button>
|
||||
|
||||
<button class="nacho-button nacho-button--large"
|
||||
|
Loading…
x
Reference in New Issue
Block a user