This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch DLAB-1150 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit fbad0067a8613c0ff393e21471e3bc4950cd5271 Author: Andriana Kovalyshyn <[email protected]> AuthorDate: Mon Sep 30 13:50:21 2019 +0300 [DLAB-1150]: group adding order creation changed --- .../app/administration/roles/roles.component.html | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html index fcba45d..100406a 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html @@ -46,6 +46,19 @@ </div> </mat-step> <mat-step> + <ng-template matStepLabel>Users</ng-template> + <div class="inner-step mat-reset"> + <input type="text" placeholder="Enter user login" [(ngModel)]="setupUser"> + </div> + <div class="text-center m-bott-10"> + <button mat-raised-button matStepperPrevious class="butt"><i + class="material-icons">keyboard_arrow_left</i>Back</button> + <button mat-raised-button (click)="resetDialog()" class="butt">Cancel</button> + <button mat-raised-button (click)="manageAction('create', 'group')" class="butt butt-success" + [disabled]="!setupGroup || setupGroupName.errors?.patterns || setupGroupName.errors?.duplicate || !setupRoles.length > 0">Create</button> + </div> + </mat-step> + <mat-step> <ng-template matStepLabel>Roles</ng-template> <div class="inner-step mat-reset"> <div class="selector-wrapper"> @@ -78,19 +91,6 @@ class="material-icons">keyboard_arrow_right</i></button> </div> </mat-step> - <mat-step> - <ng-template matStepLabel>Users</ng-template> - <div class="inner-step mat-reset"> - <input type="text" placeholder="Enter user login" [(ngModel)]="setupUser"> - </div> - <div class="text-center m-bott-10"> - <button mat-raised-button matStepperPrevious class="butt"><i - class="material-icons">keyboard_arrow_left</i>Back</button> - <button mat-raised-button (click)="resetDialog()" class="butt">Cancel</button> - <button mat-raised-button (click)="manageAction('create', 'group')" class="butt butt-success" - [disabled]="!setupGroup || setupGroupName.errors?.patterns || setupGroupName.errors?.duplicate || !setupRoles.length > 0">Create</button> - </div> - </mat-step> </mat-horizontal-stepper> </mat-card> <mat-divider></mat-divider> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
