pkp/pkp-lib#2072 Fix tests and whitespace

NateWr · Sep 4, 2019 · 02c8182 · 02c8182
1 parent 6d1dbc7
commit 02c8182
Show file tree

Hide file tree

Showing 27 changed files with 306 additions and 543 deletions.
diff --git a/classes/components/forms/publication/CatalogEntryForm.inc.php b/classes/components/forms/publication/CatalogEntryForm.inc.php
@@ -44,15 +44,15 @@ public function __construct($action, $locales, $publication, $submission, $baseU
 		$this->successMessage = __('publication.catalogEntry.success');
 		$this->locales = $locales;
 
-    // Series options
-    $seriesOptions = [['value' => '', 'label' => '']];
-    $result = DAORegistry::getDAO('SeriesDAO')->getByContextId($submission->getData('contextId'));
-    while (!$result->eof()) {
-      $series = $result->next();
-      $seriesOptions[] = [
-        'value' => (int) $series->getId(),
-        'label' => $series->getLocalizedTitle(),
-      ];
+		// Series options
+		$seriesOptions = [['value' => '', 'label' => '']];
+		$result = DAORegistry::getDAO('SeriesDAO')->getByContextId($submission->getData('contextId'));
+		while (!$result->eof()) {
+			$series = $result->next();
+			$seriesOptions[] = [
+				'value' => (int) $series->getId(),
+				'label' => $series->getLocalizedTitle(),
+			];
 		}
 
 		// Category options
@@ -73,26 +73,26 @@ public function __construct($action, $locales, $publication, $submission, $baseU
 			->addField(new FieldSelect('seriesId', [
 				'label' => __('series.series'),
 				'value' => $publication->getData('seriesId'),
-        'options' => $seriesOptions,
+				'options' => $seriesOptions,
 			]))
 			->addField(new FieldText('seriesPosition', [
-        'label' => __('submission.submit.seriesPosition'),
-        'description' => __('submission.submit.seriesPosition.description'),
+				'label' => __('submission.submit.seriesPosition'),
+				'description' => __('submission.submit.seriesPosition.description'),
 				'value' => $publication->getData('seriesPosition'),
 			]))
 			->addField(new FieldOptions('categoryIds', [
 				'label' => __('submission.submit.placement.categories'),
 				'value' => (array) $publication->getData('categoryIds'),
-        'options' => $categoryOptions,
+				'options' => $categoryOptions,
 			]))
-      ->addField(new FieldUploadImage('coverImage', [
-        'label' => __('monograph.coverImage'),
-        'value' => $publication->getData('coverImage'),
-        'isMultilingual' => true,
+			->addField(new FieldUploadImage('coverImage', [
+				'label' => __('monograph.coverImage'),
+				'value' => $publication->getData('coverImage'),
+				'isMultilingual' => true,
 				'baseUrl' => $baseUrl,
 				'options' => [
 					'url' => $temporaryFileApiUrl,
 				],
 			]));
-  }
+	}
 }
diff --git a/classes/monograph/ChapterAuthorDAO.inc.php b/classes/monograph/ChapterAuthorDAO.inc.php
@@ -117,6 +117,17 @@ function deleteChapterAuthorById($authorId, $chapterId = null) {
 		);
 	}
 
+	/**
+	 * Remove all authors from a chapter
+	 * @param $chapterId int
+	 */
+	function deleteChapterAuthorsByChapterId($chapterId) {
+		$this->update(
+			'DELETE FROM submission_chapter_authors WHERE chapter_id = ?',
+			[(int) $chapterId]
+		);
+	}
+
 	/**
 	 * Construct and return a new data object.
 	 * @return ChapterAuthor

diff --git a/classes/publication/Publication.inc.php b/classes/publication/Publication.inc.php
@@ -31,9 +31,9 @@ public function getEditorString() {
 			}
 		}
 
-    // Spaces are stripped from the locale strings, so we have to add the
-    // space in here.
-    return join(__('common.commaListSeparator') . ' ', $editorNames);
+		// Spaces are stripped from the locale strings, so we have to add the
+		// space in here.
+		return join(__('common.commaListSeparator') . ' ', $editorNames);
 	}
 
 }
diff --git a/classes/publication/PublicationDAO.inc.php b/classes/publication/PublicationDAO.inc.php
@@ -19,7 +19,7 @@ class PublicationDAO extends PKPPublicationDAO {
 	 * @copydoc SchemaDAO::_fromRow()
 	 */
 	public function _fromRow($primaryRow) {
-    $publication = parent::_fromRow($primaryRow);
+		$publication = parent::_fromRow($primaryRow);
 
 		$publication->setData('publicationFormats', Application::getRepresentationDao()->getByPublicationId($publication->getId())->toArray());
 		$publication->setData('chapters', DAORegistry::getDAO('ChapterDAO')->getByPublicationId($publication->getId())->toArray());

diff --git a/classes/search/MonographSearchDAO.inc.php b/classes/search/MonographSearchDAO.inc.php
@@ -58,21 +58,24 @@ function getPhraseResults($press, $phrase, $publishedFrom = null, $publishedTo =
 			$params[] = $press->getId();
 		}
 
+		import('classes.submission.Submission'); // import STATUS_PUBLISHED constant
 		$params[] = STATUS_PUBLISHED;
 
 		$result = $this->retrieveCached(
 			$sql = 'SELECT
 				o.submission_id,
 				s.context_id as press_id,
-				s.date_published as s_pub,
+				p.date_published as s_pub,
 				COUNT(*) AS count
 			FROM
 				submissions s,
+				publications p,
 				submission_search_objects o NATURAL JOIN ' . $sqlFrom . '
 			WHERE o.submission_id = s.submission_id
+			AND s.current_publication_id = p.publication_id
 			AND ' . $sqlWhere . '
 			AND s.status = ?
-			GROUP BY o.submission_id, s.context_id, s.date_published
+			GROUP BY o.submission_id, s.context_id, p.date_published
 			ORDER BY count DESC
 			LIMIT ' . $limit,
 			$params,

diff --git a/classes/services/PublicationFormatService.inc.php b/classes/services/PublicationFormatService.inc.php
@@ -9,8 +9,7 @@
  * @class PublicationFormatService
  * @ingroup services
  *
- * @brief Extends the base publication format service class with app-specific
- *  requirements.
+ * @brief A service class with methods to handle publication formats
  */
 namespace APP\Services;
 
@@ -29,17 +28,17 @@ class PublicationFormatService {
 	 */
 	public function deleteFormat($publicationFormat, $submission, $context) {
 
-    Application::getRepresentationDAO()->deleteById($publicationFormat->getId());
+		Application::getRepresentationDAO()->deleteById($publicationFormat->getId());
 
-    // Delete publication format metadata
-    $metadataDaos = ['IdentificationCodeDAO', 'MarketDAO', 'PublicationDateDAO', 'SalesRightsDAO'];
-    foreach ($metadataDaos as $metadataDao) {
-      $result = DAORegistry::getDAO($metadataDao)->getByPublicationFormatId($publicationFormat->getId());
-      while (!$result->eof()) {
+		// Delete publication format metadata
+		$metadataDaos = ['IdentificationCodeDAO', 'MarketDAO', 'PublicationDateDAO', 'SalesRightsDAO'];
+		foreach ($metadataDaos as $metadataDao) {
+			$result = DAORegistry::getDAO($metadataDao)->getByPublicationFormatId($publicationFormat->getId());
+			while (!$result->eof()) {
 				$object = $result->next();
-        DAORegistry::getDAO($metadataDao)->deleteObject($object);
-      }
-    }
+				DAORegistry::getDAO($metadataDao)->deleteObject($object);
+			}
+		}
 
 		// Create a tombstone for this publication format.
 		import('classes.publicationFormat.PublicationFormatTombstoneManager');

diff --git a/classes/submission/reviewer/ReviewerSubmissionDAO.inc.php b/classes/submission/reviewer/ReviewerSubmissionDAO.inc.php
@@ -46,7 +46,7 @@ function getReviewerSubmission($reviewId) {
 		$primaryLocale = AppLocale::getPrimaryLocale();
 		$locale = AppLocale::getLocale();
 		$result = $this->retrieve(
-			'SELECT	m.*, pm.date_published,
+			'SELECT	m.*, p.date_published,
 				r.*,
 				COALESCE(stl.setting_value, stpl.setting_value) AS series_title
 			FROM	submissions m

diff --git a/controllers/grid/catalogEntry/PublicationFormatGridHandler.inc.php b/controllers/grid/catalogEntry/PublicationFormatGridHandler.inc.php
@@ -512,7 +512,7 @@ function setProofFileCompletion($args, $request) {
 			$request->getUserVar('fileId'),
 			$request->getUserVar('revision'),
 			SUBMISSION_FILE_PROOF,
-			$submission->getId(),
+			$submission->getId()
 		);
 		$confirmationText = __('editor.submission.proofreading.confirmRemoveCompletion');
 		if ($request->getUserVar('approval')) {
@@ -557,7 +557,7 @@ function selectFiles($args, $request) {
 		$representation = $this->getAuthorizedContextObject(ASSOC_TYPE_REPRESENTATION);
 
 		import('lib.pkp.controllers.grid.files.proof.form.ManageProofFilesForm');
-		$manageProofFilesForm = new ManageProofFilesForm($this->getSubmission()->getId(), $representation->getId());
+		$manageProofFilesForm = new ManageProofFilesForm($this->getSubmission()->getId(), $this->getPublication()->getId(), $representation->getId());
 		$manageProofFilesForm->initData();
 		return new JSONMessage(true, $manageProofFilesForm->fetch($request));
 	}

diff --git a/controllers/grid/catalogEntry/RepresentativesGridHandler.inc.php b/controllers/grid/catalogEntry/RepresentativesGridHandler.inc.php
@@ -35,7 +35,7 @@ class RepresentativesGridHandler extends CategoryGridHandler {
 	function __construct() {
 		parent::__construct();
 		$this->addRoleAssignment(
-				array(ROLE_ID_MANAGER),
+				array(ROLE_ID_MANAGER, ROLE_ID_SUB_EDITOR, ROLE_ID_ASSISTANT),
 				array('fetchGrid', 'fetchCategory', 'fetchRow', 'addRepresentative', 'editRepresentative',
 				'updateRepresentative', 'deleteRepresentative'));
 	}

diff --git a/controllers/grid/catalogEntry/form/PublicationFormatMetadataForm.inc.php b/controllers/grid/catalogEntry/form/PublicationFormatMetadataForm.inc.php
@@ -53,14 +53,14 @@ class PublicationFormatMetadataForm extends Form {
 	 * @param $formParams array
 	 */
 	function __construct($submission, $publication, $representation, $isPhysicalFormat = true, $remoteURL = null, $stageId = null, $formParams = null) {
-    parent::__construct('controllers/tab/catalogEntry/form/publicationMetadataFormFields.tpl');
-    $this->_submission = $submission;
-    $this->_publication = $publication;
-    $this->_publicationFormat = $representation;
+		parent::__construct('controllers/tab/catalogEntry/form/publicationMetadataFormFields.tpl');
+		$this->_submission = $submission;
+		$this->_publication = $publication;
+		$this->_publicationFormat = $representation;
 
-    if (!$this->_submission || !$this->_publication || !$this->_publicationFormat) {
-      throw new Exception('PublicationFormatMetadataForm was instantiated without required dependencies.');
-    }
+		if (!$this->_submission || !$this->_publication || !$this->_publicationFormat) {
+			throw new Exception('PublicationFormatMetadataForm was instantiated without required dependencies.');
+		}
 
 		$this->_pubIdPluginHelper = new PKPPubIdPluginHelper();
 
@@ -271,7 +271,7 @@ function execute() {
 	 */
 	function getSubmission() {
 		return $this->_submission;
-  }
+	}
 
 	/**
 	 * Get the Publication

diff --git a/controllers/grid/users/author/form/AuthorForm.inc.php b/controllers/grid/users/author/form/AuthorForm.inc.php
@@ -23,10 +23,10 @@ class AuthorForm extends PKPAuthorForm {
 	 * @copydoc Form::initData()
 	 */
 	function initData() {
-    parent::initData();
-    if ($this->getAuthor()) {
-      $this->_data['isVolumeEditor'] = $this->getAuthor()->getIsVolumeEditor();
-    }
+		parent::initData();
+		if ($this->getAuthor()) {
+			$this->_data['isVolumeEditor'] = $this->getAuthor()->getIsVolumeEditor();
+		}
 	}
 
 	/**
@@ -42,21 +42,21 @@ function fetch($request, $template = null, $display = false) {
 	 * @copydoc Form::readInputData()
 	 */
 	function readInputData() {
-    parent::readInputData();
-    $this->readUserVars(['isVolumeEditor']);
+		parent::readInputData();
+		$this->readUserVars(['isVolumeEditor']);
 	}
 
 	/**
 	 * @copydoc Form::execute()
 	 */
 	function execute() {
-    $authorId = parent::execute();
-    $author = Services::get('author')->get($authorId);
-    if ($author) {
-      $author->setIsVolumeEditor($this->getData('isVolumeEditor'));
-      DAORegistry::getDAO('AuthorDAO')->updateObject($author);
-    }
-    return $author->getId();
+		$authorId = parent::execute();
+		$author = Services::get('author')->get($authorId);
+		if ($author) {
+			$author->setIsVolumeEditor($this->getData('isVolumeEditor'));
+			DAORegistry::getDAO('AuthorDAO')->updateObject($author);
+		}
+		return $author->getId();
 	}
 }
 

diff --git a/controllers/grid/users/chapter/ChapterGridHandler.inc.php b/controllers/grid/users/chapter/ChapterGridHandler.inc.php
@@ -135,7 +135,7 @@ function initialize($request, $args = null) {
 
 		// Columns
 		// reuse the cell providers for the AuthorGrid
-		$cellProvider = new PKPAuthorGridCellProvider();
+		$cellProvider = new PKPAuthorGridCellProvider($this->getPublication());
 		$this->addColumn(
 			new GridColumn(
 				'name',