From 9bdcb7704a644fdf28cf740a386bc1c70403569b Mon Sep 17 00:00:00 2001
From: chausman <chausman@nrao.edu>
Date: Wed, 3 Aug 2022 12:36:56 -0600
Subject: [PATCH] make sure create image and carta buttons don't show up for
unsubmitted versions on request completion
---
.../request-operations/request-operations.component.html | 4 ++--
shared/workspaces/workspaces/capability/schema.py | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/apps/web/src/app/workspaces/components/capability-request/components/request-operations/request-operations.component.html b/apps/web/src/app/workspaces/components/capability-request/components/request-operations/request-operations.component.html
index c6a1486e7..4b3186e6a 100644
--- a/apps/web/src/app/workspaces/components/capability-request/components/request-operations/request-operations.component.html
+++ b/apps/web/src/app/workspaces/components/capability-request/components/request-operations/request-operations.component.html
@@ -13,7 +13,7 @@
*ngIf="
capabilityRequest.state === 'Complete' &&
(capabilityRequest.capability_name === 'std_calibration' ||
- capabilityRequest.capability_name === 'restore_cms')
+ capabilityRequest.capability_name === 'restore_cms') && selectedVersion.current_execution
"
>
<button
@@ -37,7 +37,7 @@
(capabilityRequest.state === 'Complete' ||
(selectedVersion.current_execution && selectedVersion.current_execution.state_name === 'Awaiting QA') ||
(selectedVersion.current_execution && selectedVersion.current_execution.state_name === 'AoD Review')
- )
+ ) && selectedVersion.current_execution
"
>
<button
diff --git a/shared/workspaces/workspaces/capability/schema.py b/shared/workspaces/workspaces/capability/schema.py
index fba824d2b..2ff458fbf 100644
--- a/shared/workspaces/workspaces/capability/schema.py
+++ b/shared/workspaces/workspaces/capability/schema.py
@@ -571,7 +571,6 @@ class QaPass(Action):
f"{version.current_execution.current_workflow_request_id}/qa_fail"
)
-
@staticmethod
def abort_running_execution(version: CapabilityVersion):
"""
--
GitLab