{
@Input() title: string
+ @Input() continueButtonDisabled = false
protected get data(): CrePromptDialogData {
return {
diff --git a/src/app/modules/shared/components/dialogs/prompt.html b/src/app/modules/shared/components/dialogs/prompt.html
index 0d14939..f8c8a10 100644
--- a/src/app/modules/shared/components/dialogs/prompt.html
+++ b/src/app/modules/shared/components/dialogs/prompt.html
@@ -5,6 +5,6 @@
Annuler
- Continuer
+ Continuer
diff --git a/src/app/modules/shared/model/account.model.ts b/src/app/modules/shared/model/account.model.ts
index 60aa354..26e5e4f 100644
--- a/src/app/modules/shared/model/account.model.ts
+++ b/src/app/modules/shared/model/account.model.ts
@@ -32,7 +32,7 @@ export interface GroupToken {
id: string,
name: string,
enabled: boolean,
- groupId: Group
+ group: Group
}
export enum Permission {
diff --git a/src/app/modules/users/services/user.service.ts b/src/app/modules/users/services/user.service.ts
index 3f52444..8b7ad1a 100644
--- a/src/app/modules/users/services/user.service.ts
+++ b/src/app/modules/users/services/user.service.ts
@@ -13,28 +13,28 @@ export class UserService {
}
get all(): Observable {
- return this.api.get('/user')
+ return this.api.get('/account/user')
}
getById(id: number): Observable {
- return this.api.get(`/user/${id}`)
+ return this.api.get(`/account/user/${id}`)
}
save(id: number, firstName: string, lastName: string, password: string, group: number, permissions: Permission[]): Observable {
const user = {id, firstName, lastName, password, groupId: group >= 0 ? group : null, permissions}
- return this.api.post('/user', user)
+ return this.api.post('/account/user', user)
}
update(id: number, firstName: string, lastName: string, group: number, permissions: Permission[]): Observable {
const user = {id, firstName, lastName, groupId: group >= 0 ? group : null, permissions}
- return this.api.put('/user', user)
+ return this.api.put('/account/user', user)
}
updatePassword(id: number, password: string): Observable {
- return this.api.put(`/user/${id}/password`, password, true, {contentType: 'text/plain'})
+ return this.api.put(`/account/user/${id}/password`, password, true, {contentType: 'text/plain'})
}
delete(id: number): Observable {
- return this.api.delete(`/user/${id}`)
+ return this.api.delete(`/account/user/${id}`)
}
}
diff --git a/src/app/pages/administration/administration.component.ts b/src/app/pages/administration/administration.component.ts
index bbeee5e..4801036 100644
--- a/src/app/pages/administration/administration.component.ts
+++ b/src/app/pages/administration/administration.component.ts
@@ -12,6 +12,7 @@ export class AdministrationComponent extends SubMenuComponent {
links: NavLink[] = [
{route: '/admin/user', title: 'Utilisateurs', permission: Permission.VIEW_USERS},
{route: '/admin/group', title: 'Groupes', permission: Permission.VIEW_USERS},
+ {route: '/admin/group-token', title: 'Ordinateurs', permission: Permission.ADMIN},
{route: '/admin/config', title: 'Configuration', permission: Permission.ADMIN}
]
}