node79 at bricolage
Mar 3, 2009, 7:49 PM
Post #1 of 1
(457 views)
Permalink
|
|
[8440] Fix for bug 1388, deleting a checked-out asset from the
|
|
Revision: 8440
Author: node79
Date: 2009-03-03 19:49:27 -0800 (Tue, 03 Mar 2009)
ViewCVS: http://viewsvn.bricolage.cc/?rev=8440&view=rev
Log Message:
-----------
Fix for bug 1388, deleting a checked-out asset from the desk/workspace interface.
Bugzilla Links:
--------------
http://bugs.bricolage.cc/show_bug.cgi?id=1388
Modified Paths:
--------------
bricolage/trunk/lib/Bric/App/Callback/Desk.pm
Modified: bricolage/trunk/lib/Bric/App/Callback/Desk.pm
===================================================================
--- bricolage/trunk/lib/Bric/App/Callback/Desk.pm 2009-03-04 03:06:08 UTC (rev 8439)
+++ bricolage/trunk/lib/Bric/App/Callback/Desk.pm 2009-03-04 03:49:27 UTC (rev 8440)
@@ -477,12 +477,13 @@
if (chk_authz($obj, EDIT, 1)) {
my $desk = $obj->get_current_desk;
+ $desk->checkin($obj) if $obj->get_checked_out;
$desk->remove_asset($obj);
- $desk->save;
- log_event("${class}_rem_workflow", $obj);
$obj->set_workflow_id(undef);
$obj->deactivate;
+ $desk->save;
$obj->save;
+ log_event("${class}_rem_workflow", $obj);
if ($class eq 'template') {
my $burn = Bric::Util::Burner->new;
|
