You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by dy...@apache.org on 2022/08/29 13:43:16 UTC
[incubator-datalab] 01/01: allow to terminate failed images
This is an automated email from the ASF dual-hosted git repository.
dyankiv pushed a commit to branch DATALAB-3002
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 14736c91085e45fc316aca326084275de013286f
Author: Denys Yankiv <de...@gmail.com>
AuthorDate: Mon Aug 29 16:42:37 2022 +0300
allow to terminate failed images
---
.../service/impl/ImageExploratoryServiceImpl.java | 23 +++++++++++-----------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ImageExploratoryServiceImpl.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ImageExploratoryServiceImpl.java
index 5859bb62e..b86ad1f02 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ImageExploratoryServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ImageExploratoryServiceImpl.java
@@ -349,20 +349,19 @@ public class ImageExploratoryServiceImpl implements ImageExploratoryService {
@Override
public ImageUserPermissions getUserImagePermissions(UserInfo userInfo, ImageInfoRecord image) {
- boolean canShare;
- boolean canTerminate;
-
- if(!image.getStatus().equals(ImageStatus.ACTIVE)){
- return new ImageUserPermissions(false,false);
+ boolean canShare = false;
+ boolean canTerminate = (image.getStatus().equals(ImageStatus.ACTIVE) || image.getStatus().equals(ImageStatus.FAILED)) &&
+ (image.getUser().equals(userInfo.getName())
+ && UserRoles.checkAccess(userInfo, RoleType.PAGE, TERMINATE_OWN_IMAGES_PAGE, userInfo.getRoles()));
+
+ if(image.getStatus().equals(ImageStatus.ACTIVE) ){
+ if(image.getUser().equals(userInfo.getName())){
+ canShare = UserRoles.checkAccess(userInfo, RoleType.PAGE, SHARE_OWN_IMAGES_PAGE,userInfo.getRoles());
+ } else {
+ canShare = UserRoles.checkAccess(userInfo, RoleType.PAGE, SHARE_RECEIVED_IMAGES_PAGE,userInfo.getRoles());
+ }
}
- if(image.getUser().equals(userInfo.getName())){
- canShare = UserRoles.checkAccess(userInfo, RoleType.PAGE, SHARE_OWN_IMAGES_PAGE,userInfo.getRoles());
- canTerminate = UserRoles.checkAccess(userInfo, RoleType.PAGE, TERMINATE_OWN_IMAGES_PAGE,userInfo.getRoles());
- } else {
- canShare = UserRoles.checkAccess(userInfo, RoleType.PAGE, SHARE_RECEIVED_IMAGES_PAGE,userInfo.getRoles());
- canTerminate = false;
- }
return new ImageUserPermissions(canShare,canTerminate);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org