diff --git a/atst/domain/workspaces/workspaces.py b/atst/domain/workspaces/workspaces.py index 61996955..df2275a5 100644 --- a/atst/domain/workspaces/workspaces.py +++ b/atst/domain/workspaces/workspaces.py @@ -11,7 +11,7 @@ from .scopes import ScopedWorkspace class Workspaces(object): @classmethod def create(cls, request, name=None): - name = name or request.id + name = name or request.displayname workspace = WorkspacesQuery.create(request=request, name=name) Workspaces._create_workspace_role(request.creator, workspace, "owner") WorkspacesQuery.add_and_commit(workspace) diff --git a/atst/models/request.py b/atst/models/request.py index f910f40b..d43e2c5f 100644 --- a/atst/models/request.py +++ b/atst/models/request.py @@ -213,3 +213,7 @@ class Request(Base): or self.is_pending_financial_verification_changes or self.is_approved ) and self.task_order + + @property + def displayname(self): + return self.latest_revision.name or self.id diff --git a/atst/routes/requests/index.py b/atst/routes/requests/index.py index a59b1f45..b348dec7 100644 --- a/atst/routes/requests/index.py +++ b/atst/routes/requests/index.py @@ -81,7 +81,7 @@ class RequestsIndex(object): return { "workspace_id": request.workspace.id if request.workspace else None, - "order_id": request.id, + "name": request.displayname, "is_new": is_new, "status": request.status_displayname, "app_count": app_count, diff --git a/templates/requests/_review.html b/templates/requests/_review.html index e48f27d0..2bf0d665 100644 --- a/templates/requests/_review.html +++ b/templates/requests/_review.html @@ -80,6 +80,8 @@ {{ DefinitionReviewField("Total Spend", "details_of_use", "dollar_value", filter="dollars") }} {{ DefinitionReviewField("Start Date", "details_of_use", "start_date") }} + + {{ DefinitionReviewField("Request Name", "details_of_use", "name") }}
JEDI Cloud Request ID | +JEDI Cloud Request Name | Date Request Submitted | {% if extended_view %}Date Request Last Edited | @@ -107,7 +107,7 @@ {% for r in requests %}
---|---|---|---|
- {{ r.order_id }} + {{ r.name }} {% if r.action_required %}Action Required{% endif %} | {{ r.last_submission_timestamp | formattedDate }} | diff --git a/tests/domain/test_workspaces.py b/tests/domain/test_workspaces.py index 5ff8aa69..06d3f836 100644 --- a/tests/domain/test_workspaces.py +++ b/tests/domain/test_workspaces.py @@ -35,8 +35,8 @@ def test_request_is_associated_with_workspace(workspace, request_): assert workspace.request == request_ -def test_default_workspace_name_is_request_id(workspace, request_): - assert workspace.name == str(request_.id) +def test_default_workspace_name_is_request_name(workspace, request_): + assert workspace.name == str(request_.displayname) def test_get_nonexistent_workspace_raises():