You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/12/20 11:28:22 UTC
[incubator-dlab] branch DLAB-1410 updated: [DLAB-1112]: added
shared ami controls to project create/edit form
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1410
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1410 by this push:
new e6d3c61 [DLAB-1112]: added shared ami controls to project create/edit form
e6d3c61 is described below
commit e6d3c614177d5d859feb102fe435cd5af9f42b93
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Fri Dec 20 13:29:15 2019 +0200
[DLAB-1112]: added shared ami controls to project create/edit form
---
.../project/project-form/project-form.component.html | 9 +++------
.../project/project-form/project-form.component.ts | 5 ++---
.../webapp/src/app/administration/project/project.component.ts | 2 +-
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html
index 4f3730a..cf2ab5a 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html
@@ -160,14 +160,11 @@
</div>
</div>
<div class="text-center m-bott-10">
-
- <!-- TODO: return after back-end part will be fully completed -->
- <!-- <div class="control-group">
- <mat-slide-toggle formControlName="shared_image_enabled" labelPosition="after" [disabled]="item">
+ <div class="control-group">
+ <mat-slide-toggle formControlName="shared_image_enabled" labelPosition="after">
<span class="hold-label">Use shared image</span>
</mat-slide-toggle>
- </div> -->
-
+ </div>
<button mat-raised-button type="button" class="butt" [disabled]="item" (click)="reset()">Clear</button>
<button mat-raised-button matStepperPrevious class="butt"><i
class="material-icons">keyboard_arrow_left</i>Back</button>
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts
index afbd3c2..c22988a 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts
@@ -141,7 +141,6 @@ export class ProjectFormComponent implements OnInit {
this.projectForm.controls[key].setValue(select ? filter : []);
}
- // TODO: return shared_image_enabled properties after back-end part will be fully completed
private initFormModel(): void {
this.projectForm = this._fb.group({
@@ -150,7 +149,7 @@ export class ProjectFormComponent implements OnInit {
'endpoints': [[], Validators.required],
'tag': ['', Validators.compose([Validators.required, Validators.pattern(PATTERNS.projectName)])],
'groups': [[], Validators.required],
- // 'shared_image_enabled': [false, Validators.required]
+ 'shared_image_enabled': [false, Validators.required]
});
}
@@ -163,7 +162,7 @@ export class ProjectFormComponent implements OnInit {
'endpoints': [endpoints],
'tag': [item.tag, Validators.required],
'groups': [item.groups, Validators.required],
- // 'shared_image_enabled': [item.shared_image_enabled, Validators.required]
+ 'shared_image_enabled': [item.shared_image_enabled, Validators.required]
});
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts
index a501ccc..da7c986 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts
@@ -38,7 +38,7 @@ export interface Project {
endpoints: Endpoint[];
tag: string;
groups: string[];
- // shared_image_enabled?: boolean;
+ shared_image_enabled?: boolean;
}
@Component({
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org