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

fixed [ 1306912 ] CMS Matrix - Unable to approve article's

Browse source
This commit is contained in:
JT Smith 2005-10-13 19:04:05 +00:00
parent e4c2bc9969
commit 7576dbfa78
6 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/WebGUI/Asset.pm
View file

@ -974,7 +974,7 @@ sub new {
my $revisionDate = shift || $session{assetRevision}{$assetId}{$session{scratch}{versionTag}||'_'};
unless ($revisionDate) {
($revisionDate) = WebGUI::SQL->quickArray("select max(revisionDate) from assetData where assetId="
.quote($assetId)." and (status='approved' or status='archived' or status='pending' or tagId=".quote($session{scratch}{versionTag}).")
.quote($assetId)." and (status='approved' or status='archived' or tagId=".quote($session{scratch}{versionTag}).")
group by assetData.assetId order by assetData.revisionDate");
$session{assetRevision}{$assetId}{$session{scratch}{versionTag}||'_'} = $revisionDate unless ($session{config}{disableCache});
}
@ -1068,7 +1068,7 @@ sub newByPropertyHashRef {
#-------------------------------------------------------------------
=head2 newByUrl ( [url] )
=head2 newByUrl ( [url, revisionDate] )
Returns a new Asset object based upon current url, given url or defaultPage.
@ -1076,11 +1076,16 @@ Returns a new Asset object based upon current url, given url or defaultPage.
Optional string representing a URL.
=head3 revisionDate
A specific revision to instanciate. By default we instanciate the newest published revision.
=cut
sub newByUrl {
my $class = shift;
my $url = shift || $session{env}{PATH_INFO};
my $revisionDate = shift;
$url = lc($url);
$url =~ s/\/$//;
$url =~ s/^\///;
@ -1102,7 +1107,7 @@ sub newByUrl {
assetData.assetId
");
if ($id ne "" || $class ne "") {
return WebGUI::Asset->new($id, $class);
return WebGUI::Asset->new($id, $class, $revisionDate);
} else {
WebGUI::ErrorHandler::warn("The URL $url was requested, but does not exist in your asset tree.");
return undef;