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/10/29 14:45:14 UTC

[incubator-dlab] 01/03: [DLAB-1207]: fixed issue with prevent actions on projects

This is an automated email from the ASF dual-hosted git repository.

ankovalyshyn pushed a commit to branch DLAB-1207
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit f396c7840b26889dc197bdbbf6278c4a6559e65d
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Tue Oct 29 14:14:34 2019 +0200

    [DLAB-1207]: fixed issue with prevent actions on projects
---
 .../administration/project/project-list/project-list.component.html   | 4 ++--
 .../app/administration/project/project-list/project-list.component.ts | 2 +-
 2 files changed, 3 insertions(+), 3 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 9000ef6..41b63d2 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
@@ -83,8 +83,8 @@
         </a>
       </span>
       <span>
-        <a (click)="deleteProject(element)"
-          [ngClass]="{'not-allowed' : isInProgress(element), 'not-allowed' : !isActiveEndpoint(element) }">
+        <a (click)="deleteProject(element)" class="action"
+          [ngClass]="{'not-allowed' : isInProgress(element) || !isActiveEndpoint(element) }">
           <mat-icon>delete_forever</mat-icon>
         </a>
       </span>
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 b5b25b5..57bb378 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
@@ -91,7 +91,7 @@ export class ProjectListComponent implements OnInit, OnDestroy {
 
   public isActiveEndpoint(project) {
     if (project)
-      return project.endpoints.some(e => e.status !== 'TERMINATED')
+      return project.endpoints.some(e => e.status !== 'TERMINATED');
   }
 
   public toEndpointStatus(status) {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org