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

Add loading in project transfer

stable
Xavier Julián 2016-04-11 09:51:54 +02:00
parent 04efa2eca4
commit 43ff31d7e8
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/modules/projects/transfer/transfer-project.controller.coffee
View File

@ -29,9 +29,10 @@ class TransferProject
"$tgNavUrls", "$tgNavUrls",
"$translate", "$translate",
"$tgConfirm" "$tgConfirm"
"$tgLoading"
] ]
constructor: (@routeParams, @projectService, @location, @authService, @currentUserService, @navUrls, @translate, @confirmService) -> constructor: (@routeParams, @projectService, @location, @authService, @currentUserService, @navUrls, @translate, @confirmService, @loading) ->
initialize: () -> initialize: () ->
@.projectId = @.project.get("id") @.projectId = @.project.get("id")
@ -72,22 +73,31 @@ class TransferProject
@.validNumberOfMemberships = maxMemberships == null || @.project.get('total_memberships') <= maxMemberships @.validNumberOfMemberships = maxMemberships == null || @.project.get('total_memberships') <= maxMemberships
transferAccept: (token, reason) -> transferAccept: (token, reason, $event) ->
target = angular.element($event.currentTarget)
currentLoading = @loading()
.target(target)
.start()
return @projectService.transferAccept(@.project.get("id"), token, reason).then () => return @projectService.transferAccept(@.project.get("id"), token, reason).then () =>
newUrl = @navUrls.resolve("project-admin-project-profile-details", { newUrl = @navUrls.resolve("project-admin-project-profile-details", {
project: @.project.get("slug") project: @.project.get("slug")
}) })
currentLoading.finish()
@location.path(newUrl) @location.path(newUrl)
@confirmService.notify("success", @translate.instant("ADMIN.PROJECT_TRANSFER.ACCEPTED_PROJECT_OWNERNSHIP"), '', 5000) @confirmService.notify("success", @translate.instant("ADMIN.PROJECT_TRANSFER.ACCEPTED_PROJECT_OWNERNSHIP"), '', 5000)
return return
transferReject: (token, reason) -> transferReject: (token, reason, $event) ->
target = $($event.target)
currentLoading = @loading()
.target(target)
.start()
return @projectService.transferReject(@.project.get("id"), token, reason).then () => return @projectService.transferReject(@.project.get("id"), token, reason).then () =>
newUrl = @navUrls.resolve("project-admin-project-profile-details", { newUrl = @navUrls.resolve("home", {
project: @project.get("slug") project: @project.get("slug")
}) })
currentLoading.finish()
@location.path(newUrl) @location.path(newUrl)
@confirmService.notify("success", @translate.instant("ADMIN.PROJECT_TRANSFER.REJECTED_PROJECT_OWNERNSHIP"), '', 5000) @confirmService.notify("success", @translate.instant("ADMIN.PROJECT_TRANSFER.REJECTED_PROJECT_OWNERNSHIP"), '', 5000)

4
app/modules/projects/transfer/transfer-project.jade
View File

@ -53,14 +53,14 @@
.transfer-project-options .transfer-project-options
a.button.button-gray( a.button.button-gray(
ng-click="vm.transferReject(vm.token, vm.reason)" ng-click="vm.transferReject(vm.token, vm.reason, $event)"
href="#" href="#"
title="{{'ADMIN.PROJECT_TRANSFER.REJECT' | translate}}" title="{{'ADMIN.PROJECT_TRANSFER.REJECT' | translate}}"
translate="ADMIN.PROJECT_TRANSFER.REJECT" translate="ADMIN.PROJECT_TRANSFER.REJECT"
) )
a.button.button-green( a.button.button-green(
ng-click="vm.transferAccept(vm.token, vm.reason)" ng-click="vm.transferAccept(vm.token, vm.reason, $event)"
href="#" href="#"
title="{{'ADMIN.PROJECT_TRANSFER.ACCEPT' | translate}}" title="{{'ADMIN.PROJECT_TRANSFER.ACCEPT' | translate}}"
translate="ADMIN.PROJECT_TRANSFER.ACCEPT" translate="ADMIN.PROJECT_TRANSFER.ACCEPT"