You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by hs...@apache.org on 2022/06/29 16:43:30 UTC
[incubator-datalab] branch feat/DATALAB-2781/share-one-image-with-all-project-users created (now 1749eb72b)
This is an automated email from the ASF dual-hosted git repository.
hshpak pushed a change to branch feat/DATALAB-2781/share-one-image-with-all-project-users
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
at 1749eb72b minor fixes
This branch includes the following new commits:
new 1749eb72b minor fixes
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@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 01/01: minor fixes
Posted by hs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hshpak pushed a commit to branch feat/DATALAB-2781/share-one-image-with-all-project-users
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 1749eb72be030b0ba8e4cd32fd5abdd9c43e5ca4
Author: Hennadii_Shpak <bo...@gmail.com>
AuthorDate: Wed Jun 29 19:43:17 2022 +0300
minor fixes
---
.../project/project-list/project-list.component.ts | 11 +++++------
.../webapp/src/app/resources/images/images.component.html | 8 +++++---
2 files changed, 10 insertions(+), 9 deletions(-)
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 0086cb918..85c4e80ba 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
@@ -34,9 +34,12 @@ import { EndpointStatus } from '../project.config';
@Component({
selector: 'project-list',
templateUrl: './project-list.component.html',
- styleUrls: ['./project-list.component.scss', '../../../resources/computational/computational-resources-list/computational-resources-list.component.scss']
+ styleUrls: [
+ './project-list.component.scss',
+ '../../../resources/computational/computational-resources-list/computational-resources-list.component.scss'
+ ]
})
-export class ProjectListComponent implements OnInit, OnDestroy, AfterViewInit {
+export class ProjectListComponent implements OnInit, OnDestroy {
@Input() isProjectAdmin: boolean;
@Output() editItem: EventEmitter<{}> = new EventEmitter();
@Output() toggleStatus: EventEmitter<{}> = new EventEmitter();
@@ -65,10 +68,6 @@ export class ProjectListComponent implements OnInit, OnDestroy, AfterViewInit {
this.getEndpointList();
}
- ngAfterViewInit(): void {
-
- }
-
ngOnDestroy(): void {
this.subscriptions.unsubscribe();
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.html
index e239fe1e7..17677103a 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.html
@@ -191,7 +191,7 @@
<td mat-cell *matCellDef="let element">
<div class="shared-status--wrapper">
<span class="shared-status"> {{element.shared ? sharedStatus.shared : sharedStatus.private}} </span>
- <span class="currency_details" >
+ <span *ngIf="element.shared" class="currency_details" >
<i class="material-icons">help_outline</i>
</span>
</div>
@@ -243,9 +243,11 @@
<span>Terminate</span>
</button>
</li>
- <li [matTooltip]="'This image cannot be shared by you. Contact Admin user'"
+ <li [matTooltip]="element.status !== 'CREATED' && 'This image cannot be shared by you. Contact Admin user'
+ || userName !== element.user && 'Images may be shared by owners only. Please contact Admin user.'"
matTooltipPosition="above"
- [matTooltipDisabled]="userName === element.user && element.status === 'CREATED'">
+ [matTooltipDisabled]="userName === element.user && element.status === 'CREATED'"
+ >
<button
class="action-button__share"
(click)="onShare(element)"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org