diff --git a/classes/context/LibraryFileDAO.inc.php b/classes/context/LibraryFileDAO.inc.php index e09927cca13..f3eda754f6e 100644 --- a/classes/context/LibraryFileDAO.inc.php +++ b/classes/context/LibraryFileDAO.inc.php @@ -91,7 +91,7 @@ function newDataObject() { * @return array */ function getLocaleFieldNames() { - return ['name']; + return ['name', 'description']; } /** diff --git a/controllers/grid/files/form/LibraryFileForm.inc.php b/controllers/grid/files/form/LibraryFileForm.inc.php index 071134a82af..c1508c3cb6e 100644 --- a/controllers/grid/files/form/LibraryFileForm.inc.php +++ b/controllers/grid/files/form/LibraryFileForm.inc.php @@ -65,7 +65,7 @@ function fetch($request, $template = null, $display = false) { * @see Form::readInputData() */ function readInputData() { - $this->readUserVars(array('libraryFileName', 'fileType', 'publicAccess')); + $this->readUserVars(array('libraryFileName', 'description', 'fileType', 'publicAccess')); } } diff --git a/controllers/grid/files/submissionDocuments/form/EditLibraryFileForm.inc.php b/controllers/grid/files/submissionDocuments/form/EditLibraryFileForm.inc.php index 6aecd8b895b..15979265d9c 100644 --- a/controllers/grid/files/submissionDocuments/form/EditLibraryFileForm.inc.php +++ b/controllers/grid/files/submissionDocuments/form/EditLibraryFileForm.inc.php @@ -47,6 +47,7 @@ function initData() { $this->_data = array( 'submissionId' => $this->libraryFile->getSubmissionId(), 'libraryFileName' => $this->libraryFile->getName(null), // Localized + 'description' => $this->libraryFile->getData('description'), // Localized 'libraryFile' => $this->libraryFile // For read-only info ); } @@ -56,6 +57,7 @@ function initData() { */ function execute(...$functionArgs) { $this->libraryFile->setName($this->getData('libraryFileName'), null); // Localized + $this->libraryFile->setData('description', $this->getData('description'), null); // Localized $this->libraryFile->setType($this->getData('fileType')); $libraryFileDao = DAORegistry::getDAO('LibraryFileDAO'); /* @var $libraryFileDao LibraryFileDAO */ diff --git a/controllers/grid/files/submissionDocuments/form/NewLibraryFileForm.inc.php b/controllers/grid/files/submissionDocuments/form/NewLibraryFileForm.inc.php index 9004f0d1644..7174229c7b6 100644 --- a/controllers/grid/files/submissionDocuments/form/NewLibraryFileForm.inc.php +++ b/controllers/grid/files/submissionDocuments/form/NewLibraryFileForm.inc.php @@ -69,6 +69,7 @@ function execute(...$functionArgs) { assert(isset($libraryFile)); $libraryFile->setContextId($this->contextId); $libraryFile->setName($this->getData('libraryFileName'), null); // Localized + $libraryFile->setData('description', $this->getData('description'), null); // Localized $libraryFile->setType($this->getData('fileType')); $libraryFile->setSubmissionId($this->getData('submissionId')); diff --git a/controllers/grid/settings/library/form/EditLibraryFileForm.inc.php b/controllers/grid/settings/library/form/EditLibraryFileForm.inc.php index d8ddbd8b73c..16aa7c47aae 100644 --- a/controllers/grid/settings/library/form/EditLibraryFileForm.inc.php +++ b/controllers/grid/settings/library/form/EditLibraryFileForm.inc.php @@ -53,6 +53,7 @@ function readInputData() { function initData() { $this->_data = array( 'libraryFileName' => $this->libraryFile->getName(null), // Localized + 'description' => $this->libraryFile->getData('description'), // Localized 'libraryFile' => $this->libraryFile, // For read-only info 'publicAccess' => $this->libraryFile->getPublicAccess() ? true : false, 'temporaryFileId' => null, @@ -84,6 +85,7 @@ function execute(...$functionArgs) { } $this->libraryFile->setName($this->getData('libraryFileName'), null); // Localized + $this->libraryFile->setData('description', $this->getData('description'), null); // Localized $this->libraryFile->setType($this->getData('fileType')); $this->libraryFile->setPublicAccess($this->getData('publicAccess')); diff --git a/controllers/grid/settings/library/form/NewLibraryFileForm.inc.php b/controllers/grid/settings/library/form/NewLibraryFileForm.inc.php index 93089ee462b..02cdc8f08ed 100644 --- a/controllers/grid/settings/library/form/NewLibraryFileForm.inc.php +++ b/controllers/grid/settings/library/form/NewLibraryFileForm.inc.php @@ -56,6 +56,7 @@ function execute(...$functionArgs) { assert(isset($libraryFile)); $libraryFile->setContextId($this->contextId); $libraryFile->setName($this->getData('libraryFileName'), null); // Localized + $libraryFile->setData('description', $this->getData('description'), null); // Localized $libraryFile->setType($this->getData('fileType')); $libraryFile->setPublicAccess($this->getData('publicAccess')); diff --git a/templates/controllers/grid/files/submissionDocuments/form/editFileForm.tpl b/templates/controllers/grid/files/submissionDocuments/form/editFileForm.tpl index 6859cddb6e7..94e2de25b12 100644 --- a/templates/controllers/grid/files/submissionDocuments/form/editFileForm.tpl +++ b/templates/controllers/grid/files/submissionDocuments/form/editFileForm.tpl @@ -32,6 +32,12 @@ {/fbvFormSection} {/fbvFormArea} + {fbvFormArea id="description"} + {fbvFormSection title="common.description" required=true} + {fbvElement type="textarea" multilingual="true" id="description" value=$description} + {/fbvFormSection} + {/fbvFormArea} + {fbvFormArea id="file"} {fbvFormSection title="common.file"} diff --git a/templates/controllers/grid/files/submissionDocuments/form/newFileForm.tpl b/templates/controllers/grid/files/submissionDocuments/form/newFileForm.tpl index 7bb131b1c6f..22c5608c9e5 100644 --- a/templates/controllers/grid/files/submissionDocuments/form/newFileForm.tpl +++ b/templates/controllers/grid/files/submissionDocuments/form/newFileForm.tpl @@ -43,6 +43,12 @@ {/fbvFormSection} {/fbvFormArea} + {fbvFormArea id="description"} + {fbvFormSection title="common.description" required=true} + {fbvElement type="textarea" multilingual="true" id="description" value=$description} + {/fbvFormSection} + {/fbvFormArea} + {fbvFormArea id="file"} {fbvFormSection title="common.file" required=true} {include file="controllers/fileUploadContainer.tpl" id="plupload"} diff --git a/templates/controllers/grid/settings/library/form/editFileForm.tpl b/templates/controllers/grid/settings/library/form/editFileForm.tpl index 376346ffbfb..b45513f3f86 100644 --- a/templates/controllers/grid/settings/library/form/editFileForm.tpl +++ b/templates/controllers/grid/settings/library/form/editFileForm.tpl @@ -39,6 +39,12 @@ {/fbvFormSection} {/fbvFormArea} + {fbvFormArea id="description"} + {fbvFormSection title="common.description" required=true} + {fbvElement type="textarea" multilingual="true" id="description" value=$description} + {/fbvFormSection} + {/fbvFormArea} + {fbvFormArea id="file"} {fbvFormSection title="common.file"}
diff --git a/templates/controllers/grid/settings/library/form/newFileForm.tpl b/templates/controllers/grid/settings/library/form/newFileForm.tpl index 16974ac75c8..5ecaa89e135 100644 --- a/templates/controllers/grid/settings/library/form/newFileForm.tpl +++ b/templates/controllers/grid/settings/library/form/newFileForm.tpl @@ -40,6 +40,12 @@ {/fbvFormSection} {/fbvFormArea} + {fbvFormArea id="description"} + {fbvFormSection title="common.description" required=true} + {fbvElement type="textarea" multilingual="true" id="description" value=$description} + {/fbvFormSection} + {/fbvFormArea} + {fbvFormArea id="file"} {fbvFormSection title="common.file" required=true} {include file="controllers/fileUploadContainer.tpl" id="plupload"}