Changeset 7118

Timestamp:

10/11/07 13:57:02 (14 months ago)

Author:

marc

Message:

 * Checks if to see if this is a valid name of a Service
fixes #2164

Files:

• trunk/Products/ZenModel/OperatingSystem.py (modified) (2 diffs)

trunk/Products/ZenModel/OperatingSystem.py

@@ -263 +263 @@
         org = self.dmd.Services.WinService
         wsc = org.find(org.parseServiceLiveSearchString(className))
-        ws = manage_addWinService(self.winservices, 
-                                wsc.id,
-                                wsc.description,
-                                userCreated=userCreated)
-        if REQUEST: 
-            REQUEST['message'] = 'WinService created'
+        if wsc is not None:
+            ws = manage_addWinService(self.winservices, 
+                                    wsc.id,
+                                    wsc.description,
+                                    userCreated=userCreated)
+        elif REQUEST:
+            REQUEST['message'] = \
+                'Could not find a WinService named %s' % className
+            return self.callZenScreen(REQUEST)
+            
+        if REQUEST: 
+            REQUEST['message'] = 'WinService added'
             REQUEST['RESPONSE'].redirect(ws.absolute_url())
             return self.callZenScreen(REQUEST)
@@ -341 +347 @@
         org = self.dmd.Services.IpService
         ipsc = org.find(org.parseServiceLiveSearchString(className))
-        ips = manage_addIpService(self.ipservices,
-                            ipsc.id,
-                            protocol,
-                            ipsc.port, 
-                            userCreated=userCreated)
-        if REQUEST:
-            REQUEST['message'] = 'IpService created'
+        if ipsc is not None:
+            ips = manage_addIpService(self.ipservices,
+                                ipsc.id,
+                                protocol,
+                                ipsc.port, 
+                                userCreated=userCreated)
+        elif REQUEST:
+            REQUEST['message'] = \
+                'Could not find an IpService named %s' % className
+            return self.callZenScreen(REQUEST)
+                
+        if REQUEST:
+            REQUEST['message'] = 'IpService added'
             REQUEST['RESPONSE'].redirect(ips.absolute_url())
             return self.callZenScreen(REQUEST)