Shane Kilkelly 9 лет назад
Родитель
Сommit
d386f79a76
1 измененных файлов с 26 добавлено и 9 удалено
  1. 26 9
      services/web/app/coffee/Features/Collaborators/CollaboratorsHandler.coffee

+ 26 - 9
services/web/app/coffee/Features/Collaborators/CollaboratorsHandler.coffee

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