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

fixed: Child assets not indicated by plus sign in uncommited tags

Browse source
This commit is contained in:
Graham Knop 2008-03-05 04:56:44 +00:00
parent ef83ebbcaf
commit 77b09dee37
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -4,6 +4,7 @@
- Removed some spurious warnings from the calendar.
- Added ability to edit comments. Entirely changed how comments work in prep
for turning it into a mixin.
- fixed: Child assets not indicated by plus sign in uncommited tags
7.5.4
- fixed: unable to remove calendar feeds in IE6

2
lib/WebGUI/AssetLineage.pm
View file

@ -188,7 +188,7 @@ sub getChildCount {
my $self = shift;
my $opts = shift || {};
my $stateWhere = $opts->{includeTrash} ? '' : "asset.state='published' and";
my ($count) = $self->session->db->quickArray("select count(*) from asset, assetData where asset.assetId=assetData.assetId and $stateWhere parentId=? and assetData.status in ('approved', 'archived')", [$self->getId]);
my ($count) = $self->session->db->quickArray("select count(*) from asset, assetData where asset.assetId=assetData.assetId and $stateWhere parentId=? and (assetData.status in ('approved', 'archived') or assetData.tagId=?)", [$self->getId, $self->session->scratch->get('versionTag')]);
return $count;
}