This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push:
new a4b0fdd [DLAB-2033]: Prevented possibility to edit project for admin
per project (#899)
a4b0fdd is described below
commit a4b0fdd5a27912cf80df9652d4c0db157079984c
Author: Dmytro Gnatyshyn <[email protected]>
AuthorDate: Fri Sep 11 13:52:26 2020 +0300
[DLAB-2033]: Prevented possibility to edit project for admin per project
(#899)
[DLAB-2033]: Prevented possibility to edit project for admin per project
---
.../administration/project/project-list/project-list.component.html | 2 +-
.../app/administration/project/project-list/project-list.component.ts | 3 ++-
.../webapp/src/app/administration/project/project.component.html | 2 +-
.../exploratory/install-libraries/install-libraries.component.ts | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html
b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html
index ef03098..ef82f31 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html
@@ -89,7 +89,7 @@
Terminate edge node
</a>
</li>
- <li class="project-seting-item" (click)="editProject(element)">
+ <li class="project-seting-item" (click)="editProject(element)"
*ngIf="!isProjectAdmin">
<i class="material-icons">mode_edit</i>
<a >
Edit project
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts
b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts
index 9238b7f..5d20373 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import {Component, OnInit, Output, EventEmitter, OnDestroy, Inject} from
'@angular/core';
+import {Component, OnInit, Output, EventEmitter, OnDestroy, Inject, Input}
from '@angular/core';
import { ToastrService } from 'ngx-toastr';
import { MatTableDataSource } from '@angular/material/table';
import { Subscription } from 'rxjs';
@@ -42,6 +42,7 @@ export class ProjectListComponent implements OnInit,
OnDestroy {
dataSource: Project[] | any = [];
projectList: Project[];
+ @Input() isProjectAdmin: boolean;
@Output() editItem: EventEmitter<{}> = new EventEmitter();
@Output() toggleStatus: EventEmitter<{}> = new EventEmitter();
private subscriptions: Subscription = new Subscription();
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html
b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html
index 98ea6aa..2b6f48d 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html
@@ -51,7 +51,7 @@
</mat-card>
<div [hidden]="!projectList.length">
- <project-list (editItem)="editProject($event)"
(toggleStatus)="toggleStatus($event)">
+ <project-list (editItem)="editProject($event)"
(toggleStatus)="toggleStatus($event)" [isProjectAdmin]="!healthStatus?.admin &&
healthStatus?.projectAdmin">
</project-list>
</div>
</div>
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
index 811a0f9..7c9dec1 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
@@ -439,7 +439,7 @@ export class InstallLibrariesComponent implements OnInit,
OnDestroy {
this.getMatchedLibs();
});
}
- this.autoComplete = 'NONE';
+ this.autoComplete = libs.autoComplete;
this.filteredList = libs.libraries;
this.filteredList.forEach(lib => {
lib.isInSelectedList = this.model.selectedLibs.some(el =>
el.name.toLowerCase() === lib.name.toLowerCase());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
