Эх сурвалжийг харах

Fix validation of project-output-file, no build_id for imported v1 projects

Shane Kilkelly 8 жил өмнө
parent
commit
04be842b30

+ 11 - 5
services/web/app/coffee/Features/LinkedFiles/ProjectOutputFileAgent.coffee

@@ -93,11 +93,17 @@ module.exports = ProjectOutputFileAgent = {
 	_getSourceProject: LinkedFilesHandler.getSourceProject
 
 	_validate: (data) ->
-		return (
-			(data.source_project_id? || data.v1_source_doc_id?) &&
-			data.source_output_file_path? &&
-			data.build_id?
-		)
+		if data.v1_source_doc_id?
+			(
+				data.v1_source_doc_id? &&
+				data.source_output_file_path?
+			)
+		else
+			(
+				data.source_project_id? &&
+				data.source_output_file_path? &&
+				data.build_id?
+			)
 
 	_checkAuth: (project_id, data, current_user_id, callback = (err, allowed)->) ->
 		callback = _.once(callback)

+ 1 - 2
services/web/test/acceptance/coffee/LinkedFilesTests.coffee

@@ -428,8 +428,7 @@ describe "LinkedFiles", ->
 							linkedFileData: {
 								provider: "project_output_file",
 								v1_source_doc_id: 9999999,  # We won't find this id in the database
-								source_output_file_path: "project.pdf",
-								build_id: '123'
+								source_output_file_path: "project.pdf"
 							},
 							_id: "abcdef",
 							rev: 0,