From 6d365c48e4d0aa3f2916d43e1eba2b0f20047b44 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Tue, 23 Jun 2015 10:04:57 +0200
Subject: [PATCH] make currentUserService loadProjects public and add it after
 project modification

---
 app/coffee/modules/admin/project-profile.coffee       | 5 +++--
 app/coffee/modules/projects/lightboxes.coffee         | 4 ++--
 app/modules/services/current-user.service.coffee      | 6 +++---
 app/modules/services/current-user.service.spec.coffee | 4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/coffee/modules/admin/project-profile.coffee b/app/coffee/modules/admin/project-profile.coffee
index 6cf7d5a9..9c6acc07 100644
--- a/app/coffee/modules/admin/project-profile.coffee
+++ b/app/coffee/modules/admin/project-profile.coffee
@@ -104,7 +104,7 @@ module.controller("ProjectProfileController", ProjectProfileController)
 ## Project Profile Directive
 #############################################################################
 
-ProjectProfileDirective = ($repo, $confirm, $loading, $navurls, $location, projectService) ->
+ProjectProfileDirective = ($repo, $confirm, $loading, $navurls, $location, projectService, currentUserService) ->
     link = ($scope, $el, $attrs) ->
         $ctrl = $el.controller()
 
@@ -128,6 +128,7 @@ ProjectProfileDirective = ($repo, $confirm, $loading, $navurls, $location, proje
                 $ctrl.loadInitialData()
 
                 projectService.fetchProject()
+                currentUserService.loadProjects()
 
             promise.then null, (data) ->
                 $loading.finish(submitButton)
@@ -142,7 +143,7 @@ ProjectProfileDirective = ($repo, $confirm, $loading, $navurls, $location, proje
     return {link:link}
 
 module.directive("tgProjectProfile", ["$tgRepo", "$tgConfirm", "$tgLoading", "$tgNavUrls", "$tgLocation",
-                                      "tgProjectService", ProjectProfileDirective])
+                                      "tgProjectService", "tgCurrentUserService", ProjectProfileDirective])
 
 
 #############################################################################
diff --git a/app/coffee/modules/projects/lightboxes.coffee b/app/coffee/modules/projects/lightboxes.coffee
index 1c4eac5c..b027f58c 100644
--- a/app/coffee/modules/projects/lightboxes.coffee
+++ b/app/coffee/modules/projects/lightboxes.coffee
@@ -46,7 +46,7 @@ CreateProject = ($rootscope, $repo, $confirm, $location, $navurls, $rs, $project
 
             $location.url($projectUrl.get(response))
             lightboxService.close($el)
-            currentUserService._loadProjects()
+            currentUserService.loadProjects()
 
         onErrorSubmit = (response) ->
             $loading.finish(submitButton)
@@ -170,7 +170,7 @@ DeleteProjectDirective = ($repo, $rootscope, $auth, $location, $navUrls, $confir
                 $rootscope.$broadcast("projects:reload")
                 $location.path($navUrls.resolve("home"))
                 $confirm.notify("success")
-                currentUserService._loadProjects()
+                currentUserService.loadProjects()
 
             # FIXME: error handling?
             promise.then null, ->
diff --git a/app/modules/services/current-user.service.coffee b/app/modules/services/current-user.service.coffee
index 924ca587..a4301dae 100644
--- a/app/modules/services/current-user.service.coffee
+++ b/app/modules/services/current-user.service.coffee
@@ -43,9 +43,9 @@ class CurrentUserService
 
     bulkUpdateProjectsOrder: (sortData) ->
         @projectsService.bulkUpdateProjectsOrder(sortData).then () =>
-            @._loadProjects()
+            @.loadProjects()
 
-    _loadProjects: () ->
+    loadProjects: () ->
         return @projectsService.getProjectsByUserId(@._user.get("id"))
             .then (projects) =>
                 @._projects = @._projects.set("all", projects)
@@ -56,6 +56,6 @@ class CurrentUserService
                 return @.projects
 
     _loadUserInfo: () ->
-        return @._loadProjects()
+        return @.loadProjects()
 
 angular.module("taigaCommon").service("tgCurrentUserService", CurrentUserService)
diff --git a/app/modules/services/current-user.service.spec.coffee b/app/modules/services/current-user.service.spec.coffee
index ab8ea8f5..e17e44e9 100644
--- a/app/modules/services/current-user.service.spec.coffee
+++ b/app/modules/services/current-user.service.spec.coffee
@@ -80,12 +80,12 @@ describe "tgCurrentUserService", ->
     it "bulkUpdateProjectsOrder and reload projects", (done) ->
         fakeData = [{id: 1, id: 2}]
 
-        currentUserService._loadProjects = sinon.spy()
+        currentUserService.loadProjects = sinon.spy()
 
         mocks.projectsService.bulkUpdateProjectsOrder.withArgs(fakeData).promise().resolve()
 
         currentUserService.bulkUpdateProjectsOrder(fakeData).then () ->
-            expect(currentUserService._loadProjects).to.be.callOnce
+            expect(currentUserService.loadProjects).to.be.callOnce
 
             done()