[Zenoss-commit] r6855 - trunk/Products/ZenModel

[<sv...@ze...>]

Author: jstevens
Date: 2007-09-28 08:22:53 -0400 (Fri, 28 Sep 2007)
New Revision: 6855

Modified:
   trunk/Products/ZenModel/GraphReportClass.py
   trunk/Products/ZenModel/MultiGraphReportClass.py
Log:
 * Fixed problem where adding a new report ending in an integer would cause error


Modified: trunk/Products/ZenModel/GraphReportClass.py
===================================================================
--- trunk/Products/ZenModel/GraphReportClass.py	2007-09-28 03:31:53 UTC (rev 6854)
+++ trunk/Products/ZenModel/GraphReportClass.py	2007-09-28 12:22:53 UTC (rev 6855)
@@ -50,13 +50,14 @@
     def manage_addGraphReport(self, id, REQUEST=None):
         """Add an MultiGraph report to this object.
         """
+        import pdb; pdb.set_trace()
         from Products.ZenModel.GraphReport import GraphReport
         fr = GraphReport(id)
         self._setObject(id, fr)
         if REQUEST:
-            url = '%s/%s/editGraphReport' % (self.getPrimaryUrlPath(), id)
-            REQUEST['RESPONSE'].redirect(url)
-        return fr
+            url = '%s/%s/editGraphReport' % (self.getPrimaryUrlPath(),id)
+            return REQUEST['RESPONSE'].redirect(url)
+        return self._getOb(id)
 
 
 InitializeClass(GraphReportClass)

Modified: trunk/Products/ZenModel/MultiGraphReportClass.py
===================================================================
--- trunk/Products/ZenModel/MultiGraphReportClass.py	2007-09-28 03:31:53 UTC (rev 6854)
+++ trunk/Products/ZenModel/MultiGraphReportClass.py	2007-09-28 12:22:53 UTC (rev 6855)
@@ -62,8 +62,8 @@
         self._setObject(id, fr)
         if REQUEST:
             url = '%s/%s/editMultiGraphReport' % (self.getPrimaryUrlPath(), id)
-            REQUEST['RESPONSE'].redirect(url)
-        return fr
+            return REQUEST['RESPONSE'].redirect(url)
+        return self._getOb(id)
 
 
 InitializeClass(MultiGraphReportClass)