Browse Source

Tidy up, and fall back to handling data.users.

Shane Kilkelly 10 năm trước cách đây
mục cha
commit
254705c3f1

+ 10 - 2
services/web/public/coffee/ide/share/controllers/ShareProjectModalController.coffee

@@ -51,7 +51,6 @@ define [
 				, (response) ->
 				, (response) ->
 					console.error response
 					console.error response
 			)
 			)
-		window._x = getOutstandingInvites
 
 
 		$scope.filterAutocompleteUsers = ($query) ->
 		$scope.filterAutocompleteUsers = ($query) ->
 			currentMemberEmails = getCurrentMemberEmails()
 			currentMemberEmails = getCurrentMemberEmails()
@@ -84,7 +83,7 @@ define [
 						# Skip this existing member
 						# Skip this existing member
 						return addNextMember()
 						return addNextMember()
 
 
-					# TODO: double-check if member.type == 'user' needs to be an invite
+					# NOTE: groups aren't really a thing in ShareLaTeX, partially inherited from DJ
 					if member.type == "user"
 					if member.type == "user"
 						request = projectInvites.sendInvite(member.email, $scope.inputs.privileges)
 						request = projectInvites.sendInvite(member.email, $scope.inputs.privileges)
 					else if member.type == "group"
 					else if member.type == "group"
@@ -97,6 +96,15 @@ define [
 							if data.invite
 							if data.invite
 								invite = data.invite
 								invite = data.invite
 								$scope.state.invites.push invite
 								$scope.state.invites.push invite
+							else
+								if data.users?
+									users = data.users
+								else if data.user?
+									users = [data.user]
+								else
+									users = []
+								$scope.project.members.push users...
+
 							setTimeout () ->
 							setTimeout () ->
 								# Give $scope a chance to update $scope.canAddCollaborators
 								# Give $scope a chance to update $scope.canAddCollaborators
 								# with new collaborator information.
 								# with new collaborator information.