diff --git a/app/coffee/modules/backlog/main.coffee b/app/coffee/modules/backlog/main.coffee index 9dae7be6..a5281956 100644 --- a/app/coffee/modules/backlog/main.coffee +++ b/app/coffee/modules/backlog/main.coffee @@ -168,8 +168,8 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.F return data return promise.then(=> @loadProject()) - .then(=> @q.all([@.loadUsersAndRoles(), - @.loadBacklog()])) + .then(=> @.loadUsersAndRoles()) + .then(=> @.loadBacklog()) filterVisibleUserstories: -> @scope.visibleUserstories = [] diff --git a/app/coffee/modules/issues/detail.coffee b/app/coffee/modules/issues/detail.coffee index f2f99554..15712e37 100644 --- a/app/coffee/modules/issues/detail.coffee +++ b/app/coffee/modules/issues/detail.coffee @@ -130,8 +130,8 @@ class IssueDetailController extends mixOf(taiga.Controller, taiga.PageMixin, tai return data return promise.then(=> @.loadProject()) - .then(=> @q.all([@.loadUsersAndRoles(), - @.loadIssue(), + .then(=> @.loadUsersAndRoles()) + .then(=> @q.all([@.loadIssue(), @.loadAttachments(@scope.issueId), @.loadHistory()])) diff --git a/app/coffee/modules/issues/list.coffee b/app/coffee/modules/issues/list.coffee index e4a32ef0..1f728874 100644 --- a/app/coffee/modules/issues/list.coffee +++ b/app/coffee/modules/issues/list.coffee @@ -259,8 +259,8 @@ class IssuesController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.Fi return data return promise.then(=> @.loadProject()) - .then(=> @q.all([@.loadUsersAndRoles(), - @.loadFilters(), + .then(=> @.loadUsersAndRoles()) + .then(=> @q.all([@.loadFilters(), @.loadIssues()])) saveCurrentFiltersTo: (newFilter) -> diff --git a/app/coffee/modules/kanban/main.coffee b/app/coffee/modules/kanban/main.coffee index 48315440..41d16273 100644 --- a/app/coffee/modules/kanban/main.coffee +++ b/app/coffee/modules/kanban/main.coffee @@ -152,8 +152,8 @@ class KanbanController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.Fi return data return promise.then(=> @.loadProject()) - .then(=> @q.all([@.loadUsersAndRoles(), - @.loadKanban()])) + .then(=> @.loadUsersAndRoles()) + .then(=> @.loadKanban()) .then(=> @scope.$broadcast("redraw:wip")) prepareBulkUpdateData: (uses) -> diff --git a/app/coffee/modules/taskboard/main.coffee b/app/coffee/modules/taskboard/main.coffee index 06254bb7..fd252b27 100644 --- a/app/coffee/modules/taskboard/main.coffee +++ b/app/coffee/modules/taskboard/main.coffee @@ -154,8 +154,8 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin) return data return promise.then(=> @.loadProject()) - .then(=> @q.all([@.loadUsersAndRoles(), - @.loadTaskboard()])) + .then(=> @.loadUsersAndRoles()) + .then(=> @.loadTaskboard()) taskMove: (ctx, task, usId, statusId, order) -> # Remove task from old position diff --git a/app/coffee/modules/userstories/detail.coffee b/app/coffee/modules/userstories/detail.coffee index 7a360d5d..25d170b3 100644 --- a/app/coffee/modules/userstories/detail.coffee +++ b/app/coffee/modules/userstories/detail.coffee @@ -138,8 +138,8 @@ class UserStoryDetailController extends mixOf(taiga.Controller, taiga.PageMixin, return data return promise.then(=> @.loadProject()) - .then(=> @q.all([@.loadUsersAndRoles(), - @.loadUs(), + .then(=> @.loadUsersAndRoles()) + .then(=> @q.all([@.loadUs(), @.loadTasks(), @.loadAttachments(@scope.usId), @.loadHistory()])) diff --git a/app/coffee/modules/wiki/main.coffee b/app/coffee/modules/wiki/main.coffee index 4698df4e..52e4faf4 100644 --- a/app/coffee/modules/wiki/main.coffee +++ b/app/coffee/modules/wiki/main.coffee @@ -115,8 +115,8 @@ class WikiDetailController extends mixOf(taiga.Controller, taiga.PageMixin, taig return @q.reject() return promise.then(=> @.loadProject()) - .then(=> @q.all([@.loadUsersAndRoles(), - @.loadWikiLinks(), + .then(=> @.loadUsersAndRoles()) + .then(=> @q.all([@.loadWikiLinks(), @.loadWiki(), @.loadAttachments(@scope.wikiId)]))