diff --git a/app/modules/user-timeline/user-timeline-item/user-timeline-item-type.service.coffee b/app/modules/user-timeline/user-timeline-item/user-timeline-item-type.service.coffee index d221977b..5306ac5f 100644 --- a/app/modules/user-timeline/user-timeline-item/user-timeline-item-type.service.coffee +++ b/app/modules/user-timeline/user-timeline-item/user-timeline-item-type.service.coffee @@ -122,7 +122,8 @@ timelineType = (timeline, event) -> check: (timeline, event) -> if timeline.hasIn(['data', 'value_diff']) && timeline.getIn(['data', 'value_diff', 'key']) == 'moveInBacklog' && - event.type == 'change' + event.type == 'change' && + event.obj == 'userstory' return timeline.getIn(['data', 'value_diff', 'value', 'milestone']).get(1) == null @@ -134,7 +135,9 @@ timelineType = (timeline, event) -> check: (timeline, event) -> return timeline.hasIn(['data', 'value_diff']) && timeline.getIn(['data', 'value_diff', 'key']) == 'moveInBacklog' && - event.type == 'change' + event.type == 'change' && + event.obj == 'userstory' + key: 'TIMELINE.US_ADDED_MILESTONE', translate_params: ['username', 'obj_name', 'sprint_name'] }, diff --git a/app/modules/user-timeline/user-timeline/user-timeline.service.coffee b/app/modules/user-timeline/user-timeline/user-timeline.service.coffee index 42a72a06..61adc2a4 100644 --- a/app/modules/user-timeline/user-timeline/user-timeline.service.coffee +++ b/app/modules/user-timeline/user-timeline/user-timeline.service.coffee @@ -153,7 +153,11 @@ class UserTimelineService extends taiga.Service values_diff = Immutable.Map({'blocked': values_diff}) if values_diff.has('milestone') - values_diff = Immutable.Map({'moveInBacklog': values_diff}) + if event.obj == 'userstory' + values_diff = Immutable.Map({'moveInBacklog': values_diff}) + else + values_diff = values_diff.deleteIn(['values_diff', 'milestone']) + else if event.obj == 'milestone' values_diff = Immutable.Map({'milestone': values_diff}) diff --git a/app/modules/user-timeline/user-timeline/user-timeline.service.spec.coffee b/app/modules/user-timeline/user-timeline/user-timeline.service.spec.coffee index 7e2b131d..60912d62 100644 --- a/app/modules/user-timeline/user-timeline/user-timeline.service.spec.coffee +++ b/app/modules/user-timeline/user-timeline/user-timeline.service.spec.coffee @@ -201,7 +201,7 @@ describe "tgUserTimelineService", -> expect(res.get('data').size).to.be.equal(13) items = config.filter(res.get('data')) - expect(items.size).to.be.equal(6) + expect(items.size).to.be.equal(5) return true @@ -224,7 +224,7 @@ describe "tgUserTimelineService", -> expect(res.get('data').size).to.be.equal(13) items = config.filter(res.get('data')) - expect(items.size).to.be.equal(6) + expect(items.size).to.be.equal(5) return true @@ -247,7 +247,7 @@ describe "tgUserTimelineService", -> expect(res.get('data').size).to.be.equal(13) items = config.filter(res.get('data')) - expect(items.size).to.be.equal(6) + expect(items.size).to.be.equal(5) return true