oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CS sort by fixes

Browse source
This commit is contained in:
Graham Knop 2007-10-12 14:23:27 +00:00
parent 6beff86e65
commit fa461ce759
4 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI/Asset/RSSFromParent.pm
View file

@ -119,7 +119,7 @@ sub www_view {
$subvar = {};
@$subvar{'title', 'link', 'description'} = $self->_tlsOfAsset($item);
$subvar->{guid} = $subvar->{link};
$subvar->{pubDate} = _escapeXml($self->session->datetime->epochToMail($item->get('dateUpdated')));
$subvar->{pubDate} = _escapeXml($self->session->datetime->epochToMail($item->get('revisionDate')));
} elsif (ref $item eq 'HASH') {
foreach my $key (keys %$item) {
$subvar->{$key} = _escapeXml($item->{$key});

1
lib/WebGUI/Asset/WikiPage.pm
View file

@ -44,7 +44,6 @@ sub addRevision {
my $now = time();
$newSelf->update({
isHidden => 1,
dateUpdated=>$now,
});
return $newSelf;
}

10
lib/WebGUI/Asset/Wobject/Collaboration.pm
View file

@ -789,7 +789,8 @@ sub getRssItems {
# XXX copied and reformatted this query from www_viewRSS, but why is it constructed like this?
# And it's duplicated inside view, too! Eeeagh! And it uses the versionTag scratch var...
my ($sortBy, $sortOrder) = ($self->getValue('sortBy'), $self->getValue('sortOrder'));
my @postIds = $self->session->db->buildArray(<<"SQL", [$self->getId, $self->session->scratch->get('versionTag')]);
my @postIds = $self->session->db->buildArray(<<"SQL", [$self->getId, $self->session->scratch->get('versionTag')]);
SELECT asset.assetId
FROM Thread
LEFT JOIN asset ON Thread.assetId = asset.assetId
@ -933,7 +934,10 @@ sub getThreadsPaginator {
my $scratchSortBy = $self->getId."_sortBy";
my $scratchSortOrder = $self->getId."_sortDir";
my $sortBy = $self->session->form->process("sortBy") || $self->session->scratch->get($scratchSortBy) || $self->get("sortBy");
my $sortOrder = $self->session->scratch->get($scratchSortOrder) || $self->get("sortOrder");
if (!isIn($sortBy, qw(lineage assetData.revisionDate creationDate title userDefined1 userDefined2 userDefined3 userDefuned4 userDefined5 karmaRank))) {
$sortBy = '';
}
my $sortOrder = $self->session->scratch->get($scratchSortOrder) || $self->get("sortOrder");
if ($sortBy ne $self->session->scratch->get($scratchSortBy) && $self->session->form->process("func") ne "editSave") {
$self->session->scratch->set($scratchSortBy,$self->session->form->process("sortBy"));
} elsif ($self->session->form->process("sortBy") && $self->session->form->process("func") ne "editSave") {
@ -944,7 +948,7 @@ sub getThreadsPaginator {
}
$self->session->scratch->set($scratchSortOrder, $sortOrder);
}
$sortBy ||= "revisionDate";
$sortBy ||= "assetData.revisionDate";
$sortOrder ||= "desc";
# Sort by the thread rating instead of the post rating. other places don't care about threads.
if ($sortBy eq 'rating') {

2
lib/WebGUI/Asset/Wobject/Matrix.pm
View file

@ -745,7 +745,7 @@ sub www_editListingSave {
addEditStampToPosts => 0,
usePreview => 1,
sortOrder => 'desc',
sortBy => 'dateUpdated',
sortBy => 'assetData.revisionDate',
rssTemplateId=>'PBtmpl0000000000000142',
notificationTemplateId=>'PBtmpl0000000000000027',
searchTemplateId=>'PBtmpl0000000000000031',