*8148* use new file assoc type constants from pkp-lib

pkp · Mar 8, 2013 · f71466c · f71466c
1 parent 91d86f4
commit f71466c
Show file tree

Hide file tree

Showing 32 changed files with 53 additions and 55 deletions.
diff --git a/classes/core/Application.inc.php b/classes/core/Application.inc.php
@@ -22,7 +22,6 @@
 define('ASSOC_TYPE_PRESS',			0x0000200);
 define('ASSOC_TYPE_MONOGRAPH',			ASSOC_TYPE_SUBMISSION);
 define('ASSOC_TYPE_PRODUCTION_ASSIGNMENT',	0x0000202);
-define('ASSOC_TYPE_MONOGRAPH_FILE',		0x0000203);
 define('ASSOC_TYPE_REVIEW_RESPONSE',		0x0000204);
 define('ASSOC_TYPE_REVIEW_ASSIGNMENT',		0x0000205);
 define('ASSOC_TYPE_MONOGRAPH_EMAIL_LOG_ENTRY',	0x0000206);
@@ -33,7 +32,6 @@
 define('ASSOC_TYPE_REVIEW_ROUND',		0x000020B);
 define('ASSOC_TYPE_CATEGORY',			0x000020D);
 define('ASSOC_TYPE_SERIES',			0x000020E);
-define('ASSOC_TYPE_MONOGRAPH_FILES',		0x000020F);
 define('ASSOC_TYPE_PUBLISHED_MONOGRAPH',	0x0000210);
 
 define('CONTEXT_PRESS', 1);

diff --git a/classes/file/MonographFileManager.inc.php b/classes/file/MonographFileManager.inc.php
@@ -111,7 +111,7 @@ function recordView(&$monographFile) {
 		if (is_a($user, 'User')) {
 			$viewsDao =& DAORegistry::getDAO('ViewsDAO');
 			$viewsDao->recordView(
-			ASSOC_TYPE_MONOGRAPH_FILE, $monographFile->getFileIdAndRevision(),
+			ASSOC_TYPE_SUBMISSION_FILE, $monographFile->getFileIdAndRevision(),
 			$user->getId()
 			);
 		}

diff --git a/classes/log/MonographEventLogDAO.inc.php b/classes/log/MonographEventLogDAO.inc.php
@@ -30,7 +30,7 @@ function MonographEventLogDAO() {
 	 */
 	function newDataObject() {
 		$returner = new MonographEventLogEntry();
-		$returner->setAssocType(ASSOC_TYPE_MONOGRAPH_FILE);
+		$returner->setAssocType(ASSOC_TYPE_SUBMISSION_FILE);
 		return $returner;
 	}
 

diff --git a/classes/log/MonographFileEmailLogDAO.inc.php b/classes/log/MonographFileEmailLogDAO.inc.php
@@ -30,7 +30,7 @@ function MonographFileEmailLogDAO() {
 	 */
 	function newDataObject() {
 		$returner = new MonographFileEmailLogEntry();
-		$returner->setAssocType(ASSOC_TYPE_MONOGRAPH_FILE);
+		$returner->setAssocType(ASSOC_TYPE_SUBMISSION_FILE);
 		return $returner;
 	}
 
@@ -42,7 +42,7 @@ function newDataObject() {
 	 * @return DAOResultFactory
 	 */
 	function getByEventType($fileId, $eventType, $userId = null) {
-		return parent::getByEventType(ASSOC_TYPE_MONOGRAPH_FILE, $fileId, $eventType, $userId);
+		return parent::getByEventType(ASSOC_TYPE_SUBMISSION_FILE, $fileId, $eventType, $userId);
 	}
 }
 

diff --git a/classes/log/MonographFileEventLogDAO.inc.php b/classes/log/MonographFileEventLogDAO.inc.php
@@ -30,7 +30,7 @@ function MonographFileEventLogDAO() {
 	 */
 	function newDataObject() {
 		$returner = new MonographFileEventLogEntry();
-		$returner->setAssocType(ASSOC_TYPE_MONOGRAPH_FILE);
+		$returner->setAssocType(ASSOC_TYPE_SUBMISSION_FILE);
 		return $returner;
 	}
 
@@ -40,7 +40,7 @@ function newDataObject() {
 	 * @return DAOResultFactory
 	 */
 	function &getByFileId($fileId) {
-		$returner =& $this->getByAssoc(ASSOC_TYPE_MONOGRAPH_FILE, $fileId);
+		$returner =& $this->getByAssoc(ASSOC_TYPE_SUBMISSION_FILE, $fileId);
 		return $returner;
 	}
 }

diff --git a/classes/log/MonographFileLog.inc.php b/classes/log/MonographFileLog.inc.php
@@ -36,7 +36,7 @@ function logEvent(&$request, &$monographFile, $eventType, $messageKey, $params =
 		$user =& $request->getUser();
 		if ($user) $entry->setUserId($user->getId());
 
-		$entry->setAssocType(ASSOC_TYPE_MONOGRAPH_FILE);
+		$entry->setAssocType(ASSOC_TYPE_SUBMISSION_FILE);
 		$entry->setAssocId($monographFile->getFileId());
 
 		// Set explicit parts of the log entry

diff --git a/classes/monograph/MonographFileDAODelegate.inc.php b/classes/monograph/MonographFileDAODelegate.inc.php
@@ -322,7 +322,7 @@ function _updateDependentObjects($monographFile, $previousFile) {
 		// Update file views that refer to this file.
 		$viewsDao = DAORegistry::getDAO('ViewsDAO'); /* @var $viewsDao ViewsDAO */
 		$viewsDao->moveViews(
-			ASSOC_TYPE_MONOGRAPH_FILE,
+			ASSOC_TYPE_SUBMISSION_FILE,
 			$previousFile->getFileIdAndRevision(), $monographFile->getFileIdAndRevision()
 		);
 	}
@@ -344,7 +344,7 @@ function _deleteDependentObjects($monographFile) {
 		// Delete file views that refer to this file.
 		$viewsDao = DAORegistry::getDAO('ViewsDAO'); /* @var $viewsDao ViewsDAO */
 		$viewsDao->deleteViews(
-			ASSOC_TYPE_MONOGRAPH_FILE, $monographFile->getFileIdAndRevision()
+			ASSOC_TYPE_SUBMISSION_FILE, $monographFile->getFileIdAndRevision()
 		);
 	}
 }

diff --git a/classes/monograph/MonographFileSignoffDAO.inc.php b/classes/monograph/MonographFileSignoffDAO.inc.php
@@ -32,7 +32,7 @@ function MonographFileSignoffDAO() {
 	 * @see SignoffDAO::getById
 	 */
 	function getById($signoffId) {
-		return parent::getById($signoffId, ASSOC_TYPE_MONOGRAPH_FILE);
+		return parent::getById($signoffId, ASSOC_TYPE_SUBMISSION_FILE);
 	}
 
 	/**
@@ -50,7 +50,7 @@ function build($symbolic, $monographFileId, $userId = null,
 			$userGroupId = null, $fileId = null, $fileRevision = null) {
 		return parent::build(
 			$symbolic,
-			ASSOC_TYPE_MONOGRAPH_FILE, $monographFileId,
+			ASSOC_TYPE_SUBMISSION_FILE, $monographFileId,
 			$userId, $userGroupId,
 			$fileId, $fileRevision
 		);
@@ -65,15 +65,15 @@ function build($symbolic, $monographFileId, $userId = null,
 	 * @return boolean
 	 */
 	function signoffExists($symbolic, $monographFileId, $userId = null, $userGroupId = null) {
-		return parent::signoffExists($symbolic, ASSOC_TYPE_MONOGRAPH_FILE, $userId, $userGroupId);
+		return parent::signoffExists($symbolic, ASSOC_TYPE_SUBMISSION_FILE, $userId, $userGroupId);
 	}
 
 	/**
 	 * @see SignoffDAO::newDataObject
 	 */
 	function newDataObject() {
 		$signoff = parent::newDataObject();
-		$signoff->setAssocType(ASSOC_TYPE_MONOGRAPH_FILE);
+		$signoff->setAssocType(ASSOC_TYPE_SUBMISSION_FILE);
 		return $signoff;
 	}
 
@@ -93,7 +93,7 @@ function getBySymbolic($symbolic, $monographFileId, $userId = null,
 			$userGroupId = null, $fileId = null, $fileRevision = null) {
 		return parent::getBySymbolic(
 			$symbolic,
-			ASSOC_TYPE_MONOGRAPH_FILE, $monographFileId,
+			ASSOC_TYPE_SUBMISSION_FILE, $monographFileId,
 			$userId, $userGroupId,
 			$fileId, $fileRevision
 		);
@@ -109,7 +109,7 @@ function getBySymbolic($symbolic, $monographFileId, $userId = null,
 	 * @return DAOResultFactory
 	 */
 	function getAllBySymbolic($symbolic, $monographFileId = null, $userId = null, $userGroupId = null) {
-		return parent::getAllBySymbolic($symbolic, ASSOC_TYPE_MONOGRAPH_FILE, $monographFileId, $userId, $userGroupId);
+		return parent::getAllBySymbolic($symbolic, ASSOC_TYPE_SUBMISSION_FILE, $monographFileId, $userId, $userGroupId);
 	}
 
 	/**
@@ -123,7 +123,7 @@ function getAllBySymbolic($symbolic, $monographFileId = null, $userId = null, $u
 	 */
 	function getAllByMonograph($monographId, $symbolic = null, $userId = null, $userGroupId = null, $notCompletedOnly = false) {
 		$sql = 'SELECT s.* FROM signoffs s, monograph_files mf WHERE s.assoc_type = ? AND s.assoc_id = mf.file_id AND mf.monograph_id = ?';
-		$params = array(ASSOC_TYPE_MONOGRAPH_FILE, (int) $monographId);
+		$params = array(ASSOC_TYPE_SUBMISSION_FILE, (int) $monographId);
 
 		if ($symbolic) {
 			$sql .= ' AND s.symbolic = ?';

diff --git a/classes/notification/NotificationManager.inc.php b/classes/notification/NotificationManager.inc.php
@@ -54,7 +54,7 @@ public function getNotificationUrl(&$request, &$notification) {
 			case NOTIFICATION_TYPE_COPYEDIT_ASSIGNMENT:
 				$signoffDao = DAORegistry::getDAO('SignoffDAO'); /* @var $signoffDao SignoffDAO */
 				$signoff = $signoffDao->getById($notification->getAssocId());
-				assert(is_a($signoff, 'Signoff') && $signoff->getAssocType() == ASSOC_TYPE_MONOGRAPH_FILE);
+				assert(is_a($signoff, 'Signoff') && $signoff->getAssocType() == ASSOC_TYPE_SUBMISSION_FILE);
 
 				$submissionFileDao = DAORegistry::getDAO('SubmissionFileDAO'); /* @var $submissionFileDao SubmissionFileDAO */
 				$monographFile = $submissionFileDao->getLatestRevision($signoff->getAssocId());

diff --git a/classes/notification/managerDelegate/AuditorRequestNotificationManager.inc.php b/classes/notification/managerDelegate/AuditorRequestNotificationManager.inc.php
@@ -31,7 +31,7 @@ function AuditorRequestNotificationManagerDelegate($notificationType) {
 	function getNotificationMessage(&$request, &$notification) {
 		$signoffDao =& DAORegistry::getDAO('SignoffDAO'); /* @var $signoffDao SignoffDAO */
 		$signoff = $signoffDao->getById($notification->getAssocId());
-		assert($signoff->getAssocType() == ASSOC_TYPE_MONOGRAPH_FILE);
+		assert($signoff->getAssocType() == ASSOC_TYPE_SUBMISSION_FILE);
 
 		$submissionFileDao =& DAORegistry::getDAO('SubmissionFileDAO');
 		$monographFile =& $submissionFileDao->getLatestRevision($signoff->getAssocId());

diff --git a/classes/notification/managerDelegate/CopyeditAssignmentNotificationManager.inc.php b/classes/notification/managerDelegate/CopyeditAssignmentNotificationManager.inc.php
@@ -31,7 +31,7 @@ function CopyeditAssignmentNotificationManager($notificationType) {
 	function getNotificationMessage(&$request, &$notification) {
 		$signoffDao =& DAORegistry::getDAO('SignoffDAO'); /* @var $signoffDao SignoffDAO */
 		$signoff = $signoffDao->getById($notification->getAssocId());
-		assert($signoff->getAssocType() == ASSOC_TYPE_MONOGRAPH_FILE);
+		assert($signoff->getAssocType() == ASSOC_TYPE_SUBMISSION_FILE);
 
 		$submissionFileDao =& DAORegistry::getDAO('SubmissionFileDAO');
 		$monographFile =& $submissionFileDao->getLatestRevision($signoff->getAssocId());

diff --git a/classes/security/authorization/internal/MonographFileAssignedAuditorAccessPolicy.inc.php b/classes/security/authorization/internal/MonographFileAssignedAuditorAccessPolicy.inc.php
@@ -43,7 +43,7 @@ function effect() {
 		if (!is_a($monographFile, 'MonographFile')) return AUTHORIZATION_DENY;
 
 		$signoffDao =& DAORegistry::getDAO('SignoffDAO');
-		$signoffsFactory =& $signoffDao->getAllByAssocType(ASSOC_TYPE_MONOGRAPH_FILE, $monographFile->getFileId(), null, $user->getId());
+		$signoffsFactory =& $signoffDao->getAllByAssocType(ASSOC_TYPE_SUBMISSION_FILE, $monographFile->getFileId(), null, $user->getId());
 
 		if ($signoffsFactory->wasEmpty()) {
 			return AUTHORIZATION_DENY;

diff --git a/classes/security/authorization/internal/MonographFileMatchesMonographPolicy.inc.php b/classes/security/authorization/internal/MonographFileMatchesMonographPolicy.inc.php
@@ -45,15 +45,15 @@ function effect() {
 		// Check if the monograph file belongs to the monograph.
 		if ($monographFile->getMonographId() == $monograph->getId()) {
 			// We add this monograph file to the context monograph files array.
-			$monographFilesArray = $this->getAuthorizedContextObject(ASSOC_TYPE_MONOGRAPH_FILES);
+			$monographFilesArray = $this->getAuthorizedContextObject(ASSOC_TYPE_SUBMISSION_FILES);
 			if (is_null($monographFilesArray)) {
 				$monographFilesArray = array();
 			}
 			array_push($monographFilesArray, $monographFile);
-			$this->addAuthorizedContextObject(ASSOC_TYPE_MONOGRAPH_FILES, $monographFilesArray);
+			$this->addAuthorizedContextObject(ASSOC_TYPE_SUBMISSION_FILES, $monographFilesArray);
 
 			// Save the monograph to the authorization context.
-			$this->addAuthorizedContextObject(ASSOC_TYPE_MONOGRAPH_FILE, $monographFile);
+			$this->addAuthorizedContextObject(ASSOC_TYPE_SUBMISSION_FILE, $monographFile);
 			return AUTHORIZATION_PERMIT;
 		} else {
 			return AUTHORIZATION_DENY;

diff --git a/classes/security/authorization/internal/SignoffExistsAccessPolicy.inc.php b/classes/security/authorization/internal/SignoffExistsAccessPolicy.inc.php
@@ -64,7 +64,7 @@ function effect() {
 				$signoff =& $newSignoff;
 				unset($newSignoff);
 				break;
-			case ASSOC_TYPE_MONOGRAPH_FILE:
+			case ASSOC_TYPE_SUBMISSION_FILE:
 				// Get the monograph file
 				$monographFile =& $monographFileDao->getLatestRevision($signoff->getAssocId());
 				if (!is_a($monographFile, 'MonographFile')) return AUTHORIZATION_DENY;

diff --git a/controllers/api/file/FileApiHandler.inc.php b/controllers/api/file/FileApiHandler.inc.php
@@ -71,7 +71,7 @@ function authorize(&$request, &$args, $roleAssignments) {
 	 * @param $request Request
 	 */
 	function downloadFile($args, &$request) {
-		$monographFile =& $this->getAuthorizedContextObject(ASSOC_TYPE_MONOGRAPH_FILE);
+		$monographFile =& $this->getAuthorizedContextObject(ASSOC_TYPE_SUBMISSION_FILE);
 		assert($monographFile); // Should have been validated already
 		import('classes.file.MonographFileManager');
 		$press =& $request->getPress();
@@ -126,7 +126,7 @@ function downloadLibraryFile($args, &$request) {
 	 * @param $request Request
 	 */
 	function viewFile($args, &$request) {
-		$monographFile =& $this->getAuthorizedContextObject(ASSOC_TYPE_MONOGRAPH_FILE);
+		$monographFile =& $this->getAuthorizedContextObject(ASSOC_TYPE_SUBMISSION_FILE);
 		assert($monographFile); // Should have been validated already
 		import('classes.file.MonographFileManager');
 		$press =& $request->getPress();
@@ -141,7 +141,7 @@ function viewFile($args, &$request) {
 	 */
 	function downloadAllFiles($args, &$request) {
 		// Retrieve the authorized objects.
-		$monographFiles = $this->getAuthorizedContextObject(ASSOC_TYPE_MONOGRAPH_FILES);
+		$monographFiles = $this->getAuthorizedContextObject(ASSOC_TYPE_SUBMISSION_FILES);
 		$monograph =& $this->getAuthorizedContextObject(ASSOC_TYPE_MONOGRAPH);
 
 		// Find out the paths of all files in this grid.
@@ -180,7 +180,7 @@ function downloadAllFiles($args, &$request) {
 	 * @return string
 	 */
 	function recordDownload($args, &$request) {
-		$monographFiles = $this->getAuthorizedContextObject(ASSOC_TYPE_MONOGRAPH_FILES);
+		$monographFiles = $this->getAuthorizedContextObject(ASSOC_TYPE_SUBMISSION_FILES);
 		$fileId = null;
 
 		foreach ($monographFiles as $monographFile) {

diff --git a/controllers/api/file/ManageFileApiHandler.inc.php b/controllers/api/file/ManageFileApiHandler.inc.php
@@ -50,7 +50,7 @@ function authorize(&$request, &$args, $roleAssignments) {
 	 * @return string a serialized JSON object
 	 */
 	function deleteFile($args, &$request) {
-		$monographFile =& $this->getAuthorizedContextObject(ASSOC_TYPE_MONOGRAPH_FILE);
+		$monographFile =& $this->getAuthorizedContextObject(ASSOC_TYPE_SUBMISSION_FILE);
 		$monograph =& $this->getAuthorizedContextObject(ASSOC_TYPE_MONOGRAPH);
 		$stageId =& $request->getUserVar('stageId');
 		if ($stageId) {
@@ -63,15 +63,15 @@ function deleteFile($args, &$request) {
 		assert($monographFile && $monograph); // Should have been validated already
 
 		$noteDao =& DAORegistry::getDAO('NoteDAO');
-		$notes =& $noteDao->getByAssoc(ASSOC_TYPE_MONOGRAPH_FILE, $monographFile->getFileId());
+		$notes =& $noteDao->getByAssoc(ASSOC_TYPE_SUBMISSION_FILE, $monographFile->getFileId());
 		while ($note =& $notes->next()) {
 			$noteDao->deleteById($note->getId());
 			unset($note);
 		}
 
 		// Delete all signoffs related with this file.
 		$signoffDao = DAORegistry::getDAO('SignoffDAO'); /* @var $signoffDao SignoffDAO */
-		$signoffFactory =& $signoffDao->getAllByAssocType(ASSOC_TYPE_MONOGRAPH_FILE, $monographFile->getFileId());
+		$signoffFactory =& $signoffDao->getAllByAssocType(ASSOC_TYPE_SUBMISSION_FILE, $monographFile->getFileId());
 		$signoffs = $signoffFactory->toArray();
 		$notificationMgr = new NotificationManager();
 

diff --git a/controllers/grid/files/SignoffOnSignoffGridColumn.inc.php b/controllers/grid/files/SignoffOnSignoffGridColumn.inc.php
@@ -114,7 +114,7 @@ function _getSignoffStatus(&$row) {
 				// Find out whether someone in the user group already downloaded
 				// (=viewed) the file.
 				$viewed = $viewed ||
-					$viewsDao->getLastViewDate(ASSOC_TYPE_MONOGRAPH_FILE, $fileIdAndRevision, $userId);
+					$viewsDao->getLastViewDate(ASSOC_TYPE_SUBMISSION_FILE, $fileIdAndRevision, $userId);
 			}
 			unset($signoff);
 		}

diff --git a/controllers/grid/files/SignoffStatusFromFileGridColumn.inc.php b/controllers/grid/files/SignoffStatusFromFileGridColumn.inc.php
@@ -130,7 +130,7 @@ function _getSignoffStatus(&$row) {
 			foreach ($userIds as $userId) {
 				$signoffs =& $signoffDao->getAllBySymbolic(
 					$this->getSymbolic(),
-					ASSOC_TYPE_MONOGRAPH_FILE, $monographFile->getFileId(),
+					ASSOC_TYPE_SUBMISSION_FILE, $monographFile->getFileId(),
 					$userId
 				);
 
@@ -148,7 +148,7 @@ function _getSignoffStatus(&$row) {
 					// no users means a blank column (should not happen).
 
 					$lastViewed = $viewsDao->getLastViewDate(
-						ASSOC_TYPE_MONOGRAPH_FILE, $monographFile->getFileIdAndRevision(),
+						ASSOC_TYPE_SUBMISSION_FILE, $monographFile->getFileIdAndRevision(),
 						$userId
 					);
 				}

diff --git a/controllers/grid/files/SignoffStatusFromSignoffGridColumn.inc.php b/controllers/grid/files/SignoffStatusFromSignoffGridColumn.inc.php
@@ -100,7 +100,7 @@ function _getSignoffStatus(&$row) {
 		// (=viewed) the file.
 		// no users means a blank column (should not happen).
 		$lastViewed = $viewsDao->getLastViewDate(
-			ASSOC_TYPE_MONOGRAPH_FILE, $monographFile->getFileIdAndRevision(),
+			ASSOC_TYPE_SUBMISSION_FILE, $monographFile->getFileIdAndRevision(),
 			$signoff->getUserId()
 		);
 

diff --git a/controllers/grid/files/copyedit/CopyeditingFilesGridHandler.inc.php b/controllers/grid/files/copyedit/CopyeditingFilesGridHandler.inc.php
@@ -81,7 +81,7 @@ function initialize(&$request) {
 	 * @return string Serialized JSON object
 	 */
 	function approveCopyedit($args, &$request) {
-		$monographFile =& $this->getAuthorizedContextObject(ASSOC_TYPE_MONOGRAPH_FILE);
+		$monographFile =& $this->getAuthorizedContextObject(ASSOC_TYPE_SUBMISSION_FILE);
 		$monograph =& $this->getAuthorizedContextObject(ASSOC_TYPE_MONOGRAPH);
 
 		if ($monographFile->getViewable()) {

diff --git a/controllers/grid/files/fileSignoff/FileSignoffGridHandler.inc.php b/controllers/grid/files/fileSignoff/FileSignoffGridHandler.inc.php
@@ -145,7 +145,7 @@ function signOffFile($args, &$request) {
 		// to this file revision.
 		$signoffDao =& DAORegistry::getDAO('SignoffDAO'); /* @var $signoffDao SignoffDAO */
 		$signoff =& $signoffDao->build(
-			$this->getSymbolic(), ASSOC_TYPE_MONOGRAPH_FILE, $submissionFile->getFileId(), $user->getId()
+			$this->getSymbolic(), ASSOC_TYPE_SUBMISSION_FILE, $submissionFile->getFileId(), $user->getId()
 		);
 		$signoff->setDateCompleted(Core::getCurrentDate());
 		$signoffDao->updateObject($signoff);

diff --git a/controllers/grid/files/signoff/SignoffFilesGridHandler.inc.php b/controllers/grid/files/signoff/SignoffFilesGridHandler.inc.php
@@ -509,7 +509,7 @@ function deleteSignoff($args, &$request) {
 		if($signoff && !$signoff->getDateCompleted()) {
 
 			$signoffUserId = $signoff->getUserId();
-			if ($signoff->getAssocType() == ASSOC_TYPE_MONOGRAPH_FILE) {
+			if ($signoff->getAssocType() == ASSOC_TYPE_SUBMISSION_FILE) {
 				$fileId = $signoff->getAssocId();
 			}
 			$submissionFileDao =& DAORegistry::getDAO('SubmissionFileDAO');

diff --git a/controllers/grid/notifications/NotificationsGridCellProvider.inc.php b/controllers/grid/notifications/NotificationsGridCellProvider.inc.php
@@ -41,15 +41,15 @@ function getTemplateVarsFromRowColumn(&$row, $column) {
 					case ASSOC_TYPE_MONOGRAPH:
 						$monographId = $notification->getAssocId();
 						break;
-					case ASSOC_TYPE_MONOGRAPH_FILE:
+					case ASSOC_TYPE_SUBMISSION_FILE:
 						$fileId = $notification->getAssocId();
 						break;
 					case ASSOC_TYPE_SIGNOFF:
 						$signoffDao = DAORegistry::getDAO('SignoffDAO'); /* @var $signoffDao SignoffDAO */
 						$signoff = $signoffDao->getById($notification->getAssocId());
 						if ($signoff->getAssocType() == ASSOC_TYPE_MONOGRAPH) {
 							$monographId = $signoff->getAssocId();
-						} elseif ($signoff->getAssocType() == ASSOC_TYPE_MONOGRAPH_FILE) {
+						} elseif ($signoff->getAssocType() == ASSOC_TYPE_SUBMISSION_FILE) {
 							$fileId = $signoff->getAssocId();
 						} else {
 							// Don't know of SIGNOFFs with other ASSOC types for TASKS

diff --git a/controllers/grid/users/stageParticipant/StageParticipantGridHandler.inc.php b/controllers/grid/users/stageParticipant/StageParticipantGridHandler.inc.php
@@ -321,7 +321,7 @@ function deleteParticipant($args, &$request) {
 		while($signoff =& $signoffsFactory->next()) {
 			if (($signoff->getSymbolic() != 'SIGNOFF_COPYEDITING' &&
 				$signoff->getSymbolic() != 'SIGNOFF_PROOFING') ||
-				$signoff->getAssocType() != ASSOC_TYPE_MONOGRAPH_FILE ||
+				$signoff->getAssocType() != ASSOC_TYPE_SUBMISSION_FILE ||
 				$signoff->getDateCompleted()) continue;
 			$monographFileId = $signoff->getAssocId();
 			$monographFile =& $submissionFileDao->getLatestRevision($monographFileId, null, $stageAssignment->getSubmissionId());