From 8d99c88af55041ff06e6b9372b6b1f66220bed38 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Mon, 10 Apr 2017 16:08:58 +0000
Subject: [PATCH] #3529 feature - Added applications to user profile and upgrade to angular4
---
securis/src/main/webapp/src/app/forms/user.form.html | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/securis/src/main/webapp/src/app/forms/user.form.html b/securis/src/main/webapp/src/app/forms/user.form.html
index 1a3caa4..11ecf99 100644
--- a/securis/src/main/webapp/src/app/forms/user.form.html
+++ b/securis/src/main/webapp/src/app/forms/user.form.html
@@ -7,18 +7,6 @@
<span flex></span>
<button md-icon-button (click)="save()"><md-icon>save</md-icon></button>
</md-toolbar>
- <!--
- username: 'rym',
- roles: [ 1 ],
- lastLogin: 1488885433000,
- modificationTimestamp: 1479898458000,
- email: 'rbouchair@curistec.com',
- first_name: 'Rym',
- last_name: 'Bouchair',
- creation_timestamp: 1479898458000,
- organizations_ids: [ 1, 2, 5, 6, 7, 8 ]
-}
- -->
<div class="margin" layout-align-gt-xs="center start" layout-fill="" layout-gt-xs="row">
<md-card flex="70">
<md-card-title>
@@ -79,7 +67,7 @@
<error-checker [fieldName]="$L.get('field.email')" [formField]="form.controls.email"></error-checker>
</div>
</div>
- <div layout="row" layout-fill layout-padding >
+ <div layout="row" layout-fill layout-padding >
<td-chips flex [mdTooltip]="$L.get('Organizations that user can access')" [placeholder]="$L.get('Select organizations')"
[items]="orgNames" [(ngModel)]="user_orgs" name="user_orgs" requireMatch>
</td-chips>
@@ -92,6 +80,11 @@
</md-checkbox>
</div>
</div>
+ <div layout="row" layout-fill layout-padding >
+ <td-chips flex [mdTooltip]="$L.get('Applications that user can access')" [placeholder]="$L.get('Select applications')"
+ [items]="appNames" [(ngModel)]="user_apps" name="user_apps" requireMatch>
+ </td-chips>
+ </div>
<div layout="row" layout-fill layout-padding *ngIf="!isNew">
<field-readonly [value]="data.lastLogin || '' | timeAgo" label="field.lastLogin" flex></field-readonly>
<field-readonly [value]="data.creation_timestamp | date: 'medium'" label="field.creation_timestamp" flex></field-readonly>
--
Gitblit v1.3.2