This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-1902 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit f9d2a9ba5f416b893ea23e56eb6ef55deeee8494 Author: Dmytro_Gnatyshyn <[email protected]> AuthorDate: Fri Jul 3 17:56:26 2020 +0300 [DLAB-1902]: Support quota per month(UI) --- .../manage-environment/manage-environment-dilog.component.html | 2 +- .../manage-environment/manage-environment-dilog.component.ts | 6 ++---- 2 files changed, 3 insertions(+), 5 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 f41d9cf..aa78f05 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 @@ -43,7 +43,7 @@ </div> <div class="period"> <!-- <mat-slide-toggle formControlName="shared_image_enabled" labelPosition="after">--> - <mat-slide-toggle formControlName="setPerMonth"> + <mat-slide-toggle formControlName="is_monthly_budget"> <!-- <span class="hold-label">Per month</span>--> </mat-slide-toggle> </div> 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 78e0bc6..6f9f018 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 @@ -93,10 +93,8 @@ export class ManageEnvironmentComponent implements OnInit { this.manageUsersForm.setControl('projects', this._fb.array((this.data.projectsList || []).map((x: any) => this._fb.group({ project: x.name, - budget: [x.budget, [ this.userValidityCheck.bind(this)]], - setPerMonth: x.setPerMonth || true, - canBeStopped: x.canBeStopped, - canBeTerminated: x.canBeTerminated + budget: [x.budget.value, [ this.userValidityCheck.bind(this)]], + is_monthly_budget: x.budget.is_monthly_budget, })))); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
