Fix bug with compact/uncompact kanban cards

stable
Jesús Espino 2015-01-06 08:57:21 +01:00
parent c314b4d49e
commit f9bf250b38
8 changed files with 8 additions and 24 deletions

View File

@ -201,6 +201,7 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.F
loadProject: -> loadProject: ->
return @rs.projects.getBySlug(@params.pslug).then (project) => return @rs.projects.getBySlug(@params.pslug).then (project) =>
@scope.projectId = project.id
@scope.project = project @scope.project = project
@scope.$emit('project:loaded', project) @scope.$emit('project:loaded', project)
@scope.points = _.sortBy(project.points, "order") @scope.points = _.sortBy(project.points, "order")
@ -212,7 +213,6 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.F
loadInitialData: -> loadInitialData: ->
promise = @.loadProject() promise = @.loadProject()
promise.then (project) => promise.then (project) =>
@scope.projectId = project.id
@.fillUsersAndRoles(project.users, project.roles) @.fillUsersAndRoles(project.users, project.roles)
@.initializeSubscription() @.initializeSubscription()

View File

@ -92,6 +92,7 @@ class IssueDetailController extends mixOf(taiga.Controller, taiga.PageMixin)
loadProject: -> loadProject: ->
return @rs.projects.getBySlug(@params.pslug).then (project) => return @rs.projects.getBySlug(@params.pslug).then (project) =>
@scope.projectId = project.id
@scope.project = project @scope.project = project
@scope.$emit('project:loaded', project) @scope.$emit('project:loaded', project)
@scope.statusList = project.issue_statuses @scope.statusList = project.issue_statuses
@ -128,7 +129,6 @@ class IssueDetailController extends mixOf(taiga.Controller, taiga.PageMixin)
loadInitialData: -> loadInitialData: ->
promise = @.loadProject() promise = @.loadProject()
return promise.then (project) => return promise.then (project) =>
@scope.projectId = project.id
@.fillUsersAndRoles(project.users, project.roles) @.fillUsersAndRoles(project.users, project.roles)
@.loadIssue() @.loadIssue()

View File

@ -92,6 +92,7 @@ class IssuesController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.Fi
loadProject: -> loadProject: ->
return @rs.projects.getBySlug(@params.pslug).then (project) => return @rs.projects.getBySlug(@params.pslug).then (project) =>
@scope.projectId = project.id
@scope.project = project @scope.project = project
@scope.$emit('project:loaded', project) @scope.$emit('project:loaded', project)
@ -270,7 +271,6 @@ class IssuesController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.Fi
loadInitialData: -> loadInitialData: ->
promise = @.loadProject() promise = @.loadProject()
return promise.then (project) => return promise.then (project) =>
@scope.projectId = project.id
@.fillUsersAndRoles(project.users, project.roles) @.fillUsersAndRoles(project.users, project.roles)
@.initializeSubscription() @.initializeSubscription()
return @q.all([@.loadFilters(), @.loadIssues()]) return @q.all([@.loadFilters(), @.loadIssues()])

View File

@ -149,6 +149,7 @@ class KanbanController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.Fi
loadProject: -> loadProject: ->
return @rs.projects.getBySlug(@params.pslug).then (project) => return @rs.projects.getBySlug(@params.pslug).then (project) =>
@scope.projectId = project.id
@scope.project = project @scope.project = project
@scope.points = _.sortBy(project.points, "order") @scope.points = _.sortBy(project.points, "order")
@scope.pointsById = groupBy(project.points, (x) -> x.id) @scope.pointsById = groupBy(project.points, (x) -> x.id)
@ -168,7 +169,6 @@ class KanbanController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.Fi
loadInitialData: -> loadInitialData: ->
promise = @.loadProject() promise = @.loadProject()
return promise.then (project) => return promise.then (project) =>
@scope.projectId = project.id
@.fillUsersAndRoles(project.users, project.roles) @.fillUsersAndRoles(project.users, project.roles)
@.initializeSubscription() @.initializeSubscription()
@.loadKanban().then( => @scope.$broadcast("redraw:wip")) @.loadKanban().then( => @scope.$broadcast("redraw:wip"))

View File

@ -88,6 +88,7 @@ class TaskDetailController extends mixOf(taiga.Controller, taiga.PageMixin)
loadProject: -> loadProject: ->
return @rs.projects.getBySlug(@params.pslug).then (project) => return @rs.projects.getBySlug(@params.pslug).then (project) =>
@scope.projectId = project.id
@scope.project = project @scope.project = project
@scope.$emit('project:loaded', project) @scope.$emit('project:loaded', project)
@scope.statusList = project.task_statuses @scope.statusList = project.task_statuses
@ -129,25 +130,8 @@ class TaskDetailController extends mixOf(taiga.Controller, taiga.PageMixin)
return us return us
loadInitialData: -> 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() promise = @.loadProject()
return promise.then (project) => return promise.then (project) =>
@scope.projectId = project.id
@.fillUsersAndRoles(project.users, project.roles) @.fillUsersAndRoles(project.users, project.roles)
@.loadTask().then(=> @q.all([@.loadSprint(), @.loadUserStory()])) @.loadTask().then(=> @q.all([@.loadSprint(), @.loadUserStory()]))

View File

@ -89,6 +89,7 @@ class TeamController extends mixOf(taiga.Controller, taiga.PageMixin)
loadProject: -> loadProject: ->
return @rs.projects.getBySlug(@params.pslug).then (project) => return @rs.projects.getBySlug(@params.pslug).then (project) =>
@scope.projectId = project.id
@scope.project = project @scope.project = project
@scope.$emit('project:loaded', project) @scope.$emit('project:loaded', project)
@ -129,7 +130,6 @@ class TeamController extends mixOf(taiga.Controller, taiga.PageMixin)
loadInitialData: -> loadInitialData: ->
promise = @.loadProject() promise = @.loadProject()
return promise.then (project) => return promise.then (project) =>
@scope.projectId = project.id
@.fillUsersAndRoles(project.users, project.roles) @.fillUsersAndRoles(project.users, project.roles)
return @.loadMembers().then(=> @.loadMemberStats()) return @.loadMembers().then(=> @.loadMemberStats())

View File

@ -94,6 +94,7 @@ class UserStoryDetailController extends mixOf(taiga.Controller, taiga.PageMixin)
loadProject: -> loadProject: ->
return @rs.projects.getBySlug(@params.pslug).then (project) => return @rs.projects.getBySlug(@params.pslug).then (project) =>
@scope.projectId = project.id
@scope.project = project @scope.project = project
@scope.$emit('project:loaded', project) @scope.$emit('project:loaded', project)
@scope.statusList = project.us_statuses @scope.statusList = project.us_statuses
@ -140,7 +141,6 @@ class UserStoryDetailController extends mixOf(taiga.Controller, taiga.PageMixin)
loadInitialData: -> loadInitialData: ->
promise = @.loadProject() promise = @.loadProject()
return promise.then (project) => return promise.then (project) =>
@scope.projectId = project.id
@.fillUsersAndRoles(project.users, project.roles) @.fillUsersAndRoles(project.users, project.roles)
@.loadUs().then(=> @q.all([@.loadSprint(), @.loadTasks()])) @.loadUs().then(=> @q.all([@.loadSprint(), @.loadTasks()]))

View File

@ -70,6 +70,7 @@ class WikiDetailController extends mixOf(taiga.Controller, taiga.PageMixin)
loadProject: -> loadProject: ->
return @rs.projects.getBySlug(@params.pslug).then (project) => return @rs.projects.getBySlug(@params.pslug).then (project) =>
@scope.projectId = project.id
@scope.project = project @scope.project = project
@scope.$emit('project:loaded', project) @scope.$emit('project:loaded', project)
@scope.membersById = groupBy(project.memberships, (x) -> x.user) @scope.membersById = groupBy(project.memberships, (x) -> x.user)
@ -103,7 +104,6 @@ class WikiDetailController extends mixOf(taiga.Controller, taiga.PageMixin)
loadInitialData: -> loadInitialData: ->
promise = @.loadProject() promise = @.loadProject()
return promise.then (project) => return promise.then (project) =>
@scope.projectId = project.id
@.fillUsersAndRoles(project.users, project.roles) @.fillUsersAndRoles(project.users, project.roles)
@q.all([@.loadWikiLinks(), @.loadWiki()]) @q.all([@.loadWikiLinks(), @.loadWiki()])