From 5828a0f22badca9dfb28c95f5a9ef8f92e6d47ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Wed, 13 Apr 2016 11:46:41 +0200
Subject: [PATCH] Update UI for payments

---
 .../dropdown-user/dropdown-user.jade          |  2 --
 .../transfer-project.controller.coffee        | 21 +++++++------------
 ...> transfer-project.controller.spec.coffee} |  0
 .../projects/transfer/transfer-project.jade   |  2 ++
 4 files changed, 9 insertions(+), 16 deletions(-)
 rename app/modules/projects/transfer/{transfer-project.controler.spec.coffee => transfer-project.controller.spec.coffee} (100%)

diff --git a/app/modules/navigation-bar/dropdown-user/dropdown-user.jade b/app/modules/navigation-bar/dropdown-user/dropdown-user.jade
index 535d20ed..9419d1e9 100644
--- a/app/modules/navigation-bar/dropdown-user/dropdown-user.jade
+++ b/app/modules/navigation-bar/dropdown-user/dropdown-user.jade
@@ -30,8 +30,6 @@ div.navbar-dropdown.dropdown-user
                 ng-class="{active: plugin.slug == currentPlugin.slug}"
             )
                 span.title {{ plugin.name }}
-                span.new(translate="PROJECT.NAVIGATION.NEW_ITEM")
-
         li
             a(
                 href="#",
diff --git a/app/modules/projects/transfer/transfer-project.controller.coffee b/app/modules/projects/transfer/transfer-project.controller.coffee
index 39be19ab..715d45b3 100644
--- a/app/modules/projects/transfer/transfer-project.controller.coffee
+++ b/app/modules/projects/transfer/transfer-project.controller.coffee
@@ -29,10 +29,9 @@ class TransferProject
         "$tgNavUrls",
         "$translate",
         "$tgConfirm"
-        "$tgLoading"
     ]
 
-    constructor: (@routeParams, @projectService, @location, @authService, @currentUserService, @navUrls, @translate, @confirmService, @loading) ->
+    constructor: (@routeParams, @projectService, @location, @authService, @currentUserService, @navUrls, @translate, @confirmService) ->
 
     initialize: () ->
         @.projectId = @.project.get("id")
@@ -73,31 +72,25 @@ class TransferProject
 
         @.validNumberOfMemberships = maxMemberships == null || @.project.get('total_memberships') <= maxMemberships
 
-    transferAccept: (token, reason, $event) ->
-        target = angular.element($event.currentTarget)
-        currentLoading = @loading()
-            .target(target)
-            .start()
+    transferAccept: (token, reason) ->
+        @.loadingAccept = true
         return @projectService.transferAccept(@.project.get("id"), token, reason).then () =>
             newUrl = @navUrls.resolve("project-admin-project-profile-details", {
                 project: @.project.get("slug")
             })
-            currentLoading.finish()
+            @.loadingAccept = false
             @location.path(newUrl)
 
             @confirmService.notify("success", @translate.instant("ADMIN.PROJECT_TRANSFER.ACCEPTED_PROJECT_OWNERNSHIP"), '', 5000)
             return
 
-    transferReject: (token, reason, $event) ->
-        target = $($event.target)
-        currentLoading = @loading()
-            .target(target)
-            .start()
+    transferReject: (token, reason) ->
+        @.loadingReject = true
         return @projectService.transferReject(@.project.get("id"), token, reason).then () =>
             newUrl = @navUrls.resolve("home", {
                 project: @project.get("slug")
             })
-            currentLoading.finish()
+            @.loadingReject = false
             @location.path(newUrl)
             @confirmService.notify("success", @translate.instant("ADMIN.PROJECT_TRANSFER.REJECTED_PROJECT_OWNERNSHIP"), '', 5000)
 
diff --git a/app/modules/projects/transfer/transfer-project.controler.spec.coffee b/app/modules/projects/transfer/transfer-project.controller.spec.coffee
similarity index 100%
rename from app/modules/projects/transfer/transfer-project.controler.spec.coffee
rename to app/modules/projects/transfer/transfer-project.controller.spec.coffee
diff --git a/app/modules/projects/transfer/transfer-project.jade b/app/modules/projects/transfer/transfer-project.jade
index 1524d421..e7f4fbff 100644
--- a/app/modules/projects/transfer/transfer-project.jade
+++ b/app/modules/projects/transfer/transfer-project.jade
@@ -57,6 +57,7 @@
                 href="#"
                 title="{{'ADMIN.PROJECT_TRANSFER.REJECT' | translate}}"
                 translate="ADMIN.PROJECT_TRANSFER.REJECT"
+                tg-loading="vm.loadingReject"
             )
 
             a.button.button-green(
@@ -64,6 +65,7 @@
                 href="#"
                 title="{{'ADMIN.PROJECT_TRANSFER.ACCEPT' | translate}}"
                 translate="ADMIN.PROJECT_TRANSFER.ACCEPT"
+                tg-loading="vm.loadingAccept"
             )
 
     tg-cant-own-project-explanation(ng-if="!vm.canBeOwnedByUser.valid")