Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 230ef441 authored by Joze RIHTARSIC's avatar Joze RIHTARSIC
Browse files

Pull request #219: Update password change/set dialog

Merge in EDELIVERY/smp from bugfix/EDELIVERY-9487-for-the-set-password-for-a-new-user-which-does-not-have-password to development

* commit '06bfc4e9593d07600baa5af6bb30676c0f6ec550':
  Update password change/set dialog
parents 4b5c02cb 859d4591
No related branches found
No related tags found
No related merge requests found
......@@ -61,7 +61,7 @@
<button mat-raised-button color="primary" (click)="changeCurrentUserPassword()"
[disabled]="!dialogForm.valid ">
<mat-icon>check_circle</mat-icon>
<span>Change password</span>
<span>Set/change password</span>
</button>
<button *ngIf="!this.forceChange" mat-raised-button color="primary" mat-dialog-close>
<mat-icon>cancel</mat-icon>
......
......@@ -16,7 +16,7 @@ import {UserRo} from "../../../user/user-ro.model";
})
export class PasswordChangeDialogComponent {
formTitle = "Change password dialog";
formTitle = "Set/Change password dialog";
dialogForm: FormGroup;
hideCurrPwdFiled: boolean = true;
hideNewPwdFiled: boolean = true;
......@@ -121,9 +121,9 @@ export class PasswordChangeDialogComponent {
showPassChangeDialog() {
this.dialog.open(InformationDialogComponent, {
data: {
title: "Password changed!",
description: "Password has been successfully changed. " +
(!this.adminUser ? "Login again to the application with the new password!" : "")
title: "Password set/changed!",
description: "Password has been successfully set/changed." +
(!this.adminUser ? " Login again to the application with the new password!" : "")
}
}).afterClosed().subscribe(result => {
if (!this.adminUser) {
......
......@@ -70,8 +70,8 @@
</mat-form-field>
</div>
<button mat-flat-button color="primary" style="width: 100%" id="changePassword_id"
(click)="changeCurrentUserPassword()">
<span>Change password</span>
(click)="changeCurrentUserPassword()" [disabled]="!editMode">
<span>Set/change password</span>
</button>
</fieldset>
</mat-card-content>
......@@ -112,7 +112,7 @@
maxlength="255" disabled>
</mat-form-field>
</div>
<button mat-flat-button color="primary" style="width: 100%" (click)="regenerateAccessToken()">
<button mat-flat-button color="primary" style="width: 100%" [disabled]="!editMode" (click)="regenerateAccessToken()">
<span>Regenerate access token</span>
</button>
</fieldset>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment