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

Merge pull request #935 from taigaio/issue/tg-sub-227/leave_a_project_by_me_in_admin_panel 

Fix Issue #227 (tg-sub): Redirect to home if a leave a project from the admin panel
stable
Xaviju 2016-03-29 09:05:55 +02:00
parent 23c0e9062f f27f1a23be
commit fe21852a4c
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/coffee/modules/admin/memberships.coffee
View File

@ -385,7 +385,8 @@ module.directive("tgMembershipsRowRoleSelector", ["$log", "$tgRepo", "$tgConfirm
## Member Actions Directive ## Member Actions Directive
############################################################################# #############################################################################
MembershipsRowActionsDirective = ($log, $repo, $rs, $confirm, $compile, $translate, currentUserService, lightboxFactory) -> MembershipsRowActionsDirective = ($log, $repo, $rs, $confirm, $compile, $translate, $location,
$navUrls, lightboxFactory) ->
activedTemplate = """ activedTemplate = """
<div class="active" <div class="active"
translate="ADMIN.MEMBERSHIP.STATUS_ACTIVE"> translate="ADMIN.MEMBERSHIP.STATUS_ACTIVE">
@ -448,20 +449,22 @@ MembershipsRowActionsDirective = ($log, $repo, $rs, $confirm, $compile, $transla
$confirm.askOnDelete(title, message).then (askResponse) -> $confirm.askOnDelete(title, message).then (askResponse) ->
onSuccess = => onSuccess = =>
askResponse.finish() askResponse.finish()
if member.user != $scope.user.id
if $scope.page > 1 && ($scope.count - 1) <= $scope.paginatedBy
$ctrl.selectFilter("page", $scope.page - 1)
if $scope.page > 1 && ($scope.count - 1) <= $scope.paginatedBy $ctrl.loadMembers()
$ctrl.selectFilter("page", $scope.page - 1) else
$location.path($navUrls.resolve("home"))
$ctrl.loadMembers() text = $translate.instant("ADMIN.MEMBERSHIP.SUCCESS_DELETE", {message: message})
$confirm.notify("success", text, null, 5000)
text = $translate.instant("ADMIN.MEMBERSHIP.SUCCESS_DELETE")
$confirm.notify("success", null, text)
onError = => onError = =>
askResponse.finish(false) askResponse.finish(false)
text = $translate.instant("ADMIN.MEMBERSHIP.ERROR_DELETE", {message: message}) text = $translate.instant("ADMIN.MEMBERSHIP.ERROR_DELETE", {message: message})
$confirm.notify("error", null, text) $confirm.notify("error", text)
$repo.remove(member).then(onSuccess, onError) $repo.remove(member).then(onSuccess, onError)
@ -469,13 +472,12 @@ MembershipsRowActionsDirective = ($log, $repo, $rs, $confirm, $compile, $transla
event.preventDefault() event.preventDefault()
if $scope.project.owner.id == member.user if $scope.project.owner.id == member.user
currentUser = currentUserService.getUser() isCurrentUser = $scope.user.id == member.user
isCurrentUser = currentUser.get('id') == member.user
lightboxFactory.create("tg-lightbox-leave-project-warning", { lightboxFactory.create("tg-lightbox-leave-project-warning", {
class: "lightbox lightbox-leave-project-warning" class: "lightbox lightbox-leave-project-warning"
}, { }, {
currentUser: isCurrentUser, isCurrentUser: isCurrentUser,
project: $scope.project project: $scope.project
}) })
else else
@ -487,7 +489,8 @@ MembershipsRowActionsDirective = ($log, $repo, $rs, $confirm, $compile, $transla
return {link: link} return {link: link}
module.directive("tgMembershipsRowActions", ["$log", "$tgRepo", "$tgResources", "$tgConfirm", "$compile", module.directive("tgMembershipsRowActions", ["$log", "$tgRepo", "$tgResources", "$tgConfirm", "$compile",
"$translate", "tgCurrentUserService", "tgLightboxFactory", MembershipsRowActionsDirective]) "$translate", "$tgLocation", "$tgNavUrls", "tgLightboxFactory",
MembershipsRowActionsDirective])
############################################################################# #############################################################################

2
app/coffee/modules/team/main.coffee
View File

@ -249,7 +249,7 @@ LeaveProjectDirective = ($repo, $confirm, $location, $rs, $navurls, $translate,
lightboxFactory.create("tg-lightbox-leave-project-warning", { lightboxFactory.create("tg-lightbox-leave-project-warning", {
class: "lightbox lightbox-leave-project-warning" class: "lightbox lightbox-leave-project-warning"
}, { }, {
currentUser: true, isCurrentUser: true,
project: $scope.project project: $scope.project
}) })
else else

6
app/partials/common/lightbox/lightbox-leave-project-warning.jade
View File

@ -7,14 +7,14 @@ div.content
h2.title {{'LIGHTBOX.LEAVE_PROJECT_WARNING.TITLE' | translate}} h2.title {{'LIGHTBOX.LEAVE_PROJECT_WARNING.TITLE' | translate}}
div(ng-if="currentUser") div(ng-if="isCurrentUser")
p {{'LIGHTBOX.LEAVE_PROJECT_WARNING.CURRENT_USER_OWNER.DESC' | translate}} p {{'LIGHTBOX.LEAVE_PROJECT_WARNING.CURRENT_USER_OWNER.DESC' | translate}}
a.button-green(tg-nav="project-admin-home:project=project.slug", href="") a.button-green(tg-nav="project-admin-home:project=project.slug", href="")
span(translate="LIGHTBOX.LEAVE_PROJECT_WARNING.CURRENT_USER_OWNER.BUTTON") span(translate="LIGHTBOX.LEAVE_PROJECT_WARNING.CURRENT_USER_OWNER.BUTTON")
div(ng-if="!currentUser") div(ng-if="!isCurrentUser")
p {{'LIGHTBOX.LEAVE_PROJECT_WARNING.OTHER_USER_OWNER.DESC' | translate}} p {{'LIGHTBOX.LEAVE_PROJECT_WARNING.OTHER_USER_OWNER.DESC' | translate}}
a.button-green(tg-nav="project-admin-home:project=project.slug", href="") a.button-green(tg-nav="project-admin-home:project=project.slug", href="")
span(translate="LIGHTBOX.LEAVE_PROJECT_WARNING.OTHER_USER_OWNER.BUTTON") span(translate="LIGHTBOX.LEAVE_PROJECT_WARNING.OTHER_USER_OWNER.BUTTON")