github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-04-09 19:39:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Protect against reading the project members list too soon.

Browse source
This commit is contained in:
Paulo Reis 2018-08-09 12:16:36 +01:00
parent 4f4ab57958
commit 64a66aafd5
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
services/web/public/coffee/ide/history/controllers/HistoryListController.coffee
View file

@ -6,13 +6,17 @@ define [
App.controller "HistoryListController", ["$scope", "$modal", "ide", ($scope, $modal, ide) ->
$scope.hoveringOverListSelectors = false
projectUsers = $scope.project.members.concat $scope.project.owner
$scope.projectUsers = []
$scope.$watch "project.members", (newVal) ->
if newVal?
$scope.projectUsers = newVal.concat $scope.project.owner
# This method (and maybe the one below) will be removed soon. User details data will be
# injected into the history API responses, so we won't need to fetch user data from other
# local data structures.
_getUserById = (id) ->
_.find projectUsers, (user) ->
_.find $scope.projectUsers, (user) ->
curUserId = user?._id or user?.id
curUserId == id

7
services/web/public/coffee/ide/history/controllers/HistoryV2ListController.coffee
View file

@ -7,8 +7,13 @@ define [
$scope.hoveringOverListSelectors = false
$scope.listConfig =
showOnlyLabelled: false
$scope.projectUsers = $scope.project.members.concat $scope.project.owner
$scope.projectUsers = []
$scope.$watch "project.members", (newVal) ->
if newVal?
$scope.projectUsers = newVal.concat $scope.project.owner
$scope.loadMore = () =>
ide.historyManager.fetchNextBatchOfUpdates()