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

[backport] fix timeline with unassined tasks

stable
Juanfran 2015-11-03 08:31:54 +01:00
parent d92c43ffcb
commit 00fbdc6dc1
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,7 +219,7 @@ timelineType = (timeline, event) ->
check: (timeline, event) ->
return event.obj == 'task' &&
event.type == 'change' &&
!timeline.getIn('data', 'task', 'userstory') &&
!timeline.getIn(['data', 'task', 'userstory']) &&
timeline.hasIn(['data', 'value_diff']) &&
timeline.getIn(['data', 'value_diff', 'key']) == 'description_diff'
key: 'TIMELINE.TASK_UPDATED',
@ -229,7 +229,7 @@ timelineType = (timeline, event) ->
check: (timeline, event) ->
return event.obj == 'task' &&
event.type == 'change' &&
timeline.getIn('data', 'task', 'userstory') &&
timeline.getIn(['data', 'task', 'userstory']) &&
timeline.hasIn(['data', 'value_diff']) &&
timeline.getIn(['data', 'value_diff', 'key']) == 'description_diff'
key: 'TIMELINE.TASK_UPDATED_WITH_US',

3
app/partials/includes/modules/taskboard-table.jade
View File

@ -49,12 +49,11 @@ div.taskboard-table(tg-taskboard-squish-column)
div.taskboard-tasks-box.task-column(ng-repeat="st in taskStatusList track by st.id", tg-taskboard-sortable, class="squish-status-{{st.id}}", ng-class="{'column-fold':statusesFolded[st.id]}", tg-bind-scope)
div.taskboard-task(
ng-repeat="task in usTasks[null][st.id] track by task.id"
tg-taskboard-task
tg-bind-scope
tg-class-permission="{'readonly': '!modify_task'}"
ng-class="{'card-placeholder': task.isPlaceholder}"
)
div(ng-if="!task.isPlaceholder")
div(ng-if="!task.isPlaceholder", tg-taskboard-task)
include ../components/taskboard-task
div(ng-if="task.isPlaceholder")