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

fixed #11116: Deleted user's version tags and revisions

Browse source
This commit is contained in:
Doug Bell 2009-10-26 17:52:08 -05:00
parent 72bd5d5f16
commit 8c3414dca0
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,6 +11,7 @@
- fixed #11162: Can't delete calendar Related Material Link
- fixed #11154: vendor payouts screen borked ( Martin Kamerbeek / Oqapi )
- fixed #11166: Documentation bug - addChild
- fixed #11116: Deleted user's version tags and revisions
7.8.2
- Added scheduled vendor payout workflow activity. (Special thanks to Martin @ Oqapi)

17
lib/WebGUI/Operation/VersionTag.pm
View file

@ -373,10 +373,9 @@ sub www_commitVersionTag {
$session->url->page("op=commitVersionTag;tagId=".$tag->getId),
);
$p->setDataByQuery(q{
SELECT assetData.revisionDate, users.username, asset.assetId, asset.className
SELECT assetData.revisionDate, assetData.revisedBy, asset.assetId, asset.className
FROM assetData
LEFT JOIN asset ON assetData.assetId = asset.assetId
LEFT JOIN users ON assetData.revisedBy = users.userId
WHERE assetData.tagId=? },
undef,
undef,
@ -384,8 +383,9 @@ sub www_commitVersionTag {
);
foreach my $row ( @{$p->getPageData} ) {
my ( $date, $by, $id, $class) = @{ $row }{ qw( revisionDate username assetId className ) };
my ( $date, $byUserId, $id, $class) = @{ $row }{ qw( revisionDate revisedBy assetId className ) };
my $asset = WebGUI::Asset->new($session, $id, $class, $date);
my $byUser = WebGUI::User->new( $session, $byUserId );
$output
.= '<tr><td>'
.$session->icon->view("func=view;revision=".$date, $asset->get("url"))
@ -393,7 +393,7 @@ sub www_commitVersionTag {
<td>'.$asset->getTitle.'</td>
<td><img src="'.$asset->getIcon(1).'" alt="'.$asset->getName.'" />'.$asset->getName.'</td>
<td>'.$session->datetime->epochToHuman($date).'</td>
<td>'.$by.'</td></tr>';
<td>'.$byUser->get('username').'</td></tr>';
}
$output .= '</table>'.$p->getBarSimple;
@ -809,11 +809,12 @@ sub www_manageRevisionsInTag {
. '</tr> '
;
my $p = WebGUI::Paginator->new($session,$session->url->page("op=manageRevisionsInTag;tagId=".$tag->getId));
$p->setDataByQuery("select assetData.revisionDate, users.username, asset.assetId, asset.className from assetData
left join asset on assetData.assetId=asset.assetId left join users on assetData.revisedBy=users.userId
$p->setDataByQuery("select assetData.revisionDate, assetData.revisedBy, asset.assetId, asset.className from assetData
left join asset on assetData.assetId=asset.assetId
where assetData.tagId=?",undef, undef, [$tag->getId]);
foreach my $row (@{$p->getPageData}) {
my ($date,$by,$id, $class) = ($row->{revisionDate}, $row->{username}, $row->{assetId}, $row->{className});
my ($date,$byUserId,$id, $class) = ($row->{revisionDate}, $row->{revisedBy}, $row->{assetId}, $row->{className});
my $byUser = WebGUI::User->new( $session, $byUserId );
my $asset = WebGUI::Asset->new($session,$id,$class,$date);
# A checkbox for delete and move actions
my $checkbox = WebGUI::Form::checkbox( $session, {
@ -827,7 +828,7 @@ sub www_manageRevisionsInTag {
<td>'.$asset->getTitle.'</td>
<td><img src="'.$asset->getIcon(1).'" alt="'.$asset->getName.'" />'.$asset->getName.'</td>
<td>'.$session->datetime->epochToHuman($date).'</td>
<td>'.$by.'</td></tr>';
<td>'.$byUser->username.'</td></tr>';
}
$output .= '</table>'.$p->getBarSimple.WebGUI::Form::formFooter( $session );
$tag = $session->db->getRow("assetVersionTag","tagId",$tag->getId);