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

Merge pull request #821 from taigaio/Issue-3641-back-joining-milestone-task-change-and-the-next-change 

Issue 3641: taiga-back joins milestone task change and the next task …
stable
Juanfran 2016-01-20 12:50:01 +01:00
parent 7456e84c7e 4f80b0b19d
commit 1591e4a519
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/modules/user-timeline/user-timeline-item/user-timeline-item-type.service.coffee
View File

@ -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']
},

6
app/modules/user-timeline/user-timeline/user-timeline.service.coffee
View File

@ -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})

6
app/modules/user-timeline/user-timeline/user-timeline.service.spec.coffee
View File

@ -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