diff --git a/cache/_db/.gitignore b/cache/_db/.gitignore
deleted file mode 100644
index d6b7ef3..0000000
--- a/cache/_db/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/classes/submission/editor/EditorSubmissionDAO.inc.php b/classes/submission/editor/EditorSubmissionDAO.inc.php
index eeb2561..c7b79c0 100644
--- a/classes/submission/editor/EditorSubmissionDAO.inc.php
+++ b/classes/submission/editor/EditorSubmissionDAO.inc.php
@@ -165,6 +165,7 @@ class EditorSubmissionDAO extends DAO {
/**
* Get all unfiltered submissions for a journal.
+ * @param $articleId int
* @param $journalId int
* @param $sectionId int
* @param $editorId int
@@ -178,7 +179,7 @@ class EditorSubmissionDAO extends DAO {
* @param $rangeInfo object
* @return array result
*/
- function &_getUnfilteredEditorSubmissions($journalId, $sectionId = 0, $editorId = 0, $searchField = null, $searchMatch = null, $search = null, $dateField = null, $dateFrom = null, $dateTo = null, $additionalWhereSql, $rangeInfo = null, $sortBy = null, $sortDirection = SORT_DIRECTION_ASC) {
+ function &_getUnfilteredEditorSubmissions($journalId, $sectionId = 0, $editorId = 0, $searchField = null, $searchMatch = null, $search = null, $dateField = null, $dateFrom = null, $dateTo = null, $additionalWhereSql, $rangeInfo = null, $sortBy = null, $sortDirection = SORT_DIRECTION_ASC, $articleId) {
$primaryLocale = Locale::getPrimaryLocale();
$locale = Locale::getLocale();
$params = array(
@@ -199,7 +200,8 @@ class EditorSubmissionDAO extends DAO {
'cleanTitle', // Article title
'cleanTitle',
$locale,
- $journalId
+ $journalId,
+ $articleId
);
$searchSql = '';
@@ -310,7 +312,8 @@ class EditorSubmissionDAO extends DAO {
WHERE edec2.edit_decision_id IS NULL
AND ea2.edit_id IS NULL
AND a.journal_id = ?
- AND a.submission_progress = 0' .
+ AND a.submission_progress = 0
+ AND a.article_id = ? ' .
(!empty($additionalWhereSql)?" AND ($additionalWhereSql)":'');
if ($sectionId) {
diff --git a/config.TEMPLATE.inc.php b/config.TEMPLATE.inc.php
diff --git a/pages/editor/EditorHandler.inc.php b/pages/editor/EditorHandler.inc.php
index 20caeb8..85cf0c0 100644
--- a/pages/editor/EditorHandler.inc.php
+++ b/pages/editor/EditorHandler.inc.php
@@ -73,6 +73,8 @@ class EditorHandler extends SectionEditorHandler {
$dateSearchField = $request->getUserVar('dateSearchField');
$searchMatch = $request->getUserVar('searchMatch');
$search = $request->getUserVar('search');
+
+ $articleId = $request->getUserVar('articleId');
$sort = $request->getUserVar('sort');
$sort = isset($sort) ? $sort : 'id';
@@ -98,7 +100,8 @@ class EditorHandler extends SectionEditorHandler {
null,
null,
$sort,
- $sortDirection
+ $sortDirection,
+ $articleId
);
$submissions = new DAOResultFactory($rawSubmissions, $editorSubmissionDao, '_returnEditorSubmissionFromRow');
@@ -126,7 +129,8 @@ class EditorHandler extends SectionEditorHandler {
null,
$rangeInfo,
$sort,
- $sortDirection
+ $sortDirection,
+ $articleId
);
$submissions = new DAOResultFactory($rawSubmissions, $editorSubmissionDao, '_returnEditorSubmissionFromRow');
}
@@ -150,6 +154,7 @@ class EditorHandler extends SectionEditorHandler {
$templateMgr->assign('displayResults', true);
$templateMgr->assign('sort', $sort);
$templateMgr->assign('sortDirection', $sortDirection);
+ $templateMgr->assign('articleId', $articleId);
}
$submissionsCount =& $editorSubmissionDao->getEditorSubmissionsCount($journal->getId());
diff --git a/templates/editor/index.tpl b/templates/editor/index.tpl
index 941c64d..b1a4a07 100644
--- a/templates/editor/index.tpl
+++ b/templates/editor/index.tpl
@@ -53,6 +53,8 @@ function sortSearch(heading, direction) {
{if $section}{/if}
+
+