Merge pull request #998 from taigaio/Issue-4165-Iñigo-Montoya-can't-view-their-work-in-progress-and-their-watched-items-in-his-dashboard
Issue 4165: Iñigo Montoya can't view their work in progress and their…stable
commit
fff4e94f3b
|
@ -46,53 +46,44 @@ class HomeService extends taiga.Service
|
||||||
|
|
||||||
return duty
|
return duty
|
||||||
|
|
||||||
|
_getValidDutiesAndAttachProjectInfo = (duties, dutyType)->
|
||||||
|
# Exclude duties where I'm not member of the project
|
||||||
|
duties = duties.filter((duty) ->
|
||||||
|
return projectsById.get(String(duty.get('project'))))
|
||||||
|
|
||||||
|
duties = duties.map (duty) ->
|
||||||
|
return _attachProjectInfoToDuty(duty, dutyType)
|
||||||
|
|
||||||
|
return duties
|
||||||
|
|
||||||
assignedTo = workInProgress.get("assignedTo")
|
assignedTo = workInProgress.get("assignedTo")
|
||||||
|
|
||||||
if assignedTo.get("userStories")
|
if assignedTo.get("userStories")
|
||||||
_duties = assignedTo.get("userStories").map (duty) ->
|
_duties = _getValidDutiesAndAttachProjectInfo(assignedTo.get("userStories"), "userstories")
|
||||||
return _attachProjectInfoToDuty(duty, "userstories")
|
|
||||||
|
|
||||||
assignedTo = assignedTo.set("userStories", _duties)
|
assignedTo = assignedTo.set("userStories", _duties)
|
||||||
|
|
||||||
if assignedTo.get("tasks")
|
if assignedTo.get("tasks")
|
||||||
_duties = assignedTo.get("tasks").map (duty) ->
|
_duties = _getValidDutiesAndAttachProjectInfo(assignedTo.get("tasks"), "tasks")
|
||||||
return _attachProjectInfoToDuty(duty, "tasks")
|
|
||||||
|
|
||||||
assignedTo = assignedTo.set("tasks", _duties)
|
assignedTo = assignedTo.set("tasks", _duties)
|
||||||
|
|
||||||
if assignedTo.get("issues")
|
|
||||||
_duties = assignedTo.get("issues").map (duty) ->
|
|
||||||
return _attachProjectInfoToDuty(duty, "issues")
|
|
||||||
|
|
||||||
|
if assignedTo.get("issues")
|
||||||
|
_duties = _getValidDutiesAndAttachProjectInfo(assignedTo.get("issues"), "issues")
|
||||||
assignedTo = assignedTo.set("issues", _duties)
|
assignedTo = assignedTo.set("issues", _duties)
|
||||||
|
|
||||||
|
|
||||||
watching = workInProgress.get("watching")
|
watching = workInProgress.get("watching")
|
||||||
|
|
||||||
if watching.get("userStories")
|
if watching.get("userStories")
|
||||||
_duties = watching.get("userStories").filter (duty) ->
|
_duties = _getValidDutiesAndAttachProjectInfo(watching.get("userStories"), "userstories")
|
||||||
return !!projectsById.get(String(duty.get('project')))
|
|
||||||
|
|
||||||
_duties = _duties.map (duty) ->
|
|
||||||
return _attachProjectInfoToDuty(duty, "userstories")
|
|
||||||
|
|
||||||
watching = watching.set("userStories", _duties)
|
watching = watching.set("userStories", _duties)
|
||||||
|
|
||||||
if watching.get("tasks")
|
if watching.get("tasks")
|
||||||
_duties = watching.get("tasks").filter (duty) ->
|
_duties = _getValidDutiesAndAttachProjectInfo(watching.get("tasks"), "tasks")
|
||||||
return !!projectsById.get(String(duty.get('project')))
|
|
||||||
|
|
||||||
_duties = _duties.map (duty) ->
|
|
||||||
return _attachProjectInfoToDuty(duty, "tasks")
|
|
||||||
|
|
||||||
watching = watching.set("tasks", _duties)
|
watching = watching.set("tasks", _duties)
|
||||||
|
|
||||||
if watching.get("issues")
|
if watching.get("issues")
|
||||||
_duties = watching.get("issues").filter (duty) ->
|
_duties = _getValidDutiesAndAttachProjectInfo(watching.get("issues"), "issues")
|
||||||
return !!projectsById.get(String(duty.get('project')))
|
|
||||||
|
|
||||||
_duties = _duties.map (duty) ->
|
|
||||||
return _attachProjectInfoToDuty(duty, "issues")
|
|
||||||
|
|
||||||
watching = watching.set("issues", _duties)
|
watching = watching.set("issues", _duties)
|
||||||
|
|
||||||
workInProgress = workInProgress.set("assignedTo", assignedTo)
|
workInProgress = workInProgress.set("assignedTo", assignedTo)
|
||||||
|
|
Loading…
Reference in New Issue