diff --git a/classes/submission/PKPSubmissionFileDAO.inc.php b/classes/submission/PKPSubmissionFileDAO.inc.php index 0a905f28168..6c1ae2178e0 100644 --- a/classes/submission/PKPSubmissionFileDAO.inc.php +++ b/classes/submission/PKPSubmissionFileDAO.inc.php @@ -83,6 +83,7 @@ function &getLatestRevision($fileId, $fileStage = null, $submissionId = null) { $nullVar = null; return $nullVar; } + $revisions =& $this->_getInternally($submissionId, $fileStage, $fileId, null, null, null, null, null, null, null, null, true); return $this->_checkAndReturnRevision($revisions); } @@ -300,6 +301,7 @@ function &updateObject(&$updatedFile, $previousFileId = null, $previousRevision // a file name clash. $previousFilePath = $previousFile->getFilePath(); $targetFilePath = $updatedFile->getFilePath(); + assert($previousFilePath != $targetFilePath && !file_exists($targetFilePath)); import('lib.pkp.classes.file.FileManager'); $fileManager = new FileManager(); @@ -607,6 +609,7 @@ function getAllFileStages() { SUBMISSION_FILE_ATTACHMENT, SUBMISSION_FILE_SIGNOFF, SUBMISSION_FILE_REVIEW_REVISION, + SUBMISSION_FILE_DEPENDENT, ); } diff --git a/classes/submission/SubmissionFile.inc.php b/classes/submission/SubmissionFile.inc.php index 2eac0f53489..d308667196b 100644 --- a/classes/submission/SubmissionFile.inc.php +++ b/classes/submission/SubmissionFile.inc.php @@ -32,6 +32,7 @@ define('SUBMISSION_FILE_SIGNOFF', 14); define('SUBMISSION_FILE_REVIEW_REVISION', 15); define('SUBMISSION_FILE_SUPP', 16); +define('SUBMISSION_FILE_DEPENDENT', 17); class SubmissionFile extends PKPFile { /** diff --git a/controllers/api/file/linkAction/AddFileLinkAction.inc.php b/controllers/api/file/linkAction/AddFileLinkAction.inc.php index fe565ee9629..a170e63a875 100644 --- a/controllers/api/file/linkAction/AddFileLinkAction.inc.php +++ b/controllers/api/file/linkAction/AddFileLinkAction.inc.php @@ -107,6 +107,10 @@ function _getTextLabels($fileStage) { 'wizardTitle' => 'submission.upload.proof', 'buttonLabel' => 'submission.addFile' ), + SUBMISSION_FILE_DEPENDENT => array( + 'wizardTitle' => 'submission.upload.dependent', + 'buttonLabel' => 'submission.addFile' + ), ); assert(isset($textLabels[$fileStage])); diff --git a/locale/en_US/submission.xml b/locale/en_US/submission.xml index b59750f5f58..8e7d00a9696 100644 --- a/locale/en_US/submission.xml +++ b/locale/en_US/submission.xml @@ -424,6 +424,9 @@ This press accepts submissions in several languages. Choose the primary language of the submission from the pulldown below. Submission Files Title and Summary + Gallery Dependent Files + Upload a Dependent File + Upload files that production files require in order to display correctly (HTML, CSS, etc.) Summary Supplementary Files Supporting Agencies