View | Details | Raw Unified | Return to bug 6407 | Differences between
and this patch

Collapse All | Expand All

(-)a/pages/copyeditor/CopyeditorHandler.inc.php (-2 / +3 lines)
 Lines 84-95   class CopyeditorHandler extends Handler { Link Here 
84
84
85
		$templateMgr->assign('dateFrom', $fromDate);
85
		$templateMgr->assign('dateFrom', $fromDate);
86
		$templateMgr->assign('dateTo', $toDate);
86
		$templateMgr->assign('dateTo', $toDate);
87
		$templateMgr->assign('fieldOptions', Array(
87
		$templateMgr->assign('fieldOptions', array(
88
			SUBMISSION_FIELD_TITLE => 'article.title',
88
			SUBMISSION_FIELD_TITLE => 'article.title',
89
			SUBMISSION_FIELD_ID => 'article.submissionId',
89
			SUBMISSION_FIELD_AUTHOR => 'user.role.author',
90
			SUBMISSION_FIELD_AUTHOR => 'user.role.author',
90
			SUBMISSION_FIELD_EDITOR => 'user.role.editor'
91
			SUBMISSION_FIELD_EDITOR => 'user.role.editor'
91
		));
92
		));
92
		$templateMgr->assign('dateFieldOptions', Array(
93
		$templateMgr->assign('dateFieldOptions', array(
93
			SUBMISSION_FIELD_DATE_SUBMITTED => 'submissions.submitted',
94
			SUBMISSION_FIELD_DATE_SUBMITTED => 'submissions.submitted',
94
			SUBMISSION_FIELD_DATE_COPYEDIT_COMPLETE => 'submissions.copyeditComplete',
95
			SUBMISSION_FIELD_DATE_COPYEDIT_COMPLETE => 'submissions.copyeditComplete',
95
			SUBMISSION_FIELD_DATE_LAYOUT_COMPLETE => 'submissions.layoutComplete',
96
			SUBMISSION_FIELD_DATE_LAYOUT_COMPLETE => 'submissions.layoutComplete',
(-)a/pages/editor/EditorHandler.inc.php (-1 / +9 lines)
 Lines 131-136   class EditorHandler extends SectionEditorHandler { Link Here 
131
				$submissions = new DAOResultFactory($rawSubmissions, $editorSubmissionDao, '_returnEditorSubmissionFromRow');
131
				$submissions = new DAOResultFactory($rawSubmissions, $editorSubmissionDao, '_returnEditorSubmissionFromRow');
132
			}
132
			}
133
133
134
135
			// If only result is returned from a search, fast-forward to it
136
			if ($search && $submissions && $submissions->getCount() == 1) {
137
				$submission =& $submissions->next();
138
				$request->redirect(null, null, 'submission', array($submission->getId()));
139
			}
140
134
			$templateMgr->assign_by_ref('submissions', $submissions);
141
			$templateMgr->assign_by_ref('submissions', $submissions);
135
			$templateMgr->assign('section', $request->getUserVar('section'));
142
			$templateMgr->assign('section', $request->getUserVar('section'));
136
143
 Lines 309-314   class EditorHandler extends SectionEditorHandler { Link Here 
309
	function _getSearchFieldOptions() {
316
	function _getSearchFieldOptions() {
310
		return array(
317
		return array(
311
			SUBMISSION_FIELD_TITLE => 'article.title',
318
			SUBMISSION_FIELD_TITLE => 'article.title',
319
			SUBMISSION_FIELD_ID => 'article.submissionId',
312
			SUBMISSION_FIELD_AUTHOR => 'user.role.author',
320
			SUBMISSION_FIELD_AUTHOR => 'user.role.author',
313
			SUBMISSION_FIELD_EDITOR => 'user.role.editor',
321
			SUBMISSION_FIELD_EDITOR => 'user.role.editor',
314
			SUBMISSION_FIELD_REVIEWER => 'user.role.reviewer',
322
			SUBMISSION_FIELD_REVIEWER => 'user.role.reviewer',
 Lines 467-473   class EditorHandler extends SectionEditorHandler { Link Here 
467
			$templateMgr->assign('search', $search);
475
			$templateMgr->assign('search', $search);
468
			$templateMgr->assign('searchInitial', Request::getUserVar('searchInitial'));
476
			$templateMgr->assign('searchInitial', Request::getUserVar('searchInitial'));
469
477
470
			$templateMgr->assign('fieldOptions', Array(
478
			$templateMgr->assign('fieldOptions', array(
471
				USER_FIELD_FIRSTNAME => 'user.firstName',
479
				USER_FIELD_FIRSTNAME => 'user.firstName',
472
				USER_FIELD_LASTNAME => 'user.lastName',
480
				USER_FIELD_LASTNAME => 'user.lastName',
473
				USER_FIELD_USERNAME => 'user.username',
481
				USER_FIELD_USERNAME => 'user.username',
(-)a/pages/layoutEditor/LayoutEditorHandler.inc.php (-2 / +3 lines)
 Lines 95-106   class LayoutEditorHandler extends Handler { Link Here 
95
95
96
		$templateMgr->assign('dateFrom', $fromDate);
96
		$templateMgr->assign('dateFrom', $fromDate);
97
		$templateMgr->assign('dateTo', $toDate);
97
		$templateMgr->assign('dateTo', $toDate);
98
		$templateMgr->assign('fieldOptions', Array(
98
		$templateMgr->assign('fieldOptions', array(
99
			SUBMISSION_FIELD_TITLE => 'article.title',
99
			SUBMISSION_FIELD_TITLE => 'article.title',
100
			SUBMISSION_FIELD_ID => 'article.submissionId',
100
			SUBMISSION_FIELD_AUTHOR => 'user.role.author',
101
			SUBMISSION_FIELD_AUTHOR => 'user.role.author',
101
			SUBMISSION_FIELD_EDITOR => 'user.role.editor'
102
			SUBMISSION_FIELD_EDITOR => 'user.role.editor'
102
		));
103
		));
103
		$templateMgr->assign('dateFieldOptions', Array(
104
		$templateMgr->assign('dateFieldOptions', array(
104
			SUBMISSION_FIELD_DATE_SUBMITTED => 'submissions.submitted',
105
			SUBMISSION_FIELD_DATE_SUBMITTED => 'submissions.submitted',
105
			SUBMISSION_FIELD_DATE_COPYEDIT_COMPLETE => 'submissions.copyeditComplete',
106
			SUBMISSION_FIELD_DATE_COPYEDIT_COMPLETE => 'submissions.copyeditComplete',
106
			SUBMISSION_FIELD_DATE_LAYOUT_COMPLETE => 'submissions.layoutComplete',
107
			SUBMISSION_FIELD_DATE_LAYOUT_COMPLETE => 'submissions.layoutComplete',
(-)a/pages/proofreader/ProofreaderHandler.inc.php (-2 / +3 lines)
 Lines 85-96   class ProofreaderHandler extends Handler { Link Here 
85
85
86
		$templateMgr->assign('dateFrom', $fromDate);
86
		$templateMgr->assign('dateFrom', $fromDate);
87
		$templateMgr->assign('dateTo', $toDate);
87
		$templateMgr->assign('dateTo', $toDate);
88
		$templateMgr->assign('fieldOptions', Array(
88
		$templateMgr->assign('fieldOptions', array(
89
			SUBMISSION_FIELD_TITLE => 'article.title',
89
			SUBMISSION_FIELD_TITLE => 'article.title',
90
			SUBMISSION_FIELD_ID => 'article.submissionId',
90
			SUBMISSION_FIELD_AUTHOR => 'user.role.author',
91
			SUBMISSION_FIELD_AUTHOR => 'user.role.author',
91
			SUBMISSION_FIELD_EDITOR => 'user.role.editor'
92
			SUBMISSION_FIELD_EDITOR => 'user.role.editor'
92
		));
93
		));
93
		$templateMgr->assign('dateFieldOptions', Array(
94
		$templateMgr->assign('dateFieldOptions', array(
94
			SUBMISSION_FIELD_DATE_SUBMITTED => 'submissions.submitted',
95
			SUBMISSION_FIELD_DATE_SUBMITTED => 'submissions.submitted',
95
			SUBMISSION_FIELD_DATE_COPYEDIT_COMPLETE => 'submissions.copyeditComplete',
96
			SUBMISSION_FIELD_DATE_COPYEDIT_COMPLETE => 'submissions.copyeditComplete',
96
			SUBMISSION_FIELD_DATE_LAYOUT_COMPLETE => 'submissions.layoutComplete',
97
			SUBMISSION_FIELD_DATE_LAYOUT_COMPLETE => 'submissions.layoutComplete',
(-)a/pages/sectionEditor/SectionEditorHandler.inc.php (-2 / +9 lines)
 Lines 117-122   class SectionEditorHandler extends Handler { Link Here 
117
			$sortDirection
117
			$sortDirection
118
		);
118
		);
119
119
120
		// If only result is returned from a search, fast-forward to it
121
		if ($search && $submissions && $submissions->getCount() == 1) {
122
			$submission =& $submissions->next();
123
			$request->redirect(null, null, 'submission', array($submission->getId()));
124
		}
125
120
		$templateMgr =& TemplateManager::getManager();
126
		$templateMgr =& TemplateManager::getManager();
121
		$templateMgr->assign('helpTopicId', $helpTopicId);
127
		$templateMgr->assign('helpTopicId', $helpTopicId);
122
		$templateMgr->assign('sectionOptions', $filterSectionOptions);
128
		$templateMgr->assign('sectionOptions', $filterSectionOptions);
 Lines 137-148   class SectionEditorHandler extends Handler { Link Here 
137
143
138
		$templateMgr->assign('dateFrom', $fromDate);
144
		$templateMgr->assign('dateFrom', $fromDate);
139
		$templateMgr->assign('dateTo', $toDate);
145
		$templateMgr->assign('dateTo', $toDate);
140
		$templateMgr->assign('fieldOptions', Array(
146
		$templateMgr->assign('fieldOptions', array(
141
			SUBMISSION_FIELD_TITLE => 'article.title',
147
			SUBMISSION_FIELD_TITLE => 'article.title',
148
			SUBMISSION_FIELD_ID => 'article.submissionId',
142
			SUBMISSION_FIELD_AUTHOR => 'user.role.author',
149
			SUBMISSION_FIELD_AUTHOR => 'user.role.author',
143
			SUBMISSION_FIELD_EDITOR => 'user.role.editor'
150
			SUBMISSION_FIELD_EDITOR => 'user.role.editor'
144
		));
151
		));
145
		$templateMgr->assign('dateFieldOptions', Array(
152
		$templateMgr->assign('dateFieldOptions', array(
146
			SUBMISSION_FIELD_DATE_SUBMITTED => 'submissions.submitted',
153
			SUBMISSION_FIELD_DATE_SUBMITTED => 'submissions.submitted',
147
			SUBMISSION_FIELD_DATE_COPYEDIT_COMPLETE => 'submissions.copyeditComplete',
154
			SUBMISSION_FIELD_DATE_COPYEDIT_COMPLETE => 'submissions.copyeditComplete',
148
			SUBMISSION_FIELD_DATE_LAYOUT_COMPLETE => 'submissions.layoutComplete',
155
			SUBMISSION_FIELD_DATE_LAYOUT_COMPLETE => 'submissions.layoutComplete',
(-)a/pages/sectionEditor/SubmissionEditHandler.inc.php (-1 / +1 lines)
 Lines 468-474   class SubmissionEditHandler extends SectionEditorHandler { Link Here 
468
			$templateMgr->assign_by_ref('reviewers', $reviewers);
468
			$templateMgr->assign_by_ref('reviewers', $reviewers);
469
			$templateMgr->assign('articleId', $articleId);
469
			$templateMgr->assign('articleId', $articleId);
470
			$templateMgr->assign('reviewerStatistics', $sectionEditorSubmissionDao->getReviewerStatistics($journal->getId()));
470
			$templateMgr->assign('reviewerStatistics', $sectionEditorSubmissionDao->getReviewerStatistics($journal->getId()));
471
			$templateMgr->assign('fieldOptions', Array(
471
			$templateMgr->assign('fieldOptions', array(
472
				USER_FIELD_INTERESTS => 'user.interests',
472
				USER_FIELD_INTERESTS => 'user.interests',
473
				USER_FIELD_FIRSTNAME => 'user.firstName',
473
				USER_FIELD_FIRSTNAME => 'user.firstName',
474
				USER_FIELD_LASTNAME => 'user.lastName',
474
				USER_FIELD_LASTNAME => 'user.lastName',

Return to bug 6407