*8148* make submission file genres optional

pkp · Apr 25, 2013 · 8c061be · 8c061be
1 parent 1780274
commit 8c061be
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/controllers/wizard/fileUpload/form/PKPSubmissionFilesUploadForm.inc.php b/controllers/wizard/fileUpload/form/PKPSubmissionFilesUploadForm.inc.php
@@ -87,7 +87,7 @@ function validate($request) {
 		$router = $request->getRouter();
 		$context = $router->getContext($request);
 
-		if (!$revisedFileId) {
+		if (!$revisedFileId && $this->_appHasFileGenres()) {
 			// Add an additional check for the genre to the form.
 			$this->addCheck(
 				new FormValidatorCustom(
@@ -201,6 +201,9 @@ function fetch($request) {
 		// Include a status message for this installation's max file upload size.
 		$this->setData('maxFileUploadSize', get_cfg_var('upload_max_filesize'));
 
+		// Allow file genres by default.
+		$this->setData('appHasFileGenres', $this->_appHasFileGenres());
+
 		return parent::fetch($request);
 	}
 
@@ -302,6 +305,14 @@ function _uploadFile($request, $user, $uploaderUserGroupId, $revisedFileId, $fil
 	function _logEvent($request, $user, $submissionFile, $assocType, $revisedFileId, $fileStage) {
 		assert(false);
 	}
+
+	/**
+	 * Indicates whether or not submission files have genres.
+	 * @return boolean
+	 */
+	function _appHasFileGenres() {
+		return true; // the default for PKP-lib
+	}
 }
 
 ?>
diff --git a/templates/controllers/wizard/fileUpload/form/fileUploadForm.tpl b/templates/controllers/wizard/fileUpload/form/fileUploadForm.tpl
@@ -100,7 +100,7 @@
 		{assign var="showFileSelector" value=true}
 	{/if}
 {else}
-	{assign var="showGenreSelector" value=true}
+	{if $appHasFileGenres}{assign var="showGenreSelector" value=true}{/if}
 	{if empty($submissionFileOptions)}
 		{* Use case 4: Upload a new file *}
 		{if is_numeric($revisedFileId)}{"A revised file id cannot be given when uploading a new file!"|fatalError}{/if}