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

Update UI for payments

stable
Xavier Julián 2016-04-13 11:46:41 +02:00 committed by Alejandro Alonso
parent 028dc953aa
commit 5828a0f22b
4 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/modules/navigation-bar/dropdown-user/dropdown-user.jade
View File

@ -30,8 +30,6 @@ div.navbar-dropdown.dropdown-user
ng-class="{active: plugin.slug == currentPlugin.slug}" ng-class="{active: plugin.slug == currentPlugin.slug}"
) )
span.title {{ plugin.name }} span.title {{ plugin.name }}
span.new(translate="PROJECT.NAVIGATION.NEW_ITEM")
li li
a( a(
href="#", href="#",

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

@ -29,10 +29,9 @@ class TransferProject
"$tgNavUrls", "$tgNavUrls",
"$translate", "$translate",
"$tgConfirm" "$tgConfirm"
"$tgLoading"
] ]
constructor: (@routeParams, @projectService, @location, @authService, @currentUserService, @navUrls, @translate, @confirmService, @loading) -> constructor: (@routeParams, @projectService, @location, @authService, @currentUserService, @navUrls, @translate, @confirmService) ->
initialize: () -> initialize: () ->
@.projectId = @.project.get("id") @.projectId = @.project.get("id")
@ -73,31 +72,25 @@ class TransferProject
@.validNumberOfMemberships = maxMemberships == null || @.project.get('total_memberships') <= maxMemberships @.validNumberOfMemberships = maxMemberships == null || @.project.get('total_memberships') <= maxMemberships
transferAccept: (token, reason, $event) -> transferAccept: (token, reason) ->
target = angular.element($event.currentTarget) @.loadingAccept = true
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() @.loadingAccept = false
@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, $event) -> transferReject: (token, reason) ->
target = $($event.target) @.loadingReject = true
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("home", { newUrl = @navUrls.resolve("home", {
project: @project.get("slug") project: @project.get("slug")
}) })
currentLoading.finish() @.loadingReject = false
@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)

0
app/modules/projects/transfer/transfer-project.controler.spec.coffee → app/modules/projects/transfer/transfer-project.controller.spec.coffee
View File

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

@ -57,6 +57,7 @@
href="#" href="#"
title="{{'ADMIN.PROJECT_TRANSFER.REJECT' | translate}}" title="{{'ADMIN.PROJECT_TRANSFER.REJECT' | translate}}"
translate="ADMIN.PROJECT_TRANSFER.REJECT" translate="ADMIN.PROJECT_TRANSFER.REJECT"
tg-loading="vm.loadingReject"
) )
a.button.button-green( a.button.button-green(
@ -64,6 +65,7 @@
href="#" href="#"
title="{{'ADMIN.PROJECT_TRANSFER.ACCEPT' | translate}}" title="{{'ADMIN.PROJECT_TRANSFER.ACCEPT' | translate}}"
translate="ADMIN.PROJECT_TRANSFER.ACCEPT" translate="ADMIN.PROJECT_TRANSFER.ACCEPT"
tg-loading="vm.loadingAccept"
) )
tg-cant-own-project-explanation(ng-if="!vm.canBeOwnedByUser.valid") tg-cant-own-project-explanation(ng-if="!vm.canBeOwnedByUser.valid")