aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/app/admin/users/user-list/user-list.component.html2
-rw-r--r--client/src/app/shared/users/user.model.ts4
2 files changed, 5 insertions, 1 deletions
diff --git a/client/src/app/admin/users/user-list/user-list.component.html b/client/src/app/admin/users/user-list/user-list.component.html
index 2ef9ea0e0..328b1be77 100644
--- a/client/src/app/admin/users/user-list/user-list.component.html
+++ b/client/src/app/admin/users/user-list/user-list.component.html
@@ -5,6 +5,7 @@
5 <tr> 5 <tr>
6 <th class="table-column-id">ID</th> 6 <th class="table-column-id">ID</th>
7 <th>Username</th> 7 <th>Username</th>
8 <th>Created Date</th>
8 <th class="text-right">Remove</th> 9 <th class="text-right">Remove</th>
9 </tr> 10 </tr>
10 </thead> 11 </thead>
@@ -13,6 +14,7 @@
13 <tr *ngFor="let user of users"> 14 <tr *ngFor="let user of users">
14 <td>{{ user.id }}</td> 15 <td>{{ user.id }}</td>
15 <td>{{ user.username }}</td> 16 <td>{{ user.username }}</td>
17 <td>{{ user.createdDate | date: 'medium' }}</td>
16 <td class="text-right"> 18 <td class="text-right">
17 <span class="glyphicon glyphicon-remove" *ngIf="!user.isAdmin()" (click)="removeUser(user)"></span> 19 <span class="glyphicon glyphicon-remove" *ngIf="!user.isAdmin()" (click)="removeUser(user)"></span>
18 </td> 20 </td>
diff --git a/client/src/app/shared/users/user.model.ts b/client/src/app/shared/users/user.model.ts
index 0f34d4480..b775cb8e7 100644
--- a/client/src/app/shared/users/user.model.ts
+++ b/client/src/app/shared/users/user.model.ts
@@ -2,11 +2,13 @@ export class User {
2 id: string; 2 id: string;
3 username: string; 3 username: string;
4 role: string; 4 role: string;
5 createdDate: Date;
5 6
6 constructor(hash: { id: string, username: string, role: string }) { 7 constructor(hash: { id: string, username: string, role: string, createdDate: Date }) {
7 this.id = hash.id; 8 this.id = hash.id;
8 this.username = hash.username; 9 this.username = hash.username;
9 this.role = hash.role; 10 this.role = hash.role;
11 this.createdDate = hash.createdDate;
10 } 12 }
11 13
12 isAdmin() { 14 isAdmin() {