From ade264f090f65f7bb5b2799326bd8602390e1b5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Wed, 29 Apr 2015 12:56:20 +0200 Subject: [PATCH] Fix related and refered links in us/task/isue detail pages --- app/partials/issue/issues-detail.jade | 9 ++++++--- app/partials/task/task-detail.jade | 13 ++++++++----- app/partials/us/us-detail.jade | 9 ++++++--- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/app/partials/issue/issues-detail.jade b/app/partials/issue/issues-detail.jade index 820cf3b7..c87956c4 100644 --- a/app/partials/issue/issues-detail.jade +++ b/app/partials/issue/issues-detail.jade @@ -12,15 +12,18 @@ div.wrapper(ng-controller="IssueDetailController as ctrl", span.us-number(tg-bo-ref="issue.ref") span.us-name(tg-editable-subject, ng-model="issue", required-perm="modify_issue") - p.us-related-task(ng-if="issue.generated_user_stories.length", translate="ISSUES.PROMOTED") + p.us-related-task(ng-if="issue.generated_user_stories.length") + | {{ 'ISSUES.PROMOTED'|translate }} a(ng-repeat="us in issue.generated_user_stories", tg-check-permission="view_us", href="", tg-bo-title="'#' + us.ref + ' ' + us.subject", tg-nav="project-userstories-detail:project=project.slug, ref=us.ref") span(tg-bo-ref="us.ref") - p.external-reference(ng-if="issue.external_reference", translate="ISSUES.EXTERNAL_REFERENCE") - a(target="_blank", tg-bo-href="issue.external_reference[1]", title="{{'ISSUES.GO_TO_EXTERNAL_REFERENCE' | translate}}") + p.external-reference(ng-if="issue.external_reference") + | {{ 'EXTERNAL_REFERENCE'|translate }} + a(target="_blank", tg-bo-href="issue.external_reference[1]", + title="{{'ISSUES.GO_TO_EXTERNAL_REFERENCE' | translate}}") span {{ issue.external_reference[1] }} p.block-desc-container(ng-show="issue.is_blocked") diff --git a/app/partials/task/task-detail.jade b/app/partials/task/task-detail.jade index bea7e8dd..a1f43b5d 100644 --- a/app/partials/task/task-detail.jade +++ b/app/partials/task/task-detail.jade @@ -18,20 +18,23 @@ div.wrapper(ng-controller="TaskDetailController as ctrl", span.us-number(tg-bo-ref="task.ref") span.us-name(tg-editable-subject, ng-model="task", required-perm="modify_task") - h3.us-related-task(translate="TASK.OWNER_US") + h3.us-related-task(ng-if="us") + | {{ 'TASK.OWNER_US'|translate }} a(tg-check-permission="view_us", href="", title="{{'TASK.TITLE_LINK_GO_OWNER' | translate}}", - tg-nav="project-userstories-detail:project=project.slug, ref=us.ref", - ng-if="us") + tg-nav="project-userstories-detail:project=project.slug, ref=us.ref") span(tg-bo-ref="us.ref") span(tg-bo-bind="us.subject") - p.external-reference(ng-if="task.external_reference", translate="TASK.ORIGIN_US") - a(target="_blank", tg-bo-href="task.external_reference[1]", title="{{'TASK.TITLE_LINK_GO_ORIGIN' | translate}}") + p.external-reference(ng-if="task.external_reference") + a(target="_blank", tg-bo-href="task.external_reference[1]", + title="{{'TASK.TITLE_LINK_GO_ORIGIN' | translate}}") + | {{ "TASK.ORIGIN_US"| translate }} span {{ task.external_reference[1] }} p.block-desc-container(ng-show="task.is_blocked") span.block-description-title(translate="COMMON.BLOCKED") span.block-description(ng-bind="task.blocked_note || ('TASK.BLOCKED_DESCRIPTION' | translate)") + div.issue-nav a.icon.icon-arrow-left(ng-show="previousUrl", tg-bo-href="previousUrl", title="{{'TASK.PREVIOUS' | translate}}") diff --git a/app/partials/us/us-detail.jade b/app/partials/us/us-detail.jade index 43177786..f930e9e7 100644 --- a/app/partials/us/us-detail.jade +++ b/app/partials/us/us-detail.jade @@ -18,14 +18,17 @@ div.wrapper(ng-controller="UserStoryDetailController as ctrl", span.us-number(tg-bo-ref="us.ref") span.us-name(tg-editable-subject, ng-model="us", required-perm="modify_us") - p.us-related-task(ng-if="us.origin_issue", translate="US.PROMOTED") + p.us-related-task(ng-if="us.origin_issue") + | {{ 'US.PROMOTED'|translate }} a(tg-check-permission="view_us", href="", title="{{'US.TITLE_LINK_GO_TO_ISSUE' | translate}}", tg-nav="project-issues-detail:project=project.slug, ref=us.origin_issue.ref" tg-bo-title="'#' + us.origin_issue.ref + ' ' + us.origin_issue.subject") span(tg-bo-ref="us.origin_issue.ref") - p.external-reference(ng-if="us.external_reference", translate="US.EXTERNAL_REFERENCE") - a(target="_blank", tg-bo-href="us.external_reference[1]", title="{{'US.GO_TO_EXTERNAL_REFERENCE' | translate}}") + p.external-reference(ng-if="us.external_reference") + | {{ 'US.EXTERNAL_REFERENCE'|translate }} + a(target="_blank", tg-bo-href="us.external_reference[1]", + title="{{'US.GO_TO_EXTERNAL_REFERENCE' | translate}}") span {{ us.external_reference[1] }} p.block-desc-container(ng-show="us.is_blocked")