fix timeline attachments
parent
75137404e3
commit
8b2ac40c42
|
@ -20,8 +20,9 @@ class UserTimelineItemController
|
|||
if type.member
|
||||
@.timeline = @.timeline.set('member', type.member(@.timeline))
|
||||
|
||||
if @.timeline.hasIn(['data', 'value_diff', 'attachments', 'new'])
|
||||
@.timeline = @.timeline.set('attachments', @.timeline.getIn(['data', 'value_diff', 'attachments', 'new']))
|
||||
if @.timeline.getIn(['data', 'value_diff', 'key']) == 'attachments' &&
|
||||
@.timeline.hasIn(['data', 'value_diff', 'value', 'new'])
|
||||
@.timeline = @.timeline.set('attachments', @.timeline.getIn(['data', 'value_diff', 'value', 'new']))
|
||||
|
||||
getObject: (timeline, event) ->
|
||||
if timeline.get('data').get(event.obj)
|
||||
|
|
|
@ -54,7 +54,8 @@ describe "UserTimelineItemController", ->
|
|||
id: 2
|
||||
},
|
||||
value_diff: {
|
||||
attachments: {
|
||||
key: 'attachments',
|
||||
value: {
|
||||
new: "fakeAttachment"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -25,5 +25,5 @@ div.activity-item
|
|||
span {{::vm.timeline.getIn(['member','user', 'name'])}}
|
||||
p {{::vm.timeline.getIn(['member','role', 'name'])}}
|
||||
|
||||
div(ng-repeat="attachment in vm.timeline.get('attachments')")
|
||||
div(tg-repeat="attachment in vm.timeline.get('attachments')")
|
||||
div(tg-user-timeline-attachment="attachment")
|
||||
|
|
Loading…
Reference in New Issue