taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix profile timeline attachments

stable
Juanfran 2015-05-08 08:27:07 +02:00
parent d799bf727c
commit 1687bde95c
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/locales/locale-en.json
View File

@ -1149,9 +1149,9 @@
"WIKI_CREATED": "{{username}} has created a new Wiki page in {{project_name}} {{obj_name}}", "WIKI_CREATED": "{{username}} has created a new Wiki page in {{project_name}} {{obj_name}}",
"NEW_PROJECT": "{{username}} has a new project {{project_name}}", "NEW_PROJECT": "{{username}} has a new project {{project_name}}",
"MILESTONE_UPDATED": "{{username}} has updated the milestone {{obj_name}}", "MILESTONE_UPDATED": "{{username}} has updated the milestone {{obj_name}}",
"US_UPDATED": "{{username}} has updated the field \"{{field_name}}\" of the US {{obj_name}}", "US_UPDATED": "{{username}} has updated the attribute \"{{field_name}}\" of the US {{obj_name}}",
"ISSUE_UPDATED": "{{username}} has updated the field \"{{field_name}}\" of the Issue {{obj_name}}", "ISSUE_UPDATED": "{{username}} has updated the attribute \"{{field_name}}\" of the Issue {{obj_name}}",
"TASK_UPDATED": "{{username}} has updated the field \"{{field_name}}\" of the Task {{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}}", "WIKI_UPDATED": "{{username}} has update the Wiki page {{obj_name}}",
"NEW_COMMENT_US": "{{username}} has commented in the US {{obj_name}}", "NEW_COMMENT_US": "{{username}} has commented in the US {{obj_name}}",
"NEW_COMMENT_ISSUE": "{{username}} has commented in the Issue {{obj_name}}", "NEW_COMMENT_ISSUE": "{{username}} has commented in the Issue {{obj_name}}",

6
app/modules/profile/profile-timeline-attachment/profile-timeline-attachment.directive.coffee
View File

@ -11,11 +11,11 @@ ProfileTimelineAttachmentDirective = (template, $compile) ->
is_image = isImage(scope.attachment.url) is_image = isImage(scope.attachment.url)
if is_image 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 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) $compile(el.contents())(scope)
return { return {

2
app/modules/profile/profile-timeline-item/profile-timeline-item.jade
View File

@ -19,4 +19,4 @@ div.activity-image
p {{::vm.activity.member.role.name}} p {{::vm.activity.member.role.name}}
div(ng-repeat="attachment in vm.activity.attachments") div(ng-repeat="attachment in vm.activity.attachments")
div(tg-profile-timeline-attachment="vm.attachment") div(tg-profile-timeline-attachment="attachment")