projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 14490-workflow-presets
[arvados.git]
/
src
/
models
/
user.ts
diff --git
a/src/models/user.ts
b/src/models/user.ts
index dfb418892ef363192b73c5e8f6983c887910603b..a7b8458bf81fb37eb6480d33ea19c6e484b67180 100644
(file)
--- a/
src/models/user.ts
+++ b/
src/models/user.ts
@@
-4,7
+4,7
@@
import { Resource, ResourceKind } from '~/models/resource';
import { Resource, ResourceKind } from '~/models/resource';
-export type
u
serPrefs = {
+export type
U
serPrefs = {
profile?: {
organization?: string,
organization_email?: string,
profile?: {
organization?: string,
organization_email?: string,
@@
-21,7
+21,7
@@
export interface User {
uuid: string;
ownerUuid: string;
identityUrl: string;
uuid: string;
ownerUuid: string;
identityUrl: string;
- prefs:
u
serPrefs;
+ prefs:
U
serPrefs;
isAdmin: boolean;
}
isAdmin: boolean;
}
@@
-37,7
+37,7
@@
export interface UserResource extends Resource {
lastName: string;
identityUrl: string;
isAdmin: boolean;
lastName: string;
identityUrl: string;
isAdmin: boolean;
- prefs:
string
;
+ prefs:
UserPrefs
;
defaultOwnerUuid: string;
isActive: boolean;
writableBy: string[];
defaultOwnerUuid: string;
isActive: boolean;
writableBy: string[];