Subversion Repositories general

Compare Revisions

Ignore whitespace Rev 1026 → Rev 1027

/hostadmiral/trunk/src/ak/hostadmiral/core/model/MailboxManager.java
286,7 → 286,7
return listMailboxes(null, 0, 0, null, editor);
}
 
public Collection listMailboxes(CollectionInfo info, int pageSize, int pageNumber,
public Collection listMailboxes(CollectionInfo info, int rowsPerPage, int pageNumber,
Integer[] sortingKeys, User editor)
throws ModelException
{
293,11 → 293,12
try {
if(editor.isSuperuser()) {
if(info != null) {
info.setSize(((Integer)HibernateUtil.currentSession().iterate(
"select count(*) from Mailbox").next()).intValue());
info.init(((Integer)HibernateUtil.currentSession().iterate(
"select count(*) from Mailbox").next()).intValue(),
pageNumber, rowsPerPage);
}
 
return HibernateUtil.pageableListSql(pageSize, pageNumber,
return HibernateUtil.pageableListSql(rowsPerPage, pageNumber,
"select {mb.*}, {d.*}, {o.*}, {su.*}"
+ " from mailboxes as mb"
+ " left join domains as d on mb.domain = d.id"
322,10 → 323,11
+ ") as count_table",
new Object[] { editor.getId(), editor.getId() });
 
info.setSize(((Long)countlist.get(0)).intValue());
info.init(((Long)countlist.get(0)).intValue(),
pageNumber, rowsPerPage);
}
 
return HibernateUtil.pageableListSql(pageSize, pageNumber,
return HibernateUtil.pageableListSql(rowsPerPage, pageNumber,
"select {mb.*}, {d.*}, {o.*}, {su.*}"
+ " from mailboxes as mb"
+ " left join domains as d on mb.domain = d.id"