From 01c8e530263bf2ba6ed1732786e39d970d965f34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Fri, 26 Jun 2015 13:10:08 +0200 Subject: [PATCH] Fix created by section --- app/coffee/modules/common/components.coffee | 10 ++++++---- app/partials/common/components/created-by.jade | 6 ++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/coffee/modules/common/components.coffee b/app/coffee/modules/common/components.coffee index c96ae3ae..a57a5972 100644 --- a/app/coffee/modules/common/components.coffee +++ b/app/coffee/modules/common/components.coffee @@ -152,7 +152,7 @@ module.directive("tgSprintProgressbar", SprintProgressBarDirective) ## Created-by display directive ############################################################################# -CreatedByDisplayDirective = ($template, $compile, $translate)-> +CreatedByDisplayDirective = ($template, $compile, $translate, $navUrls)-> # Display the owner information (full name and photo) and the date of # creation of an object (like USs, tasks and issues). # @@ -168,13 +168,14 @@ CreatedByDisplayDirective = ($template, $compile, $translate)-> link = ($scope, $el, $attrs) -> render = (model) -> - owner = $scope.usersById?[model.owner] or { + owner = model.owner_extra_info or { full_name_display: $translate.instant("COMMON.EXTERNAL_USER") - photo: "/images/unnamed.png" + photo: "/images/user-noimage.png" } html = template({ owner: owner + url: if owner?.is_active then $navUrls.resolve("user-profile", {username: owner.username}) else "" date: moment(model.created_date).format($translate.instant("COMMON.DATETIME")) }) @@ -194,7 +195,8 @@ CreatedByDisplayDirective = ($template, $compile, $translate)-> require: "ngModel" } -module.directive("tgCreatedByDisplay", ["$tgTemplate", "$compile", "$translate", CreatedByDisplayDirective]) +module.directive("tgCreatedByDisplay", ["$tgTemplate", "$compile", "$translate", "$tgNavUrls", + CreatedByDisplayDirective]) ############################################################################# diff --git a/app/partials/common/components/created-by.jade b/app/partials/common/components/created-by.jade index e9f74f06..03ed8980 100644 --- a/app/partials/common/components/created-by.jade +++ b/app/partials/common/components/created-by.jade @@ -1,7 +1,9 @@ .user-avatar - img(src!="<%- owner.photo %>", alt!="<%- owner.full_name_display %>") + a(href!="<%- url %>", title!="<%- owner.full_name_display %>") + img(src!="<%- owner.photo %>", alt!="<%- owner.full_name_display %>") .created-by - span.created-title(translate="COMMON.CREATED_BY", translate-values!="{ 'fullDisplayName': '<%- owner.full_name_display %>'}") + a(href!="<%- url %>", title!="<%- owner.full_name_display %>") + span.created-title(translate="COMMON.CREATED_BY", translate-values!="{ 'fullDisplayName': '<%- owner.full_name_display %>'}") span.created-date | <%- date %>