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

more bug fixes

Browse source
This commit is contained in:
JT Smith 2005-08-18 19:20:08 +00:00
parent c456b708de
commit 8664a34f1e
7 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1034,7 +1034,6 @@ sub www_search {
my $sql = "select asset.assetId, asset.className, max(assetData.revisionDate)
from asset
left join assetData on assetData.assetId=asset.assetId
left join Thread on Thread.assetId=assetData.assetId and assetData.revisionDate = Thread.revisionDate
left join Post on Post.assetId=assetData.assetId and assetData.revisionDate = Post.revisionDate
where (asset.className='WebGUI::Asset::Post' or asset.className='WebGUI::Asset::Post::Thread')
and asset.lineage like ".quote($self->get("lineage").'%')."
@ -1043,7 +1042,7 @@ sub www_search {
assetData.status in ('approved','archived')
or assetData.tagId=".quote($session{scratch}{versionTag});
$sql .= " or assetData.status='pending'" if ($self->canModerate);
$sql .= " or (asset.ownerUserId=".quote($session{user}{userId})." and asset.ownerUserId<>'1')
$sql .= " or (assetData.ownerUserId=".quote($session{user}{userId})." and assetData.ownerUserId<>'1')
) ";
$sql .= " and ($all) " if ($all ne "");
$sql .= " and " if ($sql ne "" && $exactPhrase ne "");

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

@ -204,7 +204,7 @@ sub www_edit {
sub www_setContentPositions {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
$self->update({
$self->addRevision({
contentPositions=>$session{form}{map}
});
return "Map set: ".$session{form}{map};