Menu
▾
▴
[Zenoss-commit] r4913 - in trunk/Products: ZenEvents ZenModel ZenModel/migrate
|
From: <sv...@ze...> - 2007-04-27 14:13:48
|
Author: marc
Date: 2007-04-27 10:13:44 -0400 (Fri, 27 Apr 2007)
New Revision: 4913
Modified:
trunk/Products/ZenEvents/ActionRuleWindow.py
trunk/Products/ZenEvents/EventClass.py
trunk/Products/ZenEvents/EventClassInst.py
trunk/Products/ZenEvents/EventManagerBase.py
trunk/Products/ZenModel/CPU.py
trunk/Products/ZenModel/Classifier.py
trunk/Products/ZenModel/DataRoot.py
trunk/Products/ZenModel/Device.py
trunk/Products/ZenModel/DeviceOrganizer.py
trunk/Products/ZenModel/ExpansionCard.py
trunk/Products/ZenModel/FileSystem.py
trunk/Products/ZenModel/HardDisk.py
trunk/Products/ZenModel/HardwareClass.py
trunk/Products/ZenModel/IpInterface.py
trunk/Products/ZenModel/IpNetwork.py
trunk/Products/ZenModel/IpService.py
trunk/Products/ZenModel/IpServiceClass.py
trunk/Products/ZenModel/MaintenanceWindow.py
trunk/Products/ZenModel/Manufacturer.py
trunk/Products/ZenModel/ManufacturerRoot.py
trunk/Products/ZenModel/MibModule.py
trunk/Products/ZenModel/MibNode.py
trunk/Products/ZenModel/MibNotification.py
trunk/Products/ZenModel/MibOrganizer.py
trunk/Products/ZenModel/NagiosCmd.py
trunk/Products/ZenModel/NagiosTemplate.py
trunk/Products/ZenModel/OSProcess.py
trunk/Products/ZenModel/OSProcessClass.py
trunk/Products/ZenModel/OSProcessOrganizer.py
trunk/Products/ZenModel/OperatingSystem.py
trunk/Products/ZenModel/PerformanceConf.py
trunk/Products/ZenModel/ProductClass.py
trunk/Products/ZenModel/ServiceClass.py
trunk/Products/ZenModel/ServiceOrganizer.py
trunk/Products/ZenModel/Software.py
trunk/Products/ZenModel/SoftwareClass.py
trunk/Products/ZenModel/StatusMonitorConf.py
trunk/Products/ZenModel/System.py
trunk/Products/ZenModel/UserCommand.py
trunk/Products/ZenModel/WinService.py
trunk/Products/ZenModel/migrate/menus.py
Log:
* Re-added 4903 changes.
Modified: trunk/Products/ZenEvents/ActionRuleWindow.py
===================================================================
--- trunk/Products/ZenEvents/ActionRuleWindow.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenEvents/ActionRuleWindow.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -47,7 +47,7 @@
, 'permissions' : ( Permissions.view, )
},
{ 'id' : 'viewHistory'
- , 'name' : 'Changes'
+ , 'name' : 'Modifications'
, 'action' : 'viewHistory'
, 'permissions' : ( Permissions.view, )
},
Modified: trunk/Products/ZenEvents/EventClass.py
===================================================================
--- trunk/Products/ZenEvents/EventClass.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenEvents/EventClass.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -110,6 +110,12 @@
, 'action' : 'zPropertyEdit'
, 'permissions' : ("Change Device",)
},
+ { 'id' : 'viewHistory'
+ , 'name' : 'Modifications'
+ , 'action' : 'viewHistory'
+ , 'permissions' : (
+ Permissions.view, )
+ },
)
},
)
Modified: trunk/Products/ZenEvents/EventClassInst.py
===================================================================
--- trunk/Products/ZenEvents/EventClassInst.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenEvents/EventClassInst.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -133,11 +133,11 @@
, 'action' : 'viewHistoryEvents'
, 'permissions' : (Permissions.view, )
},
- #{ 'id' : 'viewHistory'
- #, 'name' : 'Changes'
- #, 'action' : 'viewHistory'
- #, 'permissions' : (Permissions.view, )
- #},
+ { 'id' : 'viewHistory'
+ , 'name' : 'Modifications'
+ , 'action' : 'viewHistory'
+ , 'permissions' : (Permissions.view, )
+ },
)
},
)
Modified: trunk/Products/ZenEvents/EventManagerBase.py
===================================================================
--- trunk/Products/ZenEvents/EventManagerBase.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenEvents/EventManagerBase.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -225,7 +225,7 @@
, 'permissions' : ( "Manage DMD", )
},
{ 'id' : 'changes'
- , 'name' : 'Changes'
+ , 'name' : 'Modifications'
, 'action' : 'viewHistory'
, 'permissions' : ( permissions.view, )
},
Modified: trunk/Products/ZenModel/CPU.py
===================================================================
--- trunk/Products/ZenModel/CPU.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/CPU.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -70,7 +70,7 @@
, 'permissions' : ('View',)
},
{ 'id' : 'viewHistory'
- , 'name' : 'Changes'
+ , 'name' : 'Modifications'
, 'action' : 'viewHistory'
, 'permissions' : ('View',)
},
Modified: trunk/Products/ZenModel/Classifier.py
===================================================================
--- trunk/Products/ZenModel/Classifier.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/Classifier.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -60,7 +60,7 @@
permissions.view, )
},
{ 'id' : 'viewHistory'
- , 'name' : 'Changes'
+ , 'name' : 'Modifications'
, 'action' : 'viewHistory'
, 'permissions' : (
permissions.view, )
Modified: trunk/Products/ZenModel/DataRoot.py
===================================================================
--- trunk/Products/ZenModel/DataRoot.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/DataRoot.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -146,7 +146,7 @@
, 'permissions' : ( "Manage DMD", )
},
{ 'id' : 'viewHistory'
- , 'name' : 'Changes'
+ , 'name' : 'Modifications'
, 'action' : 'viewHistory'
, 'permissions' : (
permissions.view, )
@@ -222,10 +222,15 @@
def checkValidId(self, new_id):
- """Checks a valid id"""
+ """Checks a valid id
+ """
+ test_id = unquote(new_id)
try:
- checkValidId(self, unquote(new_id))
- return True
+ checkValidId(self, test_id)
+ if getattr(self, test_id, False):
+ return 'The id "%s" id already being used.' % test_id
+ else:
+ return True
except:
return str(sys.exc_info()[1])
Modified: trunk/Products/ZenModel/Device.py
===================================================================
--- trunk/Products/ZenModel/Device.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/Device.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -320,7 +320,7 @@
# , 'permissions' : (permissions.view,)
# },
# { 'id' : 'viewHistory'
-# , 'name' : 'Changes'
+# , 'name' : 'Modifications'
# , 'action' : 'viewHistory'
# , 'permissions' : (permissions.view, )
# },
Modified: trunk/Products/ZenModel/DeviceOrganizer.py
===================================================================
--- trunk/Products/ZenModel/DeviceOrganizer.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/DeviceOrganizer.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -66,13 +66,13 @@
, 'permissions' : (
permissions.view, )
},
-# { 'id' : 'manage'
-# , 'name' : 'Manage'
-# , 'action' : 'deviceOrganizerManage'
-# , 'permissions' : ('Manage DMD',)
-# },
+ { 'id' : 'manage'
+ , 'name' : 'Manage'
+ , 'action' : 'deviceOrganizerManage'
+ , 'permissions' : ('Manage DMD',)
+ },
{ 'id' : 'viewHistory'
- , 'name' : 'Changes'
+ , 'name' : 'Modifications'
, 'action' : 'viewHistory'
, 'permissions' : (
permissions.view, )
Modified: trunk/Products/ZenModel/ExpansionCard.py
===================================================================
--- trunk/Products/ZenModel/ExpansionCard.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/ExpansionCard.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -63,7 +63,7 @@
, 'permissions' : ('View',)
},
{ 'id' : 'viewHistory'
- , 'name' : 'Changes'
+ , 'name' : 'Modifications'
, 'action' : 'viewHistory'
, 'permissions' : ('View',)
},
Modified: trunk/Products/ZenModel/FileSystem.py
===================================================================
--- trunk/Products/ZenModel/FileSystem.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/FileSystem.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -96,7 +96,7 @@
#, 'permissions' : ("Change Device", )
#},
{ 'id' : 'viewHistory'
- , 'name' : 'Changes'
+ , 'name' : 'Modifications'
, 'action' : 'viewHistory'
, 'permissions' : ('View',)
},
Modified: trunk/Products/ZenModel/HardDisk.py
===================================================================
--- trunk/Products/ZenModel/HardDisk.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/HardDisk.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -82,7 +82,7 @@
# , 'permissions' : ("Change Device", )
# },
{ 'id' : 'viewHistory'
- , 'name' : 'Changes'
+ , 'name' : 'Modifications'
, 'action' : 'viewHistory'
, 'permissions' : ('View',)
},
Modified: trunk/Products/ZenModel/HardwareClass.py
===================================================================
--- trunk/Products/ZenModel/HardwareClass.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/HardwareClass.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -61,7 +61,7 @@
# permissions.view, )
# },
# { 'id' : 'viewHistory'
-# , 'name' : 'Changes'
+# , 'name' : 'Modifications'
# , 'action' : 'viewHistory'
# , 'permissions' : (
# permissions.view, )
Modified: trunk/Products/ZenModel/IpInterface.py
===================================================================
--- trunk/Products/ZenModel/IpInterface.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/IpInterface.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -129,7 +129,7 @@
# , 'permissions' : ("Change Device", )
# },
{ 'id' : 'viewHistory'
- , 'name' : 'Changes'
+ , 'name' : 'Modifications'
, 'action' : 'viewHistory'
, 'permissions' : ('View',)
},
Modified: trunk/Products/ZenModel/IpNetwork.py
===================================================================
--- trunk/Products/ZenModel/IpNetwork.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/IpNetwork.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -112,12 +112,12 @@
, 'action' : 'zPropertyEdit'
, 'permissions' : ("Manage DMD",)
},
-# { 'id' : 'viewHistory'
-# , 'name' : 'Changes'
-# , 'action' : 'viewHistory'
-# , 'permissions' : (
-# permissions.view, )
-# },
+ { 'id' : 'viewHistory'
+ , 'name' : 'Modifications'
+ , 'action' : 'viewHistory'
+ , 'permissions' : (
+ permissions.view, )
+ },
)
},
)
Modified: trunk/Products/ZenModel/IpService.py
===================================================================
--- trunk/Products/ZenModel/IpService.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/IpService.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -86,17 +86,17 @@
, 'permissions' : (
Permissions.view, )
},
-# { 'id' : 'manage'
-# , 'name' : 'Manage'
-# , 'action' : 'ipServiceManage'
-# , 'permissions' : ("Manage DMD",)
-# },
-# { 'id' : 'viewHistory'
-# , 'name' : 'Changes'
-# , 'action' : 'viewHistory'
-# , 'permissions' : (
-# Permissions.view, )
-# },
+ { 'id' : 'manage'
+ , 'name' : 'Manage'
+ , 'action' : 'ipServiceManage'
+ , 'permissions' : ("Manage DMD",)
+ },
+ { 'id' : 'viewHistory'
+ , 'name' : 'Modifications'
+ , 'action' : 'viewHistory'
+ , 'permissions' : (
+ Permissions.view, )
+ },
)
},
)
Modified: trunk/Products/ZenModel/IpServiceClass.py
===================================================================
--- trunk/Products/ZenModel/IpServiceClass.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/IpServiceClass.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -69,22 +69,22 @@
, 'action' : 'ipServiceClassEdit'
, 'permissions' : ("Manage DMD", )
},
-# { 'id' : 'manage'
-# , 'name' : 'Manage'
-# , 'action' : 'ipServiceClassManage'
-# , 'permissions' : ("Manage DMD",)
-# },
+ { 'id' : 'manage'
+ , 'name' : 'Manage'
+ , 'action' : 'ipServiceClassManage'
+ , 'permissions' : ("Manage DMD",)
+ },
{ 'id' : 'zproperties'
, 'name' : 'zProperties'
, 'action' : 'zPropertyEdit'
, 'permissions' : ("Change Device",)
},
-# { 'id' : 'viewHistory'
-# , 'name' : 'Changes'
-# , 'action' : 'viewHistory'
-# , 'permissions' : (
-# Permissions.view, )
-# },
+ { 'id' : 'viewHistory'
+ , 'name' : 'Modifications'
+ , 'action' : 'viewHistory'
+ , 'permissions' : (
+ Permissions.view, )
+ },
)
},
)
Modified: trunk/Products/ZenModel/MaintenanceWindow.py
===================================================================
--- trunk/Products/ZenModel/MaintenanceWindow.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/MaintenanceWindow.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -106,7 +106,7 @@
, 'permissions' : ( Permissions.view, )
},
{ 'id' : 'viewHistory'
- , 'name' : 'Changes'
+ , 'name' : 'Modifications'
, 'action' : 'viewHistory'
, 'permissions' : ( Permissions.view, )
},
Modified: trunk/Products/ZenModel/Manufacturer.py
===================================================================
--- trunk/Products/ZenModel/Manufacturer.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/Manufacturer.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -86,21 +86,21 @@
, 'action' : 'viewManufacturerOverview'
, 'permissions' : (permissions.view, )
},
- #{ 'id' : 'edit'
- #, 'name' : 'Edit'
- #, 'action' : 'editManufacturer'
- #, 'permissions' : ("Manage DMD", )
- #},
+ { 'id' : 'edit'
+ , 'name' : 'Edit'
+ , 'action' : 'editManufacturer'
+ , 'permissions' : ("Manage DMD", )
+ },
{ 'id' : 'config'
, 'name' : 'zProperties'
, 'action' : 'zPropertyEdit'
, 'permissions' : ("Manage DMD",)
},
-# { 'id' : 'viewHistory'
-# , 'name' : 'Changes'
-# , 'action' : 'viewHistory'
-# , 'permissions' : (permissions.view, )
-# },
+ { 'id' : 'viewHistory'
+ , 'name' : 'Modifications'
+ , 'action' : 'viewHistory'
+ , 'permissions' : (permissions.view, )
+ },
)
},
)
Modified: trunk/Products/ZenModel/ManufacturerRoot.py
===================================================================
--- trunk/Products/ZenModel/ManufacturerRoot.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/ManufacturerRoot.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -80,7 +80,7 @@
permissions.view, )
},
{ 'id' : 'viewHistory'
- , 'name' : 'Changes'
+ , 'name' : 'Modifications'
, 'action' : 'viewHistory'
, 'permissions' : (
permissions.view, )
Modified: trunk/Products/ZenModel/MibModule.py
===================================================================
--- trunk/Products/ZenModel/MibModule.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/MibModule.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -55,7 +55,7 @@
, 'permissions' : ( Permissions.view, )
},
{ 'id' : 'viewHistory'
- , 'name' : 'Changes'
+ , 'name' : 'Modifications'
, 'action' : 'viewHistory'
, 'permissions' : ( Permissions.view, )
},
Modified: trunk/Products/ZenModel/MibNode.py
===================================================================
--- trunk/Products/ZenModel/MibNode.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/MibNode.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -44,7 +44,7 @@
, 'permissions' : ( Permissions.view, )
},
{ 'id' : 'viewHistory'
- , 'name' : 'Changes'
+ , 'name' : 'Modifications'
, 'action' : 'viewHistory'
, 'permissions' : ( Permissions.view, )
},
Modified: trunk/Products/ZenModel/MibNotification.py
===================================================================
--- trunk/Products/ZenModel/MibNotification.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/MibNotification.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -44,7 +44,7 @@
, 'permissions' : ( Permissions.view, )
},
{ 'id' : 'viewHistory'
- , 'name' : 'Changes'
+ , 'name' : 'Modifications'
, 'action' : 'viewHistory'
, 'permissions' : ( Permissions.view, )
},
Modified: trunk/Products/ZenModel/MibOrganizer.py
===================================================================
--- trunk/Products/ZenModel/MibOrganizer.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/MibOrganizer.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -65,7 +65,7 @@
, 'permissions' : ( Permissions.view, )
},
{ 'id' : 'viewHistory'
- , 'name' : 'Changes'
+ , 'name' : 'Modifications'
, 'action' : 'viewHistory'
, 'permissions' : ( Permissions.view, )
},
Modified: trunk/Products/ZenModel/NagiosCmd.py
===================================================================
--- trunk/Products/ZenModel/NagiosCmd.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/NagiosCmd.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -62,7 +62,7 @@
, 'action' : 'editNagiosCmd'
, 'permissions' : ( Permissions.view, )
},
- { 'name' : 'Changes'
+ { 'name' : 'Modifications'
, 'action' : 'viewHistory'
, 'permissions' : ( Permissions.view, )
},
Modified: trunk/Products/ZenModel/NagiosTemplate.py
===================================================================
--- trunk/Products/ZenModel/NagiosTemplate.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/NagiosTemplate.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -71,7 +71,7 @@
, 'action' : 'viewNagiosTemplate'
, 'permissions' : ( Permissions.view, )
},
- { 'name' : 'Changes'
+ { 'name' : 'Modifications'
, 'action' : 'viewHistory'
, 'permissions' : ( Permissions.view, )
},
Modified: trunk/Products/ZenModel/OSProcess.py
===================================================================
--- trunk/Products/ZenModel/OSProcess.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/OSProcess.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -76,16 +76,16 @@
# , 'action' : 'objRRDTemplate'
# , 'permissions' : ("Change Device", )
# },
-# { 'id' : 'manage'
-# , 'name' : 'Manage'
-# , 'action' : 'osProcessManage'
-# , 'permissions' : ("Manage DMD",)
-# },
-# { 'id' : 'viewHistory'
-# , 'name' : 'Changes'
-# , 'action' : 'viewHistory'
-# , 'permissions' : ( Permissions.view, )
-# },
+ { 'id' : 'manage'
+ , 'name' : 'Manage'
+ , 'action' : 'osProcessManage'
+ , 'permissions' : ("Manage DMD",)
+ },
+ { 'id' : 'viewHistory'
+ , 'name' : 'Modifications'
+ , 'action' : 'viewHistory'
+ , 'permissions' : ( Permissions.view, )
+ },
)
},
)
Modified: trunk/Products/ZenModel/OSProcessClass.py
===================================================================
--- trunk/Products/ZenModel/OSProcessClass.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/OSProcessClass.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -76,22 +76,22 @@
, 'action' : 'osProcessClassEdit'
, 'permissions' : ("Manage DMD", )
},
- #{ 'id' : 'manage'
- #, 'name' : 'Manage'
- #, 'action' : 'osProcessClassManage'
- #, 'permissions' : ("Manage DMD",)
- #},
+ { 'id' : 'manage'
+ , 'name' : 'Manage'
+ , 'action' : 'osProcessClassManage'
+ , 'permissions' : ("Manage DMD",)
+ },
{ 'id' : 'zproperties'
, 'name' : 'zProperties'
, 'action' : 'zPropertyEdit'
, 'permissions' : ("Change Device",)
},
-# { 'id' : 'viewHistory'
-# , 'name' : 'Changes'
-# , 'action' : 'viewHistory'
-# , 'permissions' : (
-# Permissions.view, )
-# },
+ { 'id' : 'viewHistory'
+ , 'name' : 'Modifications'
+ , 'action' : 'viewHistory'
+ , 'permissions' : (
+ Permissions.view, )
+ },
)
},
)
Modified: trunk/Products/ZenModel/OSProcessOrganizer.py
===================================================================
--- trunk/Products/ZenModel/OSProcessOrganizer.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/OSProcessOrganizer.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -72,22 +72,22 @@
, 'permissions' : (
Permissions.view, )
},
-# { 'id' : 'manage'
-# , 'name' : 'Manage'
-# , 'action' : 'osProcessOrganizerManage'
-# , 'permissions' : ("Manage DMD",)
-# },
+ { 'id' : 'manage'
+ , 'name' : 'Manage'
+ , 'action' : 'osProcessOrganizerManage'
+ , 'permissions' : ("Manage DMD",)
+ },
{ 'id' : 'zproperties'
, 'name' : 'zProperties'
, 'action' : 'zPropertyEdit'
, 'permissions' : ("Change Device",)
},
-# { 'id' : 'viewHistory'
-# , 'name' : 'Changes'
-# , 'action' : 'viewHistory'
-# , 'permissions' : (
-# Permissions.view, )
-# },
+ { 'id' : 'viewHistory'
+ , 'name' : 'Modifications'
+ , 'action' : 'viewHistory'
+ , 'permissions' : (
+ Permissions.view, )
+ },
)
},
)
Modified: trunk/Products/ZenModel/OperatingSystem.py
===================================================================
--- trunk/Products/ZenModel/OperatingSystem.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/OperatingSystem.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -115,7 +115,7 @@
, 'permissions' : (permissions.view, )
},
{ 'id' : 'viewHistory'
- , 'name' : 'Changes'
+ , 'name' : 'Modifications'
, 'action' : '../viewHistory'
, 'permissions' : (permissions.view, )
},
Modified: trunk/Products/ZenModel/PerformanceConf.py
===================================================================
--- trunk/Products/ZenModel/PerformanceConf.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/PerformanceConf.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -141,13 +141,13 @@
, 'permissions' : (
permissions.view, )
},
-# { 'id' : 'edit'
-# , 'name' : 'Edit'
-# , 'action' : 'editPerformanceConf'
-# , 'permissions' : ("Manage DMD",)
-# },
+ { 'id' : 'edit'
+ , 'name' : 'Edit'
+ , 'action' : 'editPerformanceConf'
+ , 'permissions' : ("Manage DMD",)
+ },
{ 'id' : 'viewHistory'
- , 'name' : 'Changes'
+ , 'name' : 'Modifications'
, 'action' : 'viewHistory'
, 'permissions' : (
permissions.view, )
Modified: trunk/Products/ZenModel/ProductClass.py
===================================================================
--- trunk/Products/ZenModel/ProductClass.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/ProductClass.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -79,12 +79,12 @@
, 'action' : 'zPropertyEdit'
, 'permissions' : ("Manage DMD",)
},
- #{ 'id' : 'viewHistory'
- #, 'name' : 'Changes'
- #, 'action' : 'viewHistory'
- #, 'permissions' : (
- # permissions.view, )
- #},
+ { 'id' : 'viewHistory'
+ , 'name' : 'Modifications'
+ , 'action' : 'viewHistory'
+ , 'permissions' : (
+ permissions.view, )
+ },
)
},
)
Modified: trunk/Products/ZenModel/ServiceClass.py
===================================================================
--- trunk/Products/ZenModel/ServiceClass.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/ServiceClass.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -92,22 +92,22 @@
, 'action' : 'serviceClassEdit'
, 'permissions' : ("Manage DMD", )
},
-# { 'id' : 'manage'
-# , 'name' : 'Manage'
-# , 'action' : 'serviceClassManage'
-# , 'permissions' : ("Manage DMD",)
-# },
+ { 'id' : 'manage'
+ , 'name' : 'Manage'
+ , 'action' : 'serviceClassManage'
+ , 'permissions' : ("Manage DMD",)
+ },
{ 'id' : 'zproperties'
, 'name' : 'zProperties'
, 'action' : 'zPropertyEdit'
, 'permissions' : ("Change Device",)
},
-# { 'id' : 'viewHistory'
-# , 'name' : 'Changes'
-# , 'action' : 'viewHistory'
-# , 'permissions' : (
-# Permissions.view, )
-# },
+ { 'id' : 'viewHistory'
+ , 'name' : 'Modifications'
+ , 'action' : 'viewHistory'
+ , 'permissions' : (
+ Permissions.view, )
+ },
)
},
)
Modified: trunk/Products/ZenModel/ServiceOrganizer.py
===================================================================
--- trunk/Products/ZenModel/ServiceOrganizer.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/ServiceOrganizer.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -71,22 +71,22 @@
, 'permissions' : (
Permissions.view, )
},
-# { 'id' : 'manage'
-# , 'name' : 'Manage'
-# , 'action' : 'serviceOrganizerManage'
-# , 'permissions' : ("Manage DMD",)
-# },
+ { 'id' : 'manage'
+ , 'name' : 'Manage'
+ , 'action' : 'serviceOrganizerManage'
+ , 'permissions' : ("Manage DMD",)
+ },
{ 'id' : 'zproperties'
, 'name' : 'zProperties'
, 'action' : 'zPropertyEdit'
, 'permissions' : ("Change Device",)
},
-# { 'id' : 'viewHistory'
-# , 'name' : 'Changes'
-# , 'action' : 'viewHistory'
-# , 'permissions' : (
-# Permissions.view, )
-# },
+ { 'id' : 'viewHistory'
+ , 'name' : 'Modifications'
+ , 'action' : 'viewHistory'
+ , 'permissions' : (
+ Permissions.view, )
+ },
)
},
)
Modified: trunk/Products/ZenModel/Software.py
===================================================================
--- trunk/Products/ZenModel/Software.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/Software.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -76,7 +76,7 @@
permissions.view, )
},
{ 'id' : 'viewHistory'
- , 'name' : 'Changes'
+ , 'name' : 'Modifications'
, 'action' : 'viewHistory'
, 'permissions' : (
permissions.view, )
Modified: trunk/Products/ZenModel/SoftwareClass.py
===================================================================
--- trunk/Products/ZenModel/SoftwareClass.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/SoftwareClass.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -69,7 +69,7 @@
# permissions.view, )
# },
# { 'id' : 'viewHistory'
-# , 'name' : 'Changes'
+# , 'name' : 'Modifications'
# , 'action' : 'viewHistory'
# , 'permissions' : (
# permissions.view, )
Modified: trunk/Products/ZenModel/StatusMonitorConf.py
===================================================================
--- trunk/Products/ZenModel/StatusMonitorConf.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/StatusMonitorConf.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -101,13 +101,13 @@
, 'permissions' : (
permissions.view, )
},
-# { 'id' : 'edit'
-# , 'name' : 'Edit'
-# , 'action' : 'editStatusMonitorConf'
-# , 'permissions' : ("Manage DMD",)
-# },
+ { 'id' : 'edit'
+ , 'name' : 'Edit'
+ , 'action' : 'editStatusMonitorConf'
+ , 'permissions' : ("Manage DMD",)
+ },
{ 'id' : 'viewHistory'
- , 'name' : 'Changes'
+ , 'name' : 'Modifications'
, 'action' : 'viewHistory'
, 'permissions' : (
permissions.view, )
Modified: trunk/Products/ZenModel/System.py
===================================================================
--- trunk/Products/ZenModel/System.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/System.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -106,17 +106,17 @@
, 'permissions' : (
permissions.view, )
},
- #{ 'id' : 'manage'
- #, 'name' : 'Manage'
- #, 'action' : 'deviceOrganizerManage'
- #, 'permissions' : ('Manage DMD',)
- #},
- #{ 'id' : 'viewHistory'
- #, 'name' : 'Changes'
- #, 'action' : 'viewHistory'
- #, 'permissions' : (
- # permissions.view, )
- #},
+ { 'id' : 'manage'
+ , 'name' : 'Manage'
+ , 'action' : 'deviceOrganizerManage'
+ , 'permissions' : ('Manage DMD',)
+ },
+ { 'id' : 'viewHistory'
+ , 'name' : 'Modifications'
+ , 'action' : 'viewHistory'
+ , 'permissions' : (
+ permissions.view, )
+ },
)
},
)
Modified: trunk/Products/ZenModel/UserCommand.py
===================================================================
--- trunk/Products/ZenModel/UserCommand.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/UserCommand.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -58,7 +58,7 @@
'permissions' : ( Permissions.view, ),
},
{ 'id' : 'viewHistory',
- 'name' : 'Changes',
+ 'name' : 'Modifications',
'action' : 'viewHistory',
'permissions' : ( Permissions.view, ),
}
Modified: trunk/Products/ZenModel/WinService.py
===================================================================
--- trunk/Products/ZenModel/WinService.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/WinService.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -69,13 +69,13 @@
, 'permissions' : (
Permissions.view, )
},
- #{ 'id' : 'manage'
- #, 'name' : 'Manage'
- #, 'action' : 'winServiceManage'
- #, 'permissions' : ("Manage DMD",)
- #},
+ { 'id' : 'manage'
+ , 'name' : 'Manage'
+ , 'action' : 'winServiceManage'
+ , 'permissions' : ("Manage DMD",)
+ },
{ 'id' : 'viewHistory'
- , 'name' : 'Changes'
+ , 'name' : 'Modifications'
, 'action' : 'viewHistory'
, 'permissions' : (
Permissions.view, )
Modified: trunk/Products/ZenModel/migrate/menus.py
===================================================================
--- trunk/Products/ZenModel/migrate/menus.py 2007-04-27 14:03:29 UTC (rev 4912)
+++ trunk/Products/ZenModel/migrate/menus.py 2007-04-27 14:13:44 UTC (rev 4913)
@@ -111,12 +111,9 @@
'More':[
dict(action='viewHistory',
allowed_classes=['Device',
- 'DeviceClass',
- 'EventClass',
- 'EventClassInst',
- 'DeviceOrganizer',],
- description='Changes',
- ordering=99.0,
+ 'DeviceClass',],
+ description='Modifications',
+ ordering=2.0,
id='viewHistory',
permissions=('Change Device',)
),
@@ -192,113 +189,29 @@
),
dict(action='deviceManagement',
allowed_classes=['Device'],
- description='Manage',
+ description='Administration',
ordering=70.0,
id='deviceManagement',
permissions=('Change Device',)
),
dict(action='../deviceManagement',
allowed_classes=['OperatingSystem'],
- description='Manage',
+ description='Administration',
ordering=70.0,
id='deviceManagement_os',
permissions=('Change Device',)
),
- dict(action='serviceOrganizerManage',
- allowed_classes=['ServiceOrganizer'],
- description='Manage',
- ordering=70.0,
- id='serviceOrganizerManage',
- permissions=('Manage DMD',)
- ),
- dict(action='osProcessOrganizerManage',
- allowed_classes=['OSProcessOrganizer'],
- description='Manage',
- ordering=70.0,
- id='osProcessOrganizerManage',
- permissions=('Manage DMD',)
- ),
- dict(action='ipServiceClassManage',
- allowed_classes=['IpServiceClass'],
- description='Manage',
- ordering=70.0,
- id='ipServiceClassManage',
- permissions=('Manage DMD',)
- ),
- dict(action='osProcessManage',
- allowed_classes=['OSProcess'],
- description='Manage',
- ordering=70.0,
- id='osProcessManage',
- permissions=('Manage DMD',)
- ),
- dict(action='serviceClassManage',
- allowed_classes=['ServiceClass'],
- description='Manage',
- ordering=70.0,
- id='serviceClassManage',
- permissions=('Manage DMD',)
- ),
- dict(action='ipServiceManage',
- allowed_classes=['IpService'],
- description='Manage',
- ordering=70.0,
- id='ipServiceManage',
- permissions=('Manage DMD',)
- ),
- dict(action='osProcessClassManage',
- allowed_classes=['OSProcessClass'],
- description='Manage',
- ordering=70.0,
- id='osProcessClassManage',
- permissions=('Manage DMD',)
- ),
dict(action='deviceOrganizerManage',
allowed_classes=['DeviceOrganizer',
'DeviceGroup',
'Location',
'DeviceClass',
'System'],
- description='Manage',
+ description='Administration',
ordering=70.0,
id='deviceOrganizerManage',
permissions=('Manage DMD',)
- ),
- dict(action='winServiceManage',
- allowed_classes=['WinService'],
- description='Manage',
- ordering=70.0,
- id='winServiceManage',
- permissions=('Manage DMD',)
),
- dict(action='editStatusMonitorConf',
- allowed_classes=['StatusMonitorConf'],
- description='Edit',
- ordering=60.0,
- id='editStatusMonitorConf',
- permissions=('Manage DMD',)
- ),
- dict(action='editManufacturer',
- allowed_classes=['Manufacturer',],
- description='Edit',
- ordering=60.0,
- id='editManufacturer',
- permissions=('Manage DMD',)
- ),
- dict(action='editPerformanceConf',
- allowed_classes=['PerformanceConf'],
- description='Edit',
- ordering=60.0,
- id='editPerformanceConf',
- permissions=('Manage DMD',)
- ),
- dict(action='editProductClass',
- allowed_classes=['ProductClass'],
- description='Edit',
- ordering=60.0,
- id='editProductClass',
- permissions=('Manage DMD',)
- ),
dict(action='eventClassInstSequence',
allowed_classes=['EventClassInst'],
description='Sequence',
|
