From 8a813d9ac34e63ded41187f24d6056c7576aef45 Mon Sep 17 00:00:00 2001 From: richard-dds Date: Wed, 29 Aug 2018 12:53:15 -0400 Subject: [PATCH] Display workspace link for approved requests --- atst/models/request.py | 2 ++ atst/routes/requests/index.py | 1 + templates/requests.html | 10 +++++++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/atst/models/request.py b/atst/models/request.py index 9180e85e..b8d51756 100644 --- a/atst/models/request.py +++ b/atst/models/request.py @@ -17,6 +17,8 @@ class Request(Base): "RequestStatusEvent", backref="request", order_by="RequestStatusEvent.sequence" ) + workspace = relationship("Workspace", uselist=False, back_populates="request") + user_id = Column(ForeignKey("users.id"), nullable=False) creator = relationship("User") diff --git a/atst/routes/requests/index.py b/atst/routes/requests/index.py index 25ecfe3f..18ed0056 100644 --- a/atst/routes/requests/index.py +++ b/atst/routes/requests/index.py @@ -22,6 +22,7 @@ def map_request(request): ) return { + "workspace_id": request.workspace.id if request.workspace else None, "order_id": request.id, "is_new": is_new, "status": request.status_displayname, diff --git a/templates/requests.html b/templates/requests.html index 31f2c7d1..edb6f7d8 100644 --- a/templates/requests.html +++ b/templates/requests.html @@ -116,7 +116,15 @@ {% endif %} {{ r['annual_usage'] | dollars }} - {{ r['status'] }} + + {% if r.status == 'Approved' %} + + {{ r.status }} + + {% else %} + {{ r.status }} + {% endif %} + {% endfor %}