Skip to content

Commit

Permalink
*8262* define constant for dependent files
Browse files Browse the repository at this point in the history
  • Loading branch information
jnugent committed Jul 10, 2013
1 parent 2e290d2 commit 042429b
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 0 deletions.
3 changes: 3 additions & 0 deletions classes/submission/PKPSubmissionFileDAO.inc.php
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -607,6 +609,7 @@ function getAllFileStages() {
SUBMISSION_FILE_ATTACHMENT,
SUBMISSION_FILE_SIGNOFF,
SUBMISSION_FILE_REVIEW_REVISION,
SUBMISSION_FILE_DEPENDENT,
);
}

Expand Down
1 change: 1 addition & 0 deletions classes/submission/SubmissionFile.inc.php
Expand Up @@ -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 {
/**
Expand Down
4 changes: 4 additions & 0 deletions controllers/api/file/linkAction/AddFileLinkAction.inc.php
Expand Up @@ -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]));
Expand Down
3 changes: 3 additions & 0 deletions locale/en_US/submission.xml
Expand Up @@ -424,6 +424,9 @@
<message key="submission.submit.submissionLocaleDescription">This press accepts submissions in several languages. Choose the primary language of the submission from the pulldown below.</message>
<message key="submission.submit.submissionFiles">Submission Files</message>
<message key="submission.submit.titleAndSummary">Title and Summary</message>
<message key="submission.submit.dependentFiles">Gallery Dependent Files</message>
<message key="submission.upload.dependent">Upload a Dependent File</message>
<message key="submission.dependent.upload.description">Upload files that production files require in order to display correctly (HTML, CSS, etc.)</message>
<message key="submission.summary">Summary</message>
<message key="submission.supplementaryFiles">Supplementary Files</message>
<message key="submission.supportingAgencies">Supporting Agencies</message>
Expand Down

0 comments on commit 042429b

Please sign in to comment.