taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing titles

stable
Alejandro Alonso 2015-04-29 08:35:35 +02:00 committed by Juanfran
parent 6815a9c8d0
commit c9bc100cc3
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/modules/home/home-page.controller.coffee
View File

@ -20,20 +20,25 @@ class ProjectsPageController extends taiga.Controller
constructor: (@scope, @q, @rs, @rootscope, @navUrls, @auth, @location, constructor: (@scope, @q, @rs, @rootscope, @navUrls, @auth, @location,
@appTitle, @projectUrl, @config, tgLoader, @projectsService, @homeService, @appTitle, @projectUrl, @config, tgLoader, @projectsService, @homeService,
@translate) -> @translate) ->
@appTitle.set(@translate.instant("PROJECT.WELCOME"))
if !@auth.isAuthenticated() if !@auth.isAuthenticated()
@location.path(@navUrls.resolve("login")) @location.path(@navUrls.resolve("login"))
#Projects promise = @.loadInitialData()
projectsPromise = @projectsService.fetchProjects()
#In progress work # On Success
user = @auth.getUser() promise.then =>
workInProgressPromise = @homeService.fetchWorkInProgress(user.id) @appTitle.set(@translate.instant("PROJECT.WELCOME"))
# Finally # Finally
@q.all([projectsPromise, workInProgressPromise]).finally tgLoader.pageLoaded promise.finally tgLoader.pageLoaded
loadInitialData: ->
user = @auth.getUser()
#Projects
promise = @projectsService.fetchProjects()
return promise.then () =>
#In progress work
return @homeService.fetchWorkInProgress(user.id)
angular.module("taigaHome").controller("HomePage", ProjectsPageController) angular.module("taigaHome").controller("HomePage", ProjectsPageController)

4
app/modules/home/home.jade
View File

@ -3,8 +3,8 @@ doctype html
include ../../partials/includes/components/beta include ../../partials/includes/components/beta
div.home-wrapper.centered div.home-wrapper.centered
div.duty-summary div.duty-summary
div.title-bar.working-on-title(ng-show="vm.assignedTo", translate="HOME.WORKING_ON_SECTION") div.title-bar.working-on-title(ng-show="vm.assignedTo.size", translate="HOME.WORKING_ON_SECTION")
section.working-on(ng-show="vm.assignedTo") section.working-on(ng-show="vm.assignedTo.size")
div.duty-single(tg-duty="duty", tg-repeat="duty in vm.assignedTo", ng-class="{blocked: duty.is_blocked}") div.duty-single(tg-duty="duty", tg-repeat="duty in vm.assignedTo", ng-class="{blocked: duty.is_blocked}")
div.title-bar.watching-title(translate="HOME.WATCHING_SECTION") div.title-bar.watching-title(translate="HOME.WATCHING_SECTION")

5
app/modules/projects/projects-page.controller.coffee
View File

@ -17,7 +17,6 @@ class ProjectsPageController extends taiga.Controller
constructor: (@scope, @q, @rs, @rootscope, @navUrls, @auth, @location, constructor: (@scope, @q, @rs, @rootscope, @navUrls, @auth, @location,
@appTitle, @projectUrl, @config, tgLoader, @projectsService, @translate) -> @appTitle, @projectUrl, @config, tgLoader, @projectsService, @translate) ->
@appTitle.set(@translate.instant("PROJECT.SECTION_PROJECTS"))
if !@auth.isAuthenticated() if !@auth.isAuthenticated()
@location.path(@navUrls.resolve("login")) @location.path(@navUrls.resolve("login"))
@ -25,6 +24,10 @@ class ProjectsPageController extends taiga.Controller
#Projects #Projects
promise = @projectsService.fetchProjects() promise = @projectsService.fetchProjects()
# On Success
promise.then =>
@appTitle.set(@translate.instant("PROJECT.SECTION_PROJECTS"))
# Finally # Finally
promise.finally tgLoader.pageLoaded promise.finally tgLoader.pageLoaded