Merge pull request #203 from sharelatex/sk-prevent-archived-deletion

Prevent user from trying to delete archived project they don't own
This commit is contained in:
Shane Kilkelly 2017-12-19 13:36:26 +00:00 committed by GitHub
commit 529d35936d
3 changed files with 8 additions and 1 deletions

View file

@ -2,6 +2,7 @@
input.select-item(
select-individual,
type="checkbox",
ng-disabled="shouldDisableCheckbox(project)",
ng-model="project.selected"
stop-propagation="click"
aria-label=translate('select_project') + " '{{ project.name }}'"

View file

@ -49,18 +49,21 @@ define [
selectAllListController.clearSelectAllState()
scope.$on "select-all:select", () ->
return if element.prop('disabled')
ignoreChanges = true
scope.$apply () ->
scope.ngModel = true
ignoreChanges = false
scope.$on "select-all:deselect", () ->
return if element.prop('disabled')
ignoreChanges = true
scope.$apply () ->
scope.ngModel = false
ignoreChanges = false
scope.$on "select-all:row-clicked", () ->
return if element.prop('disabled')
ignoreChanges = true
scope.$apply () ->
scope.ngModel = !scope.ngModel
@ -75,4 +78,4 @@ define [
link: (scope, element, attrs) ->
element.on "click", (e) ->
scope.$broadcast "select-all:row-clicked"
}
}

View file

@ -462,6 +462,9 @@ define [
App.controller "ProjectListItemController", ($scope) ->
$scope.shouldDisableCheckbox = (project) ->
$scope.filter == 'archived' && project.accessLevel != 'owner'
$scope.projectLink = (project) ->
if project.accessLevel == 'readAndWrite' and project.source == 'token'
"/#{project.tokens.readAndWrite}"