github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-09-16 02:52:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7278 from overleaf/jpa-block-track-changes-access

Browse source 
[web] block restricted token users from accessing track-changes details

GitOrigin-RevId: f2e734b48aaa1d1cae6d5db0e0312a78d42165de
This commit is contained in:
Jakob Ackermann 2022-04-05 10:22:18 +01:00 committed by Copybot
parent 2401909919
commit 862ff734c6
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
services/web/frontend/js/ide/editor/directives/aceEditor.js
View file

@ -664,12 +664,13 @@ App.directive(
}
const initTrackChanges = function () {
if (!trackChangesManager) return
trackChangesManager.rangesTracker = scope.sharejsDoc.ranges
// Force onChangeSession in order to set up highlights etc.
trackChangesManager.onChangeSession()
if (!trackChangesManager) return
editor.on('changeSelection', trackChangesManager.onChangeSelection)
// Selection also moves with updates elsewhere in the document

4
services/web/frontend/js/ide/review-panel/RangesTracker.js
View file

@ -247,7 +247,9 @@ export default RangesTracker = class RangesTracker {
this.applyDeleteToChanges(op, metadata)
return this.applyDeleteToComments(op)
} else if (op.c != null) {
return this.addComment(op, metadata)
if (!window.isRestrictedTokenMember) {
return this.addComment(op, metadata)
}
} else {
throw new Error('unknown op type')
}

8
services/web/frontend/js/ide/review-panel/controllers/ReviewPanelController.js
View file

@ -475,12 +475,16 @@ export default App.controller(
}
if ($scope.users[change.metadata.user_id] == null) {
refreshChangeUsers(change.metadata.user_id)
if (!window.isRestrictedTokenMember) {
refreshChangeUsers(change.metadata.user_id)
}
}
}
if (rangesTracker.comments.length > 0) {
ensureThreadsAreLoaded()
if (!window.isRestrictedTokenMember) {
ensureThreadsAreLoaded()
}
}
for (const comment of Array.from(rangesTracker.comments)) {