projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '15020-collection-with-the-same-content-adress'
[arvados-workbench2.git]
/
src
/
models
/
user.ts
diff --git
a/src/models/user.ts
b/src/models/user.ts
index 60d598d57bd637c0728476f6b6b5f18a77909270..2497864507787cef09d6d3914780b79136090d77 100644
(file)
--- a/
src/models/user.ts
+++ b/
src/models/user.ts
@@
-20,9
+20,10
@@
export interface User {
lastName: string;
uuid: string;
ownerUuid: string;
lastName: string;
uuid: string;
ownerUuid: string;
-
identityUrl
: string;
+
username
: string;
prefs: UserPrefs;
isAdmin: boolean;
prefs: UserPrefs;
isAdmin: boolean;
+ isActive: boolean;
}
export const getUserFullname = (user?: User) => {
}
export const getUserFullname = (user?: User) => {
@@
-35,10
+36,9
@@
export interface UserResource extends Resource {
username: string;
firstName: string;
lastName: string;
username: string;
firstName: string;
lastName: string;
- identityUrl: string;
isAdmin: boolean;
isAdmin: boolean;
- prefs:
string
;
+ prefs:
UserPrefs
;
defaultOwnerUuid: string;
isActive: boolean;
writableBy: string[];
defaultOwnerUuid: string;
isActive: boolean;
writableBy: string[];
-}
\ No newline at end of file
+}