Merge branch 'staging' into azure-initial-mgmt-grp

2020-02-11 11:06:28 -05:00
parent ccbc61f34f 8ee7cdc1cb
commit 17b281b11a
21 changed files with 131 additions and 98 deletions
--- a/atst/models/task_order.py
+++ b/atst/models/task_order.py
@@ -25,7 +25,6 @@ SORT_ORDERING = [
    Status.DRAFT,
    Status.UPCOMING,
    Status.EXPIRED,
-    Status.UNSIGNED,
 ]


@@ -148,7 +147,10 @@ class TaskOrder(Base, mixins.TimestampsMixin):

    @property
    def display_status(self):
-        return self.status.value
+        if self.status == Status.UNSIGNED:
+            return Status.DRAFT.value
+        else:
+            return self.status.value

    @property
    def portfolio_name(self):