36,12 → 36,31 |
|
@Override |
public Page loadByName(String name, Language lang) { |
return loadByName(name, lang, -1); |
} |
|
@Override |
public Page loadByName(String name, Language lang, int revision) { |
Page p = new Page(); |
p.setName(name); |
p.setLanguageId(lang.getId()); |
p.setDeleted(false); |
p = session.loadUnique(p); |
|
if (p != null) { |
if (revision > 0) { |
Revision r = loadRevision(revision, name, lang); |
if (r != null) { |
p.setCreatedById(r.getUserId()); |
p.setCreatedOn(r.getCreatedOn()); |
p.setModifiedById(-1); |
p.setModifiedOn(null); |
p.setRevision(true); |
p.setRevisionNumber(r.getRevision()); |
p.setTitle(r.getNewTitle()); |
p.setBody(r.getNewBody()); |
} |
} |
loadUsers(p); |
} |
return p; |