Display workspace link for approved requests

This commit is contained in:
richard-dds 2018-08-29 12:53:15 -04:00
parent 60275f8c3a
commit 8a813d9ac3
3 changed files with 12 additions and 1 deletions

View File

@ -17,6 +17,8 @@ class Request(Base):
"RequestStatusEvent", backref="request", order_by="RequestStatusEvent.sequence" "RequestStatusEvent", backref="request", order_by="RequestStatusEvent.sequence"
) )
workspace = relationship("Workspace", uselist=False, back_populates="request")
user_id = Column(ForeignKey("users.id"), nullable=False) user_id = Column(ForeignKey("users.id"), nullable=False)
creator = relationship("User") creator = relationship("User")

View File

@ -22,6 +22,7 @@ def map_request(request):
) )
return { return {
"workspace_id": request.workspace.id if request.workspace else None,
"order_id": request.id, "order_id": request.id,
"is_new": is_new, "is_new": is_new,
"status": request.status_displayname, "status": request.status_displayname,

View File

@ -116,7 +116,15 @@
<td></td> <td></td>
{% endif %} {% endif %}
<td>{{ r['annual_usage'] | dollars }}</td> <td>{{ r['annual_usage'] | dollars }}</td>
<td>{{ r['status'] }}</td> <td>
{% if r.status == 'Approved' %}
<a href="{{ url_for('workspaces.workspace_projects', workspace_id=r.workspace_id) }}">
{{ r.status }}
</a>
{% else %}
{{ r.status }}
{% endif %}
</td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>