github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix bug where unowned project would show archive quick action instead of leave

Browse source 
If the user does not own the project, the project can only be left, not
archived. Previously the quick action button was only showing the archive icon
but clicking the button would correctly leave the project. This is confusing,
so this commit corrects to show the leave icon for projects not owned by the
current user
This commit is contained in:
Alasdair Smith 2018-06-06 16:59:13 +01:00
parent 5681a76f4c
commit 8f71b104c5
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
services/web/app/views/project/list/item.pug
View file

@ -64,13 +64,21 @@ if settings.overleaf
)
i.icon.fa.fa-cloud-download
button.btn.btn-link.action-btn(
ng-if="!project.archived"
ng-if="!project.archived && isOwner()"
tooltip=translate('archive'),
tooltip-placement="top",
tooltip-append-to-body="true",
ng-click="archive($event)"
ng-click="archiveOrLeave($event)"
)
i.icon.fa.fa-inbox
button.btn.btn-link.action-btn(
ng-if="!project.archived && !isOwner()"
tooltip=translate('leave'),
tooltip-placement="top",
tooltip-append-to-body="true",
ng-click="archiveOrLeave($event)"
)
i.icon.fa.fa-sign-out
button.btn.btn-link.action-btn(
ng-if="project.archived"
tooltip=translate('unarchive'),

5
services/web/public/coffee/main/project-list/project-list.coffee
View file

@ -490,6 +490,9 @@ define [
else
return "None"
$scope.isOwner = () ->
window.user_id == $scope.project.owner._id
$scope.$watch "project.selected", (value) ->
if value?
$scope.updateSelectedProjects()
@ -502,7 +505,7 @@ define [
e.stopPropagation()
$scope.downloadProjectsById([$scope.project.id])
$scope.archive = (e) ->
$scope.archiveOrLeave = (e) ->
e.stopPropagation()
$scope.archiveOrLeaveProjects([$scope.project])