[Rt-commit] [svn] r1735 - in rt/branches/3.3-TESTING: . lib/RT

[jesse at pallas.eruditorum.org]

Author: jesse
Date: Sun Nov  7 10:04:23 2004
New Revision: 1735

Modified:
   rt/branches/3.3-TESTING/   (props changed)
   rt/branches/3.3-TESTING/lib/RT/CustomField_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/GroupMember_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/Record.pm
Log:
 r6195 at tinbook:  jesse | 2004-11-06T15:14:59.241373Z
 Better handling of Record deletion confirmation messages. (To go with new searchbuilder fixes)
 


Modified: rt/branches/3.3-TESTING/lib/RT/CustomField_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/CustomField_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/CustomField_Overlay.pm	Sun Nov  7 10:04:23 2004
@@ -271,7 +271,7 @@
 ok(my ($val,$msg)  = $cf->AddValue(Name => 'foo' , Description => 'TestCFValue', SortOrder => '6'));
 ok($val != 0);
 ok (my ($delval, $delmsg) = $cf->DeleteValue($val));
-ok ($delval != 0);
+ok ($delval,"Deleting a cf value: $delmsg");
 
 =end testing
 

Modified: rt/branches/3.3-TESTING/lib/RT/GroupMember_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/GroupMember_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/GroupMember_Overlay.pm	Sun Nov  7 10:04:23 2004
@@ -319,7 +319,7 @@
         }
     }
 
-    my $err = $self->SUPER::Delete();
+    my ($err, $msg) = $self->SUPER::Delete();
     unless ($err) {
             $RT::Logger->warning("Couldn't delete cached group submember ".$self->Id);
         $RT::Handle->Rollback();

Modified: rt/branches/3.3-TESTING/lib/RT/Record.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Record.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Record.pm	Sun Nov  7 10:04:23 2004
@@ -115,9 +115,13 @@
 
 sub Delete {
     my $self = shift;
-    my ($rv, $msg) = $self->SUPER::Delete;
-    $msg ||= $self->loc("Object deleted");
-    return ($rv, $msg);
+    my ($rv) = $self->SUPER::Delete;
+    if ($rv) {
+        return ($rv, $self->loc("Object deleted"));
+    } else {
+
+        return(0, $self->loc("Object could not be deleted"))
+    } 
 }
 
 =head2 Attributes