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

Correctly fetch users from project info.

Browse source
This commit is contained in:
Paulo Reis 2017-06-30 15:25:37 +01:00
parent f4bdd5eb2b
commit 1ae53a243a
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
services/web/app/views/project/editor/review-panel.pug
View file

@ -61,16 +61,16 @@
//- disabled="!project.features.trackChanges" //- disabled="!project.features.trackChanges"
//- on-disabled-click="openTrackChangesUpgradeModal" //- on-disabled-click="openTrackChangesUpgradeModal"
li.rp-tc-state-item li.rp-tc-state-item
span.rp-tc-state-item-name.rp-tc-state-item-self( span.rp-tc-state-item-name.rp-tc-state-item-owner(
ng-class="{ 'rp-tc-state-item-name-disabled' : reviewPanel.trackChangesOnForEveryone}" ng-class="{ 'rp-tc-state-item-name-disabled' : reviewPanel.trackChangesOnForEveryone}"
style="color: hsl({{ users[user.id].hue }}, 70%, 40%);" style="color: hsl({{ users[project.owner._id].hue }}, 70%, 40%);"
) {{ users[user.id].name }} ) {{ users[project.owner._id].name }}
//- {{user.id}} //- {{user.id}}
//- Missing on-toggle attribute because we also need to pass user_id to the toggleTrackChangesForUser //- Missing on-toggle attribute because we also need to pass user_id to the toggleTrackChangesForUser
//- method, and it's not clear how. //- method, and it's not clear how.
review-panel-toggle( review-panel-toggle(
ng-model="reviewPanel.trackChangesState[user.id].value" ng-model="reviewPanel.trackChangesState[project.owner._id].value"
on-toggle="toggleTrackChangesForUser(isOn, user.id);" on-toggle="toggleTrackChangesForUser(isOn, project.owner._id);"
disabled="reviewPanel.trackChangesOnForEveryone" disabled="reviewPanel.trackChangesOnForEveryone"
) )
li.rp-tc-state-item(ng-repeat="member in project.members") li.rp-tc-state-item(ng-repeat="member in project.members")

4
services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
View file

@ -584,7 +584,7 @@ define [
$scope.reviewPanel.trackChangesOnForEveryone = false $scope.reviewPanel.trackChangesOnForEveryone = false
for member in $scope.project.members for member in $scope.project.members
_setUserState(member._id, state[member._id] ? false) _setUserState(member._id, state[member._id] ? false)
_setUserState(ide.$scope.user.id, state[ide.$scope.user.id] ? false) _setUserState($scope.project.owner._id, state[$scope.project.owner._id] ? false)
for id, state of $scope.reviewPanel.trackChangesState for id, state of $scope.reviewPanel.trackChangesState
console.log id, state.value, state.syncState console.log id, state.value, state.syncState
@ -609,7 +609,7 @@ define [
else else
data = {on_for: {}} data = {on_for: {}}
for userId, userState of $scope.reviewPanel.trackChangesState for userId, userState of $scope.reviewPanel.trackChangesState
data.on_for[userId] = true if userState.value data.on_for[userId] = userState.value
data._csrf = window.csrfToken data._csrf = window.csrfToken
$http.post "/project/#{$scope.project_id}/track_changes", data $http.post "/project/#{$scope.project_id}/track_changes", data