*6968* Check stage_id constant behavior

pkp · Dec 14, 2012 · cac0091 · cac0091
1 parent ec20e82
commit cac0091
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 2 deletions.
diff --git a/classes/submission/reviewAssignment/ReviewAssignmentDAO.inc.php b/classes/submission/reviewAssignment/ReviewAssignmentDAO.inc.php
@@ -237,7 +237,9 @@ function getCompletedReviewCounts($journalId) {
 	 * @return ReviewAssignment
 	 */
 	function newDataObject() {
-		return new ReviewAssignment();
+		$reviewAssignment = new ReviewAssignment();
+		$reviewAssignment->setStageId(1); // Ensure correct default is used
+		return $reviewAssignment;
 	}
 
 	/**

diff --git a/classes/submission/sectionEditor/SectionEditorAction.inc.php b/classes/submission/sectionEditor/SectionEditorAction.inc.php
@@ -99,7 +99,7 @@ function addReviewer($sectionEditorSubmission, $reviewerId, $round, $request) {
 		// Only add the reviewer if he has not already
 		// been assigned to review this article.
 		if (!$assigned && isset($reviewer) && !HookRegistry::call('SectionEditorAction::addReviewer', array(&$sectionEditorSubmission, $reviewerId))) {
-			$reviewAssignment = new ReviewAssignment();
+			$reviewAssignment = $reviewAssignmentDao->newDataObject();
 			$reviewAssignment->setReviewerId($reviewerId);
 			$reviewAssignment->setDateAssigned(Core::getCurrentDate());
 			$reviewAssignment->setRound($round);

diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
@@ -331,6 +331,11 @@
 		<note file="docs/release-notes/README-2.4.1" />
 	</upgrade>
 
+	<upgrade minversion="2.0.0.0" maxversion="2.4.0.0">
+		<data file="dbscripts/xml/upgrade/2.4.2_update.xml" />
+		<!-- Pending addition note file="docs/release-notes/README-2.4.2" / -->
+	</upgrade>
+
 	<!-- update plugin configuration - should be done as the final upgrade task -->
 	<code function="addPluginVersions" />
 </install>
diff --git a/dbscripts/xml/upgrade/2.4.2_update.xml b/dbscripts/xml/upgrade/2.4.2_update.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE data SYSTEM "../../../lib/pkp/dtd/xmlData.dtd">
+
+<!--
+  * 2.4.2_update.xml
+  *
+  * Copyright (c) 2003-2012 John Willinsky
+  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
+  *
+  * 2.4.2 database updates XML file.
+  -->
+<data>
+	<!-- Bug #6968: Check stage_id constant behavior -->
+	<sql>
+		<query>UPDATE review_assignments SET stage_id=1 WHERE stage_id=0</query>
+	</sql>
+</data>