From 475c7e27e9db3c6c29f71db8be4a90f1d1beb9b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Mon, 20 Apr 2015 17:21:40 +0200 Subject: [PATCH] [Backport] Issue #2583: Use us.is_closed instead us.status.is_closed in US detail page --- app/coffee/modules/issues/detail.coffee | 5 ++++- app/coffee/modules/tasks/detail.coffee | 5 ++++- app/partials/common/components/status-display.jade | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/coffee/modules/issues/detail.coffee b/app/coffee/modules/issues/detail.coffee index 2be4c7d7..7db1ecf4 100644 --- a/app/coffee/modules/issues/detail.coffee +++ b/app/coffee/modules/issues/detail.coffee @@ -159,8 +159,11 @@ IssueStatusDisplayDirective = ($template)-> link = ($scope, $el, $attrs) -> render = (issue) -> + status = $scope.statusById[issue.status] + html = template({ - status: $scope.statusById[issue.status] + is_closed: status.is_closed + status: status }) $el.html(html) diff --git a/app/coffee/modules/tasks/detail.coffee b/app/coffee/modules/tasks/detail.coffee index 353fbaff..8f6bb6b8 100644 --- a/app/coffee/modules/tasks/detail.coffee +++ b/app/coffee/modules/tasks/detail.coffee @@ -159,8 +159,11 @@ TaskStatusDisplayDirective = ($template) -> link = ($scope, $el, $attrs) -> render = (task) -> + status = $scope.statusById[task.status] + html = template({ - status: $scope.statusById[task.status] + is_closed: status.is_closed + status: status }) $el.html(html) diff --git a/app/partials/common/components/status-display.jade b/app/partials/common/components/status-display.jade index fd283835..e42aa074 100644 --- a/app/partials/common/components/status-display.jade +++ b/app/partials/common/components/status-display.jade @@ -1,5 +1,5 @@ span - <% if (status.is_closed) { %> + <% if (is_closed) { %> | Closed <% } else { %> | Open