View | Details | Raw Unified | Return to bug 6462
Collapse All | Expand All

(-)file_not_specified_in_diff (-16 / +14 lines)
Line     Link Here 
0
-- a/pages/author/TrackSubmissionHandler.inc.php
0
++ b/pages/author/TrackSubmissionHandler.inc.php
 Lines 77-82   class TrackSubmissionHandler extends AuthorHandler { Link Here 
77
77
78
		$this->validate($paperId);
78
		$this->validate($paperId);
79
		$submission =& $this->submission;
79
		$submission =& $this->submission;
80
81
		// The user may be coming in on an old URL e.g. from the submission
82
		// ack email. If OCS is awaiting the completion of the submission,
83
		// send them to the submit page.
84
		if ($submission->getSubmissionProgress() != 0) {
85
			Request::redirect(
86
				null, null, null, 'submit',
87
				array($submission->getSubmissionProgress()),
88
				array('paperId' => $paperId)
89
			);
90
		}
91
80
		$this->setupTemplate(true, $paperId);
92
		$this->setupTemplate(true, $paperId);
81
93
82
		$stage = (isset($args[1]) ? (int) $args[1] : 1);
94
		$stage = (isset($args[1]) ? (int) $args[1] : 1);
 Lines 381-388   class TrackSubmissionHandler extends AuthorHandler { Link Here 
381
	 * @param $requiresEditAccess boolean True means that the author must
393
	 * @param $requiresEditAccess boolean True means that the author must
382
	 * 	  have edit access over the specified paper in order for
394
	 * 	  have edit access over the specified paper in order for
383
	 * 	  validation to be successful.
395
	 * 	  validation to be successful.
384
	 * @param $isDeleting boolean True iff user is deleting a paper, and is not
396
	 * @param $isDeleting boolean True iff user is deleting a paper
385
	 *	  coming from an old URL (e.g. submission ack email)
386
	 */
397
	 */
387
	function validate($paperId, $requiresEditAccess = false, $isDeleting = false) {
398
	function validate($paperId, $requiresEditAccess = false, $isDeleting = false) {
388
		parent::validate();
399
		parent::validate();
 Lines 407-425   class TrackSubmissionHandler extends AuthorHandler { Link Here 
407
			}
418
			}
408
		}
419
		}
409
420
410
		if ($isValid && !$isDeleting) {
411
			// The user may be coming in on an old URL e.g. from the submission
412
			// ack email. If OCS is awaiting the completion of the submission,
413
			// send them to the submit page.
414
			if ($authorSubmission->getSubmissionProgress() != 0) {
415
				Request::redirect(
416
					null, null, null, 'submit',
417
					array($authorSubmission->getSubmissionProgress()),
418
					array('paperId' => $authorSubmission->getPaperId())
419
				);
420
			}
421
		}
422
423
		if ($isValid && $requiresEditAccess) {
421
		if ($isValid && $requiresEditAccess) {
424
			if (!AuthorAction::mayEditPaper($authorSubmission)) $isValid = false;
422
			if (!AuthorAction::mayEditPaper($authorSubmission)) $isValid = false;
425
		}
423
		}

Return to bug 6462