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

Pr history labels bugfixing

services/web/app/views/project/editor/history.pug

@@ -92,7 +92,7 @@ script(type="text/ng-template", id="historyLabelTooltipTpl")
 			i.fa.fa-tag
 			|  {{ $ctrl.labelText }}
 		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")

services/web/app/views/project/editor/history/entriesListV2.pug

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

services/web/public/coffee/ide/history/controllers/HistoryListController.coffee

@@ -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
 

services/web/public/coffee/ide/history/controllers/HistoryV2ListController.coffee

@@ -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()