Skip to content
Snippets Groups Projects
Commit 0f0f1351 authored by Vincent Massol's avatar Vincent Massol
Browse files

XWIKI-11632: Only display mails sent by the current wiki unless we're on the main wiki

* Fix typo. Would need some tests but this class is hard to test, need to find a way.
parent cd3fdd30
No related branches found
No related tags found
No related merge requests found
......@@ -103,7 +103,7 @@ public MailStatus loadFromMessageId(final String messageId, final Map<String, Ob
if (isMainWiki) {
queryString = String.format("from %s where mail_id=:id", MailStatus.class.getName());
} else {
queryString = String.format("from %s where mail_id=:id and mail_xwiki=:wiki",
queryString = String.format("from %s where mail_id=:id and mail_wiki=:wiki",
MailStatus.class.getName());
}
......@@ -147,7 +147,7 @@ public List<MailStatus> loadFromBatchId(final String batchId, final MailState st
MailStatus.class.getName());
} else {
queryString = String.format("from %s where mail_batchid=:batchid and mail_state=:state "
+ "and mail_xwiki=:wiki", MailStatus.class.getName());
+ "and mail_wiki=:wiki", MailStatus.class.getName());
}
return store.executeRead(xwikiContext,
......@@ -187,7 +187,7 @@ public List<MailStatus> loadFromBatchId(final String batchId, final Map<String,
queryString = String.format("from %s where mail_batchid=:batchid",
MailStatus.class.getName());
} else {
queryString = String.format("from %s where mail_batchid=:batchid and mail_xwiki=:wiki",
queryString = String.format("from %s where mail_batchid=:batchid and mail_wiki=:wiki",
MailStatus.class.getName());
}
......@@ -228,7 +228,7 @@ public long count(final String batchId, final Map<String, Object> parameters) th
MailStatus.class.getName());
} else {
queryString = String.format("select count(*) from %s where mail_batchid=:batchid and "
+ "mail_xwiki=:wiki", MailStatus.class.getName());
+ "mail_wiki=:wiki", MailStatus.class.getName());
}
Long count = store.executeRead(xwikiContext,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment