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/11/29 13:20:22 UTC
[incubator-dlab] branch DLAB-1112 updated: [DLAB-1112]: added
shared image usage parameter on project creation
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1112
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1112 by this push:
new 2770760 [DLAB-1112]: added shared image usage parameter on project creation
2770760 is described below
commit 277076060eaf86b1a42cd63f6c67b3dca2dd2172
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Fri Nov 29 15:19:17 2019 +0200
[DLAB-1112]: added shared image usage parameter on project creation
---
.../project/project-form/project-form.component.html | 12 ++++++++++--
.../project/project-form/project-form.component.ts | 6 ++++--
.../src/app/administration/project/project.component.ts | 1 +
3 files changed, 15 insertions(+), 4 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 497b928..07c1582 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
@@ -92,7 +92,8 @@
<label class="label">Endpoints</label>
<div class="control selector-wrapper">
<mat-form-field>
- <mat-select multiple formControlName="endpoints" placeholder="Select endpoints" panelClass="crete-project-dialog">
+ <mat-select multiple formControlName="endpoints" placeholder="Select endpoints"
+ panelClass="crete-project-dialog">
<mat-option class="multiple-select" disabled>
<a class="select ani" (click)="selectOptions(endpointsList, 'endpoints', 'all')">
<i class="material-icons">playlist_add_check</i> All
@@ -136,7 +137,8 @@
<label class="label">Groups</label>
<div class="control selector-wrapper">
<mat-form-field>
- <mat-select multiple formControlName="groups" placeholder="Select user groups" panelClass="crete-project-dialog">
+ <mat-select multiple formControlName="groups" placeholder="Select user groups"
+ panelClass="crete-project-dialog">
<mat-option class="multiple-select" disabled>
<a class="select ani" (click)="selectOptions(groupsList, 'groups', 'all')">
<i class="material-icons">playlist_add_check</i> All
@@ -158,6 +160,12 @@
</div>
</div>
<div class="text-center m-bott-10">
+ <div class="control-group">
+ <mat-slide-toggle formControlName="shared_image_enabled" labelPosition="after" [disabled]="item">
+ <span class="hold-label">Use shared image</span>
+ </mat-slide-toggle>
+ </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 009456c..8bfae94 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
@@ -147,7 +147,8 @@ export class ProjectFormComponent implements OnInit {
'name': ['', Validators.compose([Validators.required, Validators.pattern(PATTERNS.projectName), this.checkDuplication.bind(this), this.providerMaxLength.bind(this)])],
'endpoints': [[], Validators.required],
'tag': ['', Validators.compose([Validators.required, Validators.pattern(PATTERNS.projectName)])],
- 'groups': [[], Validators.required]
+ 'groups': [[], Validators.required],
+ 'shared_image_enabled': [false, Validators.required]
});
}
@@ -159,7 +160,8 @@ export class ProjectFormComponent implements OnInit {
'name': [item.name, Validators.required],
'endpoints': [endpoints],
'tag': [item.tag, Validators.required],
- 'groups': [item.groups, Validators.required]
+ 'groups': [item.groups, 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 9c7dae6..50c7b80 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,6 +38,7 @@ export interface Project {
endpoints: Endpoint[];
tag: string;
groups: string[];
+ shared_image_enabled?: boolean;
}
@Component({
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org