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

Order privileges by highest-to-lowest

Shane Kilkelly 9 лет назад
Родитель
Сommit
ee32648bf4

+ 6 - 7
services/web/app/coffee/Features/Collaborators/CollaboratorsHandler.coffee

@@ -28,18 +28,17 @@ module.exports = CollaboratorsHandler =
 			return callback(error) if error?
 			return callback new Errors.NotFoundError("no project found with id #{project_id}") if !project?
 			members = []
-			# Project owner
 			members.push { id: project.owner_ref.toString(), privilegeLevel: PrivilegeLevels.OWNER, source: Sources.OWNER }
-			# Invited members
-			for member_id in project.readOnly_refs or []
-				members.push { id: member_id.toString(), privilegeLevel: PrivilegeLevels.READ_ONLY, source: Sources.INVITE }
+			# read-and-write
 			for member_id in project.collaberator_refs or []
 				members.push { id: member_id.toString(), privilegeLevel: PrivilegeLevels.READ_AND_WRITE, source: Sources.INVITE }
-			# Token access
-			for member_id in project.tokenAccessReadOnly_refs or []
-				members.push { id: member_id.toString(), privilegeLevel: PrivilegeLevels.READ_ONLY, source: Sources.TOKEN }
 			for member_id in project.tokenAccessReadAndWrite_refs or []
 				members.push { id: member_id.toString(), privilegeLevel: PrivilegeLevels.READ_AND_WRITE, source: Sources.TOKEN }
+			# read-only
+			for member_id in project.readOnly_refs or []
+				members.push { id: member_id.toString(), privilegeLevel: PrivilegeLevels.READ_ONLY, source: Sources.INVITE }
+			for member_id in project.tokenAccessReadOnly_refs or []
+				members.push { id: member_id.toString(), privilegeLevel: PrivilegeLevels.READ_ONLY, source: Sources.TOKEN }
 			return callback null, members
 
 	getMemberIds: (project_id, callback = (error, member_ids) ->) ->

+ 2 - 2
services/web/test/UnitTests/coffee/Collaborators/CollaboratorsHandlerTests.coffee

@@ -44,10 +44,10 @@ describe "CollaboratorsHandler", ->
 				@callback
 					.calledWith(null, [
 						{ id: "owner-ref", privilegeLevel: "owner", source: 'owner'}
-						{ id: "read-only-ref-1", privilegeLevel: "readOnly", source: 'invite'}
-						{ id: "read-only-ref-2", privilegeLevel: "readOnly", source: 'invite'}
 						{ id: "read-write-ref-1", privilegeLevel: "readAndWrite", source: 'invite'}
 						{ id: "read-write-ref-2", privilegeLevel: "readAndWrite", source: 'invite' }
+						{ id: "read-only-ref-1", privilegeLevel: "readOnly", source: 'invite'}
+						{ id: "read-only-ref-2", privilegeLevel: "readOnly", source: 'invite'}
 					])
 					.should.equal true