This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-1964 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit b05969a81ecc3ab9b319a40a3ece6a20e48b6603 Author: Dmytro_Gnatyshyn <[email protected]> AuthorDate: Mon Aug 3 11:58:41 2020 +0300 [DLAB-1964]: Fixed bug in total quota --- .../manage-environment/manage-environment-dilog.component.html | 9 +++++++-- .../manage-environment/manage-environment-dilog.component.ts | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.html index 18aa544..ed3cc91 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.html @@ -49,8 +49,11 @@ <input type="number" (keypress)="CheckUtils.numberOnly($event)" min="0" placeholder="Enter limit, in USD" formControlName="budget"> <span class="error" - *ngIf="manageUsersForm?.controls['projects']['controls'][i].controls['budget'].hasError('overrun')">Projects - quotes cannot be greater than total budget</span> + *ngIf="manageUsersForm?.controls['projects']['controls'][i].controls['budget'].hasError('overrun') && + !manageUsersForm?.controls['projects']['controls'][i].controls['budget'].hasError('max')" + > + Projects budget cannot be higher than total budget + </span> <span class="error" *ngIf="manageUsersForm?.controls['projects']['controls'][i].controls['budget'].hasError('max')">Project budget cannot be higher than 1000000000</span> </div> @@ -62,6 +65,8 @@ <div class="username ellipsis"> <span class="ellipsis">Total budget</span> </div> + <div class="period"> + </div> <div class="quotes"> <input type="number" (keypress)="CheckUtils.numberOnly($event)" formControlName="total" placeholder="Enter total budget, in USD"> diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.ts index ce29827..f2f1cf7 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.ts @@ -60,7 +60,8 @@ export class ManageEnvironmentComponent implements OnInit { this.isFormChanged = JSON.stringify(this.initialFormState) === JSON.stringify(this.manageUsersForm.value); if ((this.getCurrentTotalValue() && this.getCurrentTotalValue() >= this.getCurrentUsersTotal())) { this.manageUsersForm.controls['projects']['controls'].forEach(v => { - v.controls['budget'].setErrors(null); + v.controls['budget'].errors && + 'max' in v.controls['budget'].errors ? null : v.controls['budget'].setErrors(null); } ); this.manageUsersForm.controls['total'].setErrors(null); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
