[Rt-commit] r12873 - in rt/branches/3.8-TESTING: .

[sartak at bestpractical.com]

Author: sartak
Date: Wed Jun  4 13:03:52 2008
New Revision: 12873

Modified:
   rt/branches/3.8-TESTING/   (props changed)
   rt/branches/3.8-TESTING/share/html/Admin/Elements/EditCustomField
   rt/branches/3.8-TESTING/share/html/Admin/Elements/ObjectCustomFields

Log:
 r61598 at onn:  sartak | 2008-06-04 13:02:38 -0400
 SuppressHeader in subcomponents' Abort() to avoid display errors


Modified: rt/branches/3.8-TESTING/share/html/Admin/Elements/EditCustomField
==============================================================================
--- rt/branches/3.8-TESTING/share/html/Admin/Elements/EditCustomField	(original)
+++ rt/branches/3.8-TESTING/share/html/Admin/Elements/EditCustomField	Wed Jun  4 13:03:52 2008
@@ -112,13 +112,13 @@
       #  off in the files that use this component.)
       unless ($val) {
 	  $m->clear_buffer;
-	  Abort(loc("Could not create CustomField: [_1]", $msg));
+	  Abort(loc("Could not create CustomField: [_1]", $msg), SuppressHeader => 1);
       }
       push @results, $msg;
       $CustomFieldObj->SetSortOrder($CustomFieldObj->id);
       $title = loc('Created CustomField [_1]', $CustomFieldObj->Name()); 
     } else {
-      $CustomFieldObj->Load($CustomField) || Abort(loc('No CustomField'));
+      $CustomFieldObj->Load($CustomField) || Abort(loc('No CustomField'), SuppressHeader => 1);
       $title = loc('Editing CustomField [_1]', $CustomFieldObj->Name()); 
 
       my @aresults = ProcessCustomFieldUpdates ( 

Modified: rt/branches/3.8-TESTING/share/html/Admin/Elements/ObjectCustomFields
==============================================================================
--- rt/branches/3.8-TESTING/share/html/Admin/Elements/ObjectCustomFields	(original)
+++ rt/branches/3.8-TESTING/share/html/Admin/Elements/ObjectCustomFields	Wed Jun  4 13:03:52 2008
@@ -62,7 +62,7 @@
 <%INIT>
 # XXX TODO: Validate here?
 #$ObjectType =~ /^RT::(Queue|User|Group)$/
-#    or Abort(loc("Object of type [_1] cannot take custom fields", $ObjectType));
+#    or Abort(loc("Object of type [_1] cannot take custom fields", $ObjectType), SuppressHeader => 1);
 
 
 
@@ -82,7 +82,7 @@
 }
 
 if ($id) { 
-    $Object->Load($id) || Abort(loc("Couldn't load object [_1]", $id));
+    $Object->Load($id) || Abort(loc("Couldn't load object [_1]", $id), SuppressHeader => 1);
     $ObjectTabs = "/Admin/Elements/${Type}Tabs";
 } else {
     $ObjectTabs = "/Admin/Elements/GlobalCustomFieldTabs";