diff --git a/app/modules/projects/transfer/transfer-project.controller.coffee b/app/modules/projects/transfer/transfer-project.controller.coffee index 7e9bb914..39be19ab 100644 --- a/app/modules/projects/transfer/transfer-project.controller.coffee +++ b/app/modules/projects/transfer/transfer-project.controller.coffee @@ -29,9 +29,10 @@ class TransferProject "$tgNavUrls", "$translate", "$tgConfirm" + "$tgLoading" ] - constructor: (@routeParams, @projectService, @location, @authService, @currentUserService, @navUrls, @translate, @confirmService) -> + constructor: (@routeParams, @projectService, @location, @authService, @currentUserService, @navUrls, @translate, @confirmService, @loading) -> initialize: () -> @.projectId = @.project.get("id") @@ -72,22 +73,31 @@ class TransferProject @.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 () => newUrl = @navUrls.resolve("project-admin-project-profile-details", { project: @.project.get("slug") }) + currentLoading.finish() @location.path(newUrl) @confirmService.notify("success", @translate.instant("ADMIN.PROJECT_TRANSFER.ACCEPTED_PROJECT_OWNERNSHIP"), '', 5000) - 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 () => - newUrl = @navUrls.resolve("project-admin-project-profile-details", { + newUrl = @navUrls.resolve("home", { project: @project.get("slug") }) + currentLoading.finish() @location.path(newUrl) @confirmService.notify("success", @translate.instant("ADMIN.PROJECT_TRANSFER.REJECTED_PROJECT_OWNERNSHIP"), '', 5000) diff --git a/app/modules/projects/transfer/transfer-project.jade b/app/modules/projects/transfer/transfer-project.jade index 87f3ac12..681aa535 100644 --- a/app/modules/projects/transfer/transfer-project.jade +++ b/app/modules/projects/transfer/transfer-project.jade @@ -53,14 +53,14 @@ .transfer-project-options a.button.button-gray( - ng-click="vm.transferReject(vm.token, vm.reason)" + ng-click="vm.transferReject(vm.token, vm.reason, $event)" href="#" title="{{'ADMIN.PROJECT_TRANSFER.REJECT' | translate}}" translate="ADMIN.PROJECT_TRANSFER.REJECT" ) a.button.button-green( - ng-click="vm.transferAccept(vm.token, vm.reason)" + ng-click="vm.transferAccept(vm.token, vm.reason, $event)" href="#" title="{{'ADMIN.PROJECT_TRANSFER.ACCEPT' | translate}}" translate="ADMIN.PROJECT_TRANSFER.ACCEPT"