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/03/21 11:33:58 UTC
[incubator-dlab] branch DLAB-378_2 created (now 49bd075)
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a change to branch DLAB-378_2
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at 49bd075 [DLAB-378]: fixed issue with edge node action selectors
This branch includes the following new commits:
new 49bd075 [DLAB-378]: fixed issue with edge node action selectors
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/01: [DLAB-378]: fixed issue with edge node
action selectors
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-378_2
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 49bd075e68b42fd06320acc341f2519aabd0fbc3
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Thu Mar 21 13:25:45 2019 +0200
[DLAB-378]: fixed issue with edge node action selectors
---
.../app/management/management-grid/management-grid.component.html | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.html
index 86ab66f..5cd939b 100644
--- a/services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.html
@@ -62,12 +62,16 @@
</td>
<td class="settings">
<span #settings class="actions" (click)="actions.toggle($event, settings)"
- [ngClass]="{ 'disabled' : !uploadKey || env.status !== 'running' && env.status !== 'stopped' && env.status !== 'stopping' }"></span>
+ [ngClass]="{ 'disabled' : !uploadKey
+ || (env.status !== 'running' && env.status !== 'stopped' && env.status !== 'stopping')
+ || (env.name === 'edge node' && env.user === currentUser && env.status === 'stopping')
+ || env.name === 'edge node' && env.user !== currentUser && env.status.toLowerCase() !== 'running' }"></span>
<bubble-up #actions class="list-menu" position="bottom-left" alternative="top-left">
<ul class="list-unstyled">
<li matTooltip="{{ env.name !== 'edge node' ? 'Unable to stop notebook because at least one computational resource is in progress' : 'Unable to stop edge node because at least one resource of this user is in progress' }}"
matTooltipPosition="above"
- [matTooltipDisabled]="!isResourcesInProgress(env)" [hidden]="env.name === 'edge node' && env.status.toLowerCase() !== 'running'">
+ [matTooltipDisabled]="!isResourcesInProgress(env)"
+ [hidden]="env.name === 'edge node' && env.status.toLowerCase() === 'stopped'">
<div (click)="toggleResourceAction(env, 'stop')"
[ngClass]="{'not-allowed' : env.status === 'stopped' || env.status === 'stopping' || env.status === 'starting' || env.status === 'creating image' || isResourcesInProgress(env)}">
<i class="material-icons">pause_circle_outline</i>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org