From b822f8587b426f60cc49344766b4c8047a1980ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Tue, 7 Oct 2014 20:37:00 +0200 Subject: [PATCH] Fix bug #1112: Sometime the nav projects menu doesn't show the project list --- app/coffee/modules/nav.coffee | 14 ++++++++------ app/partials/views/modules/projects-nav.jade | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/coffee/modules/nav.coffee b/app/coffee/modules/nav.coffee index 4fb57c09..02c2b151 100644 --- a/app/coffee/modules/nav.coffee +++ b/app/coffee/modules/nav.coffee @@ -52,7 +52,6 @@ class ProjectsNavigationController extends taiga.Controller return @rs.projects.list().then (projects) => for project in projects project.url = @projectUrl.get(project) - @scope.projects = projects @scope.filteredProjects = projects @scope.filterText = "" @@ -138,9 +137,8 @@ ProjectsNavigationDirective = ($rootscope, animationFrame, $timeout, tgLoader, $ $el.html(html) renderProjects($el, projects) - link = ($scope, $el, $attrs, $ctrl) -> - $ctrl = $el.controller() - + link = ($scope, $el, $attrs, $ctrls) -> + $ctrl = $ctrls[0] $rootscope.$on("project:loaded", hideMenu) overlay.on 'click', () -> @@ -189,9 +187,13 @@ ProjectsNavigationDirective = ($rootscope, animationFrame, $timeout, tgLoader, $ $el.trigger("regenerate:pagination") $scope.$watch "projects", (projects) -> - render($el, $scope.projects) if projects? + render($el, projects) if projects? + + return { + controller: ProjectsNavigationController + link: link + } - return {link: link} module.directive("tgProjectsNav", ["$rootScope", "animationFrame", "$timeout", "tgLoader", "$tgLocation", ProjectsNavigationDirective]) diff --git a/app/partials/views/modules/projects-nav.jade b/app/partials/views/modules/projects-nav.jade index 27f668cf..82638ee6 100644 --- a/app/partials/views/modules/projects-nav.jade +++ b/app/partials/views/modules/projects-nav.jade @@ -6,4 +6,4 @@ div.wizard-create-project(tg-lb-create-project) include wizard-create-project -nav.projects-nav(ng-controller="ProjectsNavigationController", tg-projects-nav, tg-projects-pagination, projects="projects") +nav.projects-nav(tg-projects-nav, tg-projects-pagination, projects="projects")