[Rt-commit] r7745 - in rt/branches/3.7-EXPERIMENTAL: .

ruz at bestpractical.com ruz at bestpractical.com
Wed May 2 17:32:43 EDT 2007


Author: ruz
Date: Wed May  2 17:32:37 2007
New Revision: 7745

Modified:
   rt/branches/3.7-EXPERIMENTAL/   (props changed)
   rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/EditTemplates

Log:
 r5207 at cubic-pc:  cubic | 2007-05-02 23:46:29 +0400
 * check that we've loaded a template before delete


Modified: rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/EditTemplates
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/EditTemplates	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/EditTemplates	Wed May  2 17:32:37 2007
@@ -106,8 +106,13 @@
   # {{{ if we're trying to delete the template
   if ($key =~ /^DeleteTemplate-(\d+)/) {
     my $id = $1;
-    my $TemplateObj = RT::Template->new($session{'CurrentUser'});
-    $TemplateObj->Load($id);
+    my $TemplateObj = RT::Template->new( $session{'CurrentUser'} );
+    $TemplateObj->Load( $id );
+    unless ( $TemplateObj->id ) {
+        push @actions, loc("Couldn't load template #[_1]", $id);
+        next;
+    }
+
     my ($retval, $msg) = $TemplateObj->Delete;
     if ($retval) {
       push @actions, loc("Template deleted");


More information about the Rt-commit mailing list