From f9bf250b386944f4e203aa80952917a33e85b71e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Tue, 6 Jan 2015 08:57:21 +0100 Subject: [PATCH] Fix bug with compact/uncompact kanban cards --- app/coffee/modules/backlog/main.coffee | 2 +- app/coffee/modules/issues/detail.coffee | 2 +- app/coffee/modules/issues/list.coffee | 2 +- app/coffee/modules/kanban/main.coffee | 2 +- app/coffee/modules/tasks/detail.coffee | 18 +----------------- app/coffee/modules/team/main.coffee | 2 +- app/coffee/modules/userstories/detail.coffee | 2 +- app/coffee/modules/wiki/main.coffee | 2 +- 8 files changed, 8 insertions(+), 24 deletions(-) diff --git a/app/coffee/modules/backlog/main.coffee b/app/coffee/modules/backlog/main.coffee index a6374a2c..3c413fb9 100644 --- a/app/coffee/modules/backlog/main.coffee +++ b/app/coffee/modules/backlog/main.coffee @@ -201,6 +201,7 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.F loadProject: -> return @rs.projects.getBySlug(@params.pslug).then (project) => + @scope.projectId = project.id @scope.project = project @scope.$emit('project:loaded', project) @scope.points = _.sortBy(project.points, "order") @@ -212,7 +213,6 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.F loadInitialData: -> promise = @.loadProject() promise.then (project) => - @scope.projectId = project.id @.fillUsersAndRoles(project.users, project.roles) @.initializeSubscription() diff --git a/app/coffee/modules/issues/detail.coffee b/app/coffee/modules/issues/detail.coffee index c0aee649..bbe98b89 100644 --- a/app/coffee/modules/issues/detail.coffee +++ b/app/coffee/modules/issues/detail.coffee @@ -92,6 +92,7 @@ class IssueDetailController extends mixOf(taiga.Controller, taiga.PageMixin) loadProject: -> return @rs.projects.getBySlug(@params.pslug).then (project) => + @scope.projectId = project.id @scope.project = project @scope.$emit('project:loaded', project) @scope.statusList = project.issue_statuses @@ -128,7 +129,6 @@ class IssueDetailController extends mixOf(taiga.Controller, taiga.PageMixin) loadInitialData: -> promise = @.loadProject() return promise.then (project) => - @scope.projectId = project.id @.fillUsersAndRoles(project.users, project.roles) @.loadIssue() diff --git a/app/coffee/modules/issues/list.coffee b/app/coffee/modules/issues/list.coffee index abcaab35..d85c1ace 100644 --- a/app/coffee/modules/issues/list.coffee +++ b/app/coffee/modules/issues/list.coffee @@ -92,6 +92,7 @@ class IssuesController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.Fi loadProject: -> return @rs.projects.getBySlug(@params.pslug).then (project) => + @scope.projectId = project.id @scope.project = project @scope.$emit('project:loaded', project) @@ -270,7 +271,6 @@ class IssuesController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.Fi loadInitialData: -> promise = @.loadProject() return promise.then (project) => - @scope.projectId = project.id @.fillUsersAndRoles(project.users, project.roles) @.initializeSubscription() return @q.all([@.loadFilters(), @.loadIssues()]) diff --git a/app/coffee/modules/kanban/main.coffee b/app/coffee/modules/kanban/main.coffee index 90e657fa..a564e858 100644 --- a/app/coffee/modules/kanban/main.coffee +++ b/app/coffee/modules/kanban/main.coffee @@ -149,6 +149,7 @@ class KanbanController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.Fi loadProject: -> return @rs.projects.getBySlug(@params.pslug).then (project) => + @scope.projectId = project.id @scope.project = project @scope.points = _.sortBy(project.points, "order") @scope.pointsById = groupBy(project.points, (x) -> x.id) @@ -168,7 +169,6 @@ class KanbanController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.Fi loadInitialData: -> promise = @.loadProject() return promise.then (project) => - @scope.projectId = project.id @.fillUsersAndRoles(project.users, project.roles) @.initializeSubscription() @.loadKanban().then( => @scope.$broadcast("redraw:wip")) diff --git a/app/coffee/modules/tasks/detail.coffee b/app/coffee/modules/tasks/detail.coffee index 66c63e4e..e315f060 100644 --- a/app/coffee/modules/tasks/detail.coffee +++ b/app/coffee/modules/tasks/detail.coffee @@ -88,6 +88,7 @@ class TaskDetailController extends mixOf(taiga.Controller, taiga.PageMixin) loadProject: -> return @rs.projects.getBySlug(@params.pslug).then (project) => + @scope.projectId = project.id @scope.project = project @scope.$emit('project:loaded', project) @scope.statusList = project.task_statuses @@ -129,25 +130,8 @@ class TaskDetailController extends mixOf(taiga.Controller, taiga.PageMixin) return us loadInitialData: -> - ### - params = { - pslug: @params.pslug - taskref: @params.taskref - } - - promise = @repo.resolve(params).then (data) => - @scope.projectId = data.project - @scope.taskId = data.task - return data - - return promise.then(=> @.loadProject()) - .then(=> @.loadUsersAndRoles()) - .then(=> @.loadTask().then(=> @q.all([@.loadUserStory(), - @.loadSprint()]))) - ### promise = @.loadProject() return promise.then (project) => - @scope.projectId = project.id @.fillUsersAndRoles(project.users, project.roles) @.loadTask().then(=> @q.all([@.loadSprint(), @.loadUserStory()])) diff --git a/app/coffee/modules/team/main.coffee b/app/coffee/modules/team/main.coffee index 4210b013..a9bca4b2 100644 --- a/app/coffee/modules/team/main.coffee +++ b/app/coffee/modules/team/main.coffee @@ -89,6 +89,7 @@ class TeamController extends mixOf(taiga.Controller, taiga.PageMixin) loadProject: -> return @rs.projects.getBySlug(@params.pslug).then (project) => + @scope.projectId = project.id @scope.project = project @scope.$emit('project:loaded', project) @@ -129,7 +130,6 @@ class TeamController extends mixOf(taiga.Controller, taiga.PageMixin) loadInitialData: -> promise = @.loadProject() return promise.then (project) => - @scope.projectId = project.id @.fillUsersAndRoles(project.users, project.roles) return @.loadMembers().then(=> @.loadMemberStats()) diff --git a/app/coffee/modules/userstories/detail.coffee b/app/coffee/modules/userstories/detail.coffee index 5bc0ff1a..286e9258 100644 --- a/app/coffee/modules/userstories/detail.coffee +++ b/app/coffee/modules/userstories/detail.coffee @@ -94,6 +94,7 @@ class UserStoryDetailController extends mixOf(taiga.Controller, taiga.PageMixin) loadProject: -> return @rs.projects.getBySlug(@params.pslug).then (project) => + @scope.projectId = project.id @scope.project = project @scope.$emit('project:loaded', project) @scope.statusList = project.us_statuses @@ -140,7 +141,6 @@ class UserStoryDetailController extends mixOf(taiga.Controller, taiga.PageMixin) loadInitialData: -> promise = @.loadProject() return promise.then (project) => - @scope.projectId = project.id @.fillUsersAndRoles(project.users, project.roles) @.loadUs().then(=> @q.all([@.loadSprint(), @.loadTasks()])) diff --git a/app/coffee/modules/wiki/main.coffee b/app/coffee/modules/wiki/main.coffee index 56cb93e1..8b25d446 100644 --- a/app/coffee/modules/wiki/main.coffee +++ b/app/coffee/modules/wiki/main.coffee @@ -70,6 +70,7 @@ class WikiDetailController extends mixOf(taiga.Controller, taiga.PageMixin) loadProject: -> return @rs.projects.getBySlug(@params.pslug).then (project) => + @scope.projectId = project.id @scope.project = project @scope.$emit('project:loaded', project) @scope.membersById = groupBy(project.memberships, (x) -> x.user) @@ -103,7 +104,6 @@ class WikiDetailController extends mixOf(taiga.Controller, taiga.PageMixin) loadInitialData: -> promise = @.loadProject() return promise.then (project) => - @scope.projectId = project.id @.fillUsersAndRoles(project.users, project.roles) @q.all([@.loadWikiLinks(), @.loadWiki()])