From 1687bde95c3d2ea6c30022eb78e170a28f440c2a Mon Sep 17 00:00:00 2001 From: Juanfran Date: Fri, 8 May 2015 08:27:07 +0200 Subject: [PATCH] fix profile timeline attachments --- app/locales/locale-en.json | 6 +++--- .../profile-timeline-attachment.directive.coffee | 6 +++--- .../profile-timeline-item/profile-timeline-item.jade | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/locales/locale-en.json b/app/locales/locale-en.json index 59f10abc..623326df 100644 --- a/app/locales/locale-en.json +++ b/app/locales/locale-en.json @@ -1149,9 +1149,9 @@ "WIKI_CREATED": "{{username}} has created a new Wiki page in {{project_name}} {{obj_name}}", "NEW_PROJECT": "{{username}} has a new project {{project_name}}", "MILESTONE_UPDATED": "{{username}} has updated the milestone {{obj_name}}", - "US_UPDATED": "{{username}} has updated the field \"{{field_name}}\" of the US {{obj_name}}", - "ISSUE_UPDATED": "{{username}} has updated the field \"{{field_name}}\" of the Issue {{obj_name}}", - "TASK_UPDATED": "{{username}} has updated the field \"{{field_name}}\" of the Task {{obj_name}}", + "US_UPDATED": "{{username}} has updated the attribute \"{{field_name}}\" of the US {{obj_name}}", + "ISSUE_UPDATED": "{{username}} has updated the attribute \"{{field_name}}\" of the Issue {{obj_name}}", + "TASK_UPDATED": "{{username}} has updated the attribute \"{{field_name}}\" of the Task {{obj_name}}", "WIKI_UPDATED": "{{username}} has update the Wiki page {{obj_name}}", "NEW_COMMENT_US": "{{username}} has commented in the US {{obj_name}}", "NEW_COMMENT_ISSUE": "{{username}} has commented in the Issue {{obj_name}}", diff --git a/app/modules/profile/profile-timeline-attachment/profile-timeline-attachment.directive.coffee b/app/modules/profile/profile-timeline-attachment/profile-timeline-attachment.directive.coffee index 268bcd73..ae2edded 100644 --- a/app/modules/profile/profile-timeline-attachment/profile-timeline-attachment.directive.coffee +++ b/app/modules/profile/profile-timeline-attachment/profile-timeline-attachment.directive.coffee @@ -11,11 +11,11 @@ ProfileTimelineAttachmentDirective = (template, $compile) -> is_image = isImage(scope.attachment.url) if is_image - template = template.get("profile/profile-timeline-attachment/profile-timeline-attachment-image.html") + templateHtml = template.get("profile/profile-timeline-attachment/profile-timeline-attachment-image.html") else - template = template.get("profile/profile-timeline-attachment/profile-timeline-attachment.html") + templateHtml = template.get("profile/profile-timeline-attachment/profile-timeline-attachment.html") - el.html(template) + el.html(templateHtml) $compile(el.contents())(scope) return { diff --git a/app/modules/profile/profile-timeline-item/profile-timeline-item.jade b/app/modules/profile/profile-timeline-item/profile-timeline-item.jade index 68a22c80..44d06484 100644 --- a/app/modules/profile/profile-timeline-item/profile-timeline-item.jade +++ b/app/modules/profile/profile-timeline-item/profile-timeline-item.jade @@ -19,4 +19,4 @@ div.activity-image p {{::vm.activity.member.role.name}} div(ng-repeat="attachment in vm.activity.attachments") - div(tg-profile-timeline-attachment="vm.attachment") + div(tg-profile-timeline-attachment="attachment")