Subversion Repositories general

Compare Revisions

Ignore whitespace Rev 1021 → Rev 1022

/hostadmiral/trunk/src/ak/hostadmiral/core/model/MailboxManager.java
297,7 → 297,7
"select count(*) from Mailbox").next()).intValue());
}
 
return HibernateUtil.pageableList(pageSize, pageNumber,
return HibernateUtil.pageableListSql(pageSize, pageNumber,
"select {mb.*}, {d.*}, {o.*}, {su.*}"
+ " from mailboxes as mb"
+ " left join domains as d on mb.domain = d.id"
304,7 → 304,6
+ " left join users as o on mb.owner = o.id"
+ " left join systemusers as su on mb.systemUser = su.id"
+ HibernateUtil.formOrderClause(sortingKeys, sortKeys),
Mailbox.class,
new String[] { "mb", "d", "o", "su" },
new Class[] { Mailbox.class, InetDomain.class, User.class, SystemUser.class },
null,
326,7 → 325,7
info.setSize(((Long)countlist.get(0)).intValue());
}
 
return HibernateUtil.pageableList(pageSize, pageNumber,
return HibernateUtil.pageableListSql(pageSize, pageNumber,
"select {mb.*}, {d.*}, {o.*}, {su.*}"
+ " from mailboxes as mb"
+ " left join domains as d on mb.domain = d.id"
341,7 → 340,6
+ " left join systemusers as su on mb.systemUser = su.id"
+ " where d.owner=?"
+ HibernateUtil.formOrderClause(sortingKeys, sortKeys),
Mailbox.class,
new String[] { "mb", "d", "o", "su" },
new Class[] { Mailbox.class, InetDomain.class, User.class, SystemUser.class },
new Object[] { editor, editor },