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

Merge pull request #803 from sharelatex/pr-history-labels-bugfixing

Browse source 
Pr history labels bugfixing
This commit is contained in:
Paulo Jorge Reis 2018-08-09 12:27:02 +01:00 committed by GitHub
commit e760d97cf3
4 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/app/views/project/editor/history.pug
View file

@ -92,7 +92,7 @@ script(type="text/ng-template", id="historyLabelTooltipTpl")
i.fa.fa-tag i.fa.fa-tag
|  {{ $ctrl.labelText }} |  {{ $ctrl.labelText }}
p.history-label-tooltip-owner #{translate("history_label_created_by")} {{ $ctrl.labelOwnerName }} p.history-label-tooltip-owner #{translate("history_label_created_by")} {{ $ctrl.labelOwnerName }}
time.history-label-tooltip-datetime {{ labelCreationDateTime | formatDate }} time.history-label-tooltip-datetime {{ $ctrl.labelCreationDateTime | formatDate }}
script(type="text/ng-template", id="historyV2DeleteLabelModalTemplate") script(type="text/ng-template", id="historyV2DeleteLabelModalTemplate")

1
services/web/app/views/project/editor/history/entriesListV2.pug
View file

@ -119,7 +119,6 @@ script(type="text/ng-template", id="historyEntriesListTpl")
users="$ctrl.users" users="$ctrl.users"
on-select="$ctrl.onEntrySelect({ selectedEntry: selectedEntry })" on-select="$ctrl.onEntrySelect({ selectedEntry: selectedEntry })"
on-label-delete="$ctrl.onLabelDelete({ label: label })" on-label-delete="$ctrl.onLabelDelete({ label: label })"
ng-show="!$ctrl.isLoading"
) )
.loading(ng-show="$ctrl.isLoading") .loading(ng-show="$ctrl.isLoading")
i.fa.fa-spin.fa-refresh i.fa.fa-spin.fa-refresh

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) -> App.controller "HistoryListController", ["$scope", "$modal", "ide", ($scope, $modal, ide) ->
$scope.hoveringOverListSelectors = false $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 # 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 # injected into the history API responses, so we won't need to fetch user data from other
# local data structures. # local data structures.
_getUserById = (id) -> _getUserById = (id) ->
_.find projectUsers, (user) -> _.find $scope.projectUsers, (user) ->
curUserId = user?._id or user?.id curUserId = user?._id or user?.id
curUserId == id curUserId == id

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

@ -7,8 +7,13 @@ define [
$scope.hoveringOverListSelectors = false $scope.hoveringOverListSelectors = false
$scope.listConfig = $scope.listConfig =
showOnlyLabelled: false 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 = () => $scope.loadMore = () =>
ide.historyManager.fetchNextBatchOfUpdates() ide.historyManager.fetchNextBatchOfUpdates()