Просмотр исходного кода

Merge branch 'sk-bug-can-invite-collaborator'

Shane Kilkelly 10 лет назад
Родитель
Сommit
e85cb161b2

+ 8 - 3
services/web/public/coffee/ide/share/controllers/ShareProjectModalController.coffee

@@ -19,11 +19,16 @@ define [
 			, 200
 			, 200
 
 
 		INFINITE_COLLABORATORS = -1
 		INFINITE_COLLABORATORS = -1
-		$scope.$watch "(project.members.length + project.invites.length)", (noOfMembers) ->
+
+		$scope.refreshCanAddCollaborators = () ->
 			allowedNoOfMembers = $scope.project.features.collaborators
 			allowedNoOfMembers = $scope.project.features.collaborators
-			$scope.canAddCollaborators = noOfMembers < allowedNoOfMembers or allowedNoOfMembers == INFINITE_COLLABORATORS
+			$scope.canAddCollaborators = (
+				($scope.project.members.length + $scope.project.invites.length) < allowedNoOfMembers or allowedNoOfMembers == INFINITE_COLLABORATORS
+			)
+		$scope.refreshCanAddCollaborators()
 
 
-		window._m = projectMembers
+		$scope.$watch "(project.members.length + project.invites.length)", (_noOfMembers) ->
+			$scope.refreshCanAddCollaborators()
 
 
 		$scope.autocompleteContacts = []
 		$scope.autocompleteContacts = []
 		do loadAutocompleteUsers = () ->
 		do loadAutocompleteUsers = () ->