Menu
▾
▴
zenoss-commit — svn commit list
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
(65) |
Mar
(276) |
Apr
(544) |
May
(638) |
Jun
(225) |
Jul
(204) |
Aug
(294) |
Sep
(532) |
Oct
(506) |
Nov
(324) |
Dec
(359) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(208) |
Feb
(225) |
Mar
(248) |
Apr
(388) |
May
(222) |
Jun
(47) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@ze...> - 2007-03-22 14:13:57
|
Author: ian
Date: 2007-03-22 10:13:54 -0400 (Thu, 22 Mar 2007)
New Revision: 4345
Modified:
trunk/Products/ZenModel/skins/zenmodel/userCommandsMacros.pt
Log:
* Fixed a URL path bug for menus
Modified: trunk/Products/ZenModel/skins/zenmodel/userCommandsMacros.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/userCommandsMacros.pt 2007-03-22 13:11:18 UTC (rev 4344)
+++ trunk/Products/ZenModel/skins/zenmodel/userCommandsMacros.pt 2007-03-22 14:13:54 UTC (rev 4345)
@@ -111,7 +111,7 @@
tal:define="commands here/getUserCommands"
tal:condition="commands">
<form name="command_proxy" method="post"
-tal:define="mypath python:basepath.replace('/manage_doUserCommand','')"
+tal:define="mypath here/getPrimaryUrlPath"
tal:attributes="action string:${mypath}/manage_doUserCommand">
<input type="hidden" name="commandId" id="commandId"/>
</form>
|
|
From: <sv...@ze...> - 2007-03-22 13:11:46
|
Author: edahl
Date: 2007-03-22 09:11:18 -0400 (Thu, 22 Mar 2007)
New Revision: 4344
Modified:
trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt
Log:
* fix problem with bad url after running command
Modified: trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt 2007-03-22 08:14:54 UTC (rev 4343)
+++ trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt 2007-03-22 13:11:18 UTC (rev 4344)
@@ -5,10 +5,7 @@
<div class="menu" tal:define="
menu_ids menu_ids | python:['Edit','Actions'];
pathtrans here/REQUEST/PATH_TRANSLATED;
- basepath python:test(
- pathtrans.endswith(template.id),
- '/'.join(pathtrans.split('/')[:-1]),
- pathtrans)">
+ basepath here/getPrimaryUrlPath">
<div tal:attributes="id string:contextmenu_btn">
<a class="tabletitle"> </a>
</div>
@@ -75,11 +72,7 @@
<div class="contextmenu" tal:attributes="id menu_id"
tal:define="menuitems python:here.getMenus(menu_id, here);
- pathtrans here/REQUEST/PATH_TRANSLATED;
- basepath python:test(
- pathtrans.endswith(template.id),
- '/'.join(pathtrans.split('/')[:-1]),
- pathtrans)"
+ basepath here/getPrimaryUrlPath"
tal:condition="menuitems">
<div tal:attributes="id string:${menu_id}_btn">
|
|
From: <sv...@ze...> - 2007-03-22 08:14:54
|
Author: ahajda
Date: 2007-03-22 04:14:54 -0400 (Thu, 22 Mar 2007)
New Revision: 4343
Modified:
trunk/wmi/Samba/source/librpc/ndr/ndr_dcom.c
Log:
(BUG) Memory context initialization.
Modified: trunk/wmi/Samba/source/librpc/ndr/ndr_dcom.c
===================================================================
--- trunk/wmi/Samba/source/librpc/ndr/ndr_dcom.c 2007-03-22 02:11:06 UTC (rev 4342)
+++ trunk/wmi/Samba/source/librpc/ndr/ndr_dcom.c 2007-03-22 08:14:54 UTC (rev 4343)
@@ -611,6 +611,7 @@
{
TALLOC_CTX *tc;
+ tc = NDR_PULL_GET_MEM_CTX(ndr);
ndr_set_flags(&ndr->flags, LIBNDR_FLAG_NOALIGN);
NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->flags));
if (r->flags & WCF_CLASS) {
|
|
From: <sv...@ze...> - 2007-03-22 02:11:06
|
Author: marc
Date: 2007-03-21 22:11:06 -0400 (Wed, 21 Mar 2007)
New Revision: 4342
Modified:
trunk/Products/ZenModel/Device.py
trunk/Products/ZenRRD/RenderServer.py
Log:
#827
* linking moveRRDFiles to UI, testing.
Modified: trunk/Products/ZenModel/Device.py
===================================================================
--- trunk/Products/ZenModel/Device.py 2007-03-21 22:43:03 UTC (rev 4341)
+++ trunk/Products/ZenModel/Device.py 2007-03-22 02:11:06 UTC (rev 4342)
@@ -1039,6 +1039,11 @@
obj = self.getDmdRoot("Monitors").getPerformanceMonitor(
performanceMonitor)
self.addRelation("perfServer", obj)
+
+ if newPerformanceMonitor:
+ self.dmd.RenderServer.moveRRDFiles(self.id,
+ newPerformanceMonitor, performanceMonitor, REQUEST)
+
if REQUEST:
REQUEST['message'] = "Set Performance %s at time:" % performanceMonitor
return self.callZenScreen(REQUEST)
Modified: trunk/Products/ZenRRD/RenderServer.py
===================================================================
--- trunk/Products/ZenRRD/RenderServer.py 2007-03-21 22:43:03 UTC (rev 4341)
+++ trunk/Products/ZenRRD/RenderServer.py 2007-03-22 02:11:06 UTC (rev 4342)
@@ -140,9 +140,18 @@
for file in tar.getmembers():
tar.extract(file, destdir)
tar.close()
-
- def moveRRDFiles(self, device, server, REQUEST=None):
- """Untar a package of RRDFiles"""
+
+ def receiveRRDFiles(self, REQUEST=None):
+ """receive a device's RRD Files from another server"""
+ if REQUEST:
+ tarfile = REQUEST.get('tarfile')
+ tarfilename = REQUEST.get('tarfilename')
+ f=open('%s/%s' % (self.tmpdir, tarfilename), 'wb')
+ f.write(urllib.unquote(tarfile))
+ f.close()
+
+ def sendRRDFiles(self, device, server, REQUEST=None):
+ """Move a package of RRDFiles"""
tarfilename = '%s.tgz' % device
f=open('%s/%s' % (self.tmpdir, tarfilename), 'rb')
tarfilebody=f.read()
@@ -151,24 +160,23 @@
params = urllib.urlencode({'tarfilename': tarfilename,
'tarfile':tarfilebody})
# send the file to zope
- remoteUrl = 'http://%s/zport/RenderServer/receiveRRDFiles' % server
+ perfMon = self.getDmdRoot("Monitors").getPerformanceMonitor(server)
+ remoteUrl = '%s/receiveRRDFiles' % (perfMon.renderurl)
urllib.urlopen(remoteUrl, params)
- def receiveRRDFiles(self, REQUEST=None):
- """receive a device's RRD Files from another server"""
- if REQUEST:
- tarfile = REQUEST.get('tarfile')
- tarfilename = REQUEST.get('tarfilename')
- f=open('%s/%s' % (self.tmpdir, tarfilename), 'wb')
- f.write(urllib.unquote(tarfile))
- f.close()
-
- def sendRRDFiles(self, device, server, REQUEST=None):
+ def moveRRDFiles(self, device, destServer, srcServer=None, REQUEST=None):
"""send a device's RRD Files to another server"""
- self.packageRRDFiles(device, REQUEST)
- self.moveRRDFiles(device, server, REQUEST)
- remoteUrl = 'http://%s/zport/RenderServer/unpackageRRDFiles?device=%s' % (server, device)
- urllib.urlopen(remoteUrl)
+ import pdb; pdb.set_trace()
+ destPerfMon = self.getDmdRoot("Monitors").getPerformanceMonitor(destServer)
+ srcPerfMon = self.getDmdRoot("Monitors").getPerformanceMonitor(srcServer)
+ if srcServer:
+ remoteUrl = '%s/moveRRDFiles?device=%s&destServer=%s' % (srcPerfMon.renderurl, device, destServer)
+ urllib.urlopen(remoteUrl)
+ else:
+ self.packageRRDFiles(device, REQUEST)
+ self.sendRRDFiles(device, destServer, REQUEST)
+ remoteUrl = '%s/unpackageRRDFiles?device=%s' % (destPerfMon.renderurl, device)
+ urllib.urlopen(remoteUrl)
security.declareProtected('View', 'plugin')
def plugin(self, name, REQUEST=None):
|
|
From: <sv...@ze...> - 2007-03-21 22:43:07
|
Author: edahl
Date: 2007-03-21 18:43:03 -0400 (Wed, 21 Mar 2007)
New Revision: 4341
Modified:
trunk/Products/ZenEvents/zensyslog.py
Log:
* fix problem with reverse lookup on syslog reception
Modified: trunk/Products/ZenEvents/zensyslog.py
===================================================================
--- trunk/Products/ZenEvents/zensyslog.py 2007-03-21 21:55:36 UTC (rev 4340)
+++ trunk/Products/ZenEvents/zensyslog.py 2007-03-21 22:43:03 UTC (rev 4341)
@@ -18,7 +18,7 @@
from twisted.internet.protocol import DatagramProtocol
from twisted.internet import reactor
-from twisted.names.client import getHostByName
+from twisted.names.client import lookupPointer
from twisted.python import failure
from EventServer import EventServer
@@ -56,20 +56,20 @@
def datagramReceived(self, msg, client_address):
"""Use a separate thread to process the request."""
- host, port = client_address
+ ipaddr, port = client_address
if self.options.logorig:
self.olog.info(msg)
- getHostByName(host).addBoth(self.gotHostname, (msg, host, time.time()) )
+ lookupPointer(host,timeout=(1,)).addBoth(self.gotHostname, (msg,ipaddr,time.time()) )
def gotHostname(self, host, data):
"send the resolved address, if possible, and the event via the thread"
if isinstance(host, failure.Failure):
- host = host.value.args[0]
+ host = data[1]
self.q.put( (host,) + data )
- def doHandleRequest(self, ipaddr, msg, host, rtime):
+ def doHandleRequest(self, host, msg, ipaddr, rtime):
"process a single syslog message, called from the inherited thread"
self.processor.process(msg, ipaddr, host, rtime)
|
|
From: <sv...@ze...> - 2007-03-21 21:55:36
|
Author: edahl Date: 2007-03-21 17:55:36 -0400 (Wed, 21 Mar 2007) New Revision: 4340 Modified: trunk/inst/docs/ZenossDevGuide Log: * reorganize the docuement structure Modified: trunk/inst/docs/ZenossDevGuide =================================================================== (Binary files differ) |
|
From: <sv...@ze...> - 2007-03-21 21:30:45
|
Author: ian
Date: 2007-03-21 17:30:40 -0400 (Wed, 21 Mar 2007)
New Revision: 4339
Modified:
trunk/Products/ZenWidgets/skins/zenui/css/menus.css
Log:
* Fixed a CSS bug in menus on streams
Modified: trunk/Products/ZenWidgets/skins/zenui/css/menus.css
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/css/menus.css 2007-03-21 21:21:44 UTC (rev 4338)
+++ trunk/Products/ZenWidgets/skins/zenui/css/menus.css 2007-03-21 21:30:40 UTC (rev 4339)
@@ -8,6 +8,7 @@
.contextmenu * ,
.littlemenu * {
padding: 0;
+ font-size: 12pt;
margin:0;
font-weight: normal;
}
@@ -108,6 +109,7 @@
ul.zenMenu li {
border-bottom: 1px dotted grey;
line-height: 2em;
+ font-size: 9pt;
}
ul.zenMenu li a:hover {
|
|
From: <sv...@ze...> - 2007-03-21 21:21:49
|
Author: abray Date: 2007-03-21 17:21:44 -0400 (Wed, 21 Mar 2007) New Revision: 4338 Added: trunk/inst/docs/ZenossDevGuide Log: firstadd Added: trunk/inst/docs/ZenossDevGuide Property changes on: trunk/inst/docs/ZenossDevGuide ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
|
From: <sv...@ze...> - 2007-03-21 21:19:04
|
Author: abray Date: 2007-03-21 17:19:04 -0400 (Wed, 21 Mar 2007) New Revision: 4337 Modified: trunk/inst/docs/ZenossAdminGuide1.1.x.doc Log: bug948 Modified: trunk/inst/docs/ZenossAdminGuide1.1.x.doc =================================================================== (Binary files differ) |
|
From: <sv...@ze...> - 2007-03-21 21:17:41
|
Author: ian
Date: 2007-03-21 17:17:40 -0400 (Wed, 21 Mar 2007)
New Revision: 4336
Modified:
trunk/Products/ZenModel/skins/zenmodel/userCommandsMacros.pt
Log:
* Fixed the action path on the run command form in the menu.
Modified: trunk/Products/ZenModel/skins/zenmodel/userCommandsMacros.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/userCommandsMacros.pt 2007-03-21 20:45:29 UTC (rev 4335)
+++ trunk/Products/ZenModel/skins/zenmodel/userCommandsMacros.pt 2007-03-21 21:17:40 UTC (rev 4336)
@@ -110,7 +110,9 @@
<li metal:define-macro="runCommandMenu"
tal:define="commands here/getUserCommands"
tal:condition="commands">
-<form name="command_proxy" action="manage_doUserCommand" method="post">
+<form name="command_proxy" method="post"
+tal:define="mypath python:basepath.replace('/manage_doUserCommand','')"
+tal:attributes="action string:${mypath}/manage_doUserCommand">
<input type="hidden" name="commandId" id="commandId"/>
</form>
<script>
|
|
From: <sv...@ze...> - 2007-03-21 20:45:54
|
Author: ian
Date: 2007-03-21 16:45:29 -0400 (Wed, 21 Mar 2007)
New Revision: 4335
Modified:
trunk/Products/ZenModel/skins/zenmodel/commandOutputTemplate.pt
trunk/Products/ZenModel/skins/zenmodel/userCommandsMacros.pt
trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt
Log:
* Added "Run Commands" menu
Modified: trunk/Products/ZenModel/skins/zenmodel/commandOutputTemplate.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/commandOutputTemplate.pt 2007-03-21 19:28:27 UTC (rev 4334)
+++ trunk/Products/ZenModel/skins/zenmodel/commandOutputTemplate.pt 2007-03-21 20:45:29 UTC (rev 4335)
@@ -1,11 +1,30 @@
<html>
<head metal:use-macro="here/templates/macros/head1"/>
<body>
+ <tal:block metal:use-macro="here/dialogmacros/macros/dialog_with_buttons"/>
<div id="frame">
<div metal:use-macro="here/templates/macros/topPane"/>
+ <div metal:use-macro="here/templates/macros/infoBar"/>
+ <div id="paneToggle"></div>
+ <style tal:condition="python:'Zenoss_Collapsed_Menu' in
+ here.REQUEST.HTTP_COOKIE">
+ #leftPane { display:none;}
+ #rightPane { margin-left:12px;}
+ #paneToggle {
+ background-image: url('paneToggle_bg_collapsed.gif');
+ border-right: medium none;
+ }
+ #leftPaneToggle{ display:block;
+ background:transparent url(img/leftpanetoggle_bg.gif) top
+ left repeat-x;
+ height: 30px;
+ width: 30px;
+ }
+ #breadCrumbPane{ padding-left: 35px;}
+
+ </style>
<div metal:use-macro="here/templates/macros/leftPane"/>
<div id="rightPane"/>
- <div metal:use-macro="here/templates/macros/breadCrumbPane"/>
<div metal:use-macro="here/templates/macros/tabsPane"/>
<script type="text/javascript">zenPageInit()</script>
<div id="contentPane">
Modified: trunk/Products/ZenModel/skins/zenmodel/userCommandsMacros.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/userCommandsMacros.pt 2007-03-21 19:28:27 UTC (rev 4334)
+++ trunk/Products/ZenModel/skins/zenmodel/userCommandsMacros.pt 2007-03-21 20:45:29 UTC (rev 4335)
@@ -105,3 +105,32 @@
name="manage_doUserCommand:method" value=" Run " />
</td>
</tr>
+
+
+<li metal:define-macro="runCommandMenu"
+ tal:define="commands here/getUserCommands"
+ tal:condition="commands">
+<form name="command_proxy" action="manage_doUserCommand" method="post">
+<input type="hidden" name="commandId" id="commandId"/>
+</form>
+<script>
+function submitCommandForm(commandId) {
+ $('commandId').value = commandId;
+ document.forms.command_proxy.submit();
+}
+</script>
+ <a href="javascript:void(0)">
+ Run Commands
+ </a>
+ <div class="submenu">
+ <div class="menu_top_rounded"> </div>
+ <div class="menu_bottom"> </div>
+ <ul>
+ <li tal:repeat="item commands">
+ <a tal:attributes="
+ href string:javascript:submitCommandForm('${item/getId}');"
+ tal:content="item/getId">command</a>
+ </li>
+ </ul>
+ </div>
+</li>
Modified: trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt 2007-03-21 19:28:27 UTC (rev 4334)
+++ trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt 2007-03-21 20:45:29 UTC (rev 4335)
@@ -37,6 +37,7 @@
</div>
</li>
</tal:block>
+<tal:block metal:use-macro="here/userCommandsMacros/macros/runCommandMenu"/>
</ul>
</div>
</div>
|
|
From: <sv...@ze...> - 2007-03-21 19:28:33
|
Author: ian
Date: 2007-03-21 15:28:27 -0400 (Wed, 21 Mar 2007)
New Revision: 4334
Modified:
trunk/Products/ZenEvents/EventClass.py
trunk/Products/ZenEvents/EventClassInst.py
trunk/Products/ZenModel/Device.py
trunk/Products/ZenModel/DeviceOrganizer.py
trunk/Products/ZenModel/FileSystem.py
trunk/Products/ZenModel/HardDisk.py
trunk/Products/ZenModel/IpInterface.py
trunk/Products/ZenModel/IpNetwork.py
trunk/Products/ZenModel/IpService.py
trunk/Products/ZenModel/IpServiceClass.py
trunk/Products/ZenModel/Manufacturer.py
trunk/Products/ZenModel/OSProcess.py
trunk/Products/ZenModel/OSProcessClass.py
trunk/Products/ZenModel/OSProcessOrganizer.py
trunk/Products/ZenModel/PerformanceConf.py
trunk/Products/ZenModel/ProductClass.py
trunk/Products/ZenModel/ServiceClass.py
trunk/Products/ZenModel/ServiceOrganizer.py
trunk/Products/ZenModel/StatusMonitorConf.py
trunk/Products/ZenModel/System.py
trunk/Products/ZenModel/WinService.py
trunk/Products/ZenModel/migrate/menus.py
Log:
* Removed redundant tabs. We're now running lots of stuff off menus.
Modified: trunk/Products/ZenEvents/EventClass.py
===================================================================
--- trunk/Products/ZenEvents/EventClass.py 2007-03-21 18:52:23 UTC (rev 4333)
+++ trunk/Products/ZenEvents/EventClass.py 2007-03-21 19:28:27 UTC (rev 4334)
@@ -92,11 +92,11 @@
, 'permissions' : (
Permissions.view, )
},
- { 'id' : 'config'
- , 'name' : 'zProperties'
- , 'action' : 'zPropertyEdit'
- , 'permissions' : ("Change Device",)
- },
+ #{ 'id' : 'config'
+ #, 'name' : 'zProperties'
+ #, 'action' : 'zPropertyEdit'
+ #, 'permissions' : ("Change Device",)
+ #},
{ 'id' : 'viewHistory'
, 'name' : 'Changes'
, 'action' : 'viewHistory'
Modified: trunk/Products/ZenEvents/EventClassInst.py
===================================================================
--- trunk/Products/ZenEvents/EventClassInst.py 2007-03-21 18:52:23 UTC (rev 4333)
+++ trunk/Products/ZenEvents/EventClassInst.py 2007-03-21 19:28:27 UTC (rev 4334)
@@ -94,21 +94,21 @@
, 'action' : 'eventClassInstStatus'
, 'permissions' : (Permissions.view, )
},
- { 'id' : 'edit'
- , 'name' : 'Edit'
- , 'action' : 'eventClassInstEdit'
- , 'permissions' : ("Manage DMD", )
- },
- { 'id' : 'sequence'
- , 'name' : 'Sequence'
- , 'action' : 'eventClassInstSequence'
- , 'permissions' : (Permissions.view,)
- },
- { 'id' : 'config'
- , 'name' : 'zProperties'
- , 'action' : 'zPropertyEdit'
- , 'permissions' : ("Manage DMD",)
- },
+ #{ 'id' : 'edit'
+ #, 'name' : 'Edit'
+ #, 'action' : 'eventClassInstEdit'
+ #, 'permissions' : ("Manage DMD", )
+ #},
+ #{ 'id' : 'sequence'
+ #, 'name' : 'Sequence'
+ #, 'action' : 'eventClassInstSequence'
+ #, 'permissions' : (Permissions.view,)
+ #},
+ #{ 'id' : 'config'
+ #, 'name' : 'zProperties'
+ #, 'action' : 'zPropertyEdit'
+ #, 'permissions' : ("Manage DMD",)
+ #},
{ 'id' : 'events'
, 'name' : 'Events'
, 'action' : 'viewEvents'
Modified: trunk/Products/ZenModel/Device.py
===================================================================
--- trunk/Products/ZenModel/Device.py 2007-03-21 18:52:23 UTC (rev 4333)
+++ trunk/Products/ZenModel/Device.py 2007-03-21 19:28:27 UTC (rev 4334)
@@ -292,11 +292,11 @@
# , 'action' : 'objRRDTemplate'
# , 'permissions' : ("Change Device", )
# },
- { 'id' : 'edit'
- , 'name' : 'Edit'
- , 'action' : 'editDevice'
- , 'permissions' : ("Change Device",)
- },
+# { 'id' : 'edit'
+# , 'name' : 'Edit'
+# , 'action' : 'editDevice'
+# , 'permissions' : ("Change Device",)
+# },
# { 'id' : 'management'
# , 'name' : 'Manage'
# , 'action' : 'deviceManagement'
@@ -312,11 +312,11 @@
# , 'action' : 'zPropertyEdit'
# , 'permissions' : (permissions.view,)
# },
-# { 'id' : 'viewHistory'
-# , 'name' : 'Changes'
-# , 'action' : 'viewHistory'
-# , 'permissions' : (permissions.view, )
-# },
+ { 'id' : 'viewHistory'
+ , 'name' : 'Changes'
+ , 'action' : 'viewHistory'
+ , 'permissions' : (permissions.view, )
+ },
)
},
)
Modified: trunk/Products/ZenModel/DeviceOrganizer.py
===================================================================
--- trunk/Products/ZenModel/DeviceOrganizer.py 2007-03-21 18:52:23 UTC (rev 4333)
+++ trunk/Products/ZenModel/DeviceOrganizer.py 2007-03-21 19:28:27 UTC (rev 4334)
@@ -58,11 +58,11 @@
, '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'
, 'action' : 'viewHistory'
Modified: trunk/Products/ZenModel/FileSystem.py
===================================================================
--- trunk/Products/ZenModel/FileSystem.py 2007-03-21 18:52:23 UTC (rev 4333)
+++ trunk/Products/ZenModel/FileSystem.py 2007-03-21 19:28:27 UTC (rev 4334)
@@ -81,11 +81,11 @@
, 'action' : 'viewFileSystem'
, 'permissions' : ('View',)
},
- { 'id' : 'perfConf'
- , 'name' : 'PerfConf'
- , 'action' : 'objRRDTemplate'
- , 'permissions' : ("Change Device", )
- },
+ #{ 'id' : 'perfConf'
+ #, 'name' : 'PerfConf'
+ #, 'action' : 'objRRDTemplate'
+ #, 'permissions' : ("Change Device", )
+ #},
{ 'id' : 'viewHistory'
, 'name' : 'Changes'
, 'action' : 'viewHistory'
Modified: trunk/Products/ZenModel/HardDisk.py
===================================================================
--- trunk/Products/ZenModel/HardDisk.py 2007-03-21 18:52:23 UTC (rev 4333)
+++ trunk/Products/ZenModel/HardDisk.py 2007-03-21 19:28:27 UTC (rev 4334)
@@ -69,11 +69,11 @@
, 'action' : 'viewHardDisk'
, 'permissions' : ('View',)
},
- { 'id' : 'perfConf'
- , 'name' : 'PerfConf'
- , 'action' : 'objRRDTemplate'
- , 'permissions' : ("Change Device", )
- },
+# { 'id' : 'perfConf'
+# , 'name' : 'PerfConf'
+# , 'action' : 'objRRDTemplate'
+# , 'permissions' : ("Change Device", )
+# },
{ 'id' : 'viewHistory'
, 'name' : 'Changes'
, 'action' : 'viewHistory'
Modified: trunk/Products/ZenModel/IpInterface.py
===================================================================
--- trunk/Products/ZenModel/IpInterface.py 2007-03-21 18:52:23 UTC (rev 4333)
+++ trunk/Products/ZenModel/IpInterface.py 2007-03-21 19:28:27 UTC (rev 4334)
@@ -115,11 +115,11 @@
, 'action' : 'viewIpInterface'
, 'permissions' : ('View',)
},
- { 'id' : 'perfConf'
- , 'name' : 'PerfConf'
- , 'action' : 'objRRDTemplate'
- , 'permissions' : ("Change Device", )
- },
+# { 'id' : 'perfConf'
+# , 'name' : 'PerfConf'
+# , 'action' : 'objRRDTemplate'
+# , 'permissions' : ("Change Device", )
+# },
{ 'id' : 'viewHistory'
, 'name' : 'Changes'
, 'action' : 'viewHistory'
Modified: trunk/Products/ZenModel/IpNetwork.py
===================================================================
--- trunk/Products/ZenModel/IpNetwork.py 2007-03-21 18:52:23 UTC (rev 4333)
+++ trunk/Products/ZenModel/IpNetwork.py 2007-03-21 19:28:27 UTC (rev 4334)
@@ -100,11 +100,11 @@
, 'permissions' : (
permissions.view, )
},
- { 'id' : 'config'
- , 'name' : 'zProperties'
- , 'action' : 'zPropertyEdit'
- , 'permissions' : ("Manage DMD",)
- },
+# { 'id' : 'config'
+# , 'name' : 'zProperties'
+# , 'action' : 'zPropertyEdit'
+# , 'permissions' : ("Manage DMD",)
+# },
{ 'id' : 'viewHistory'
, 'name' : 'Changes'
, 'action' : 'viewHistory'
Modified: trunk/Products/ZenModel/IpService.py
===================================================================
--- trunk/Products/ZenModel/IpService.py 2007-03-21 18:52:23 UTC (rev 4333)
+++ trunk/Products/ZenModel/IpService.py 2007-03-21 19:28:27 UTC (rev 4334)
@@ -73,11 +73,11 @@
, 'permissions' : (
Permissions.view, )
},
- { 'id' : 'manage'
- , 'name' : 'Manage'
- , 'action' : 'ipServiceManage'
- , 'permissions' : ("Manage DMD",)
- },
+# { 'id' : 'manage'
+# , 'name' : 'Manage'
+# , 'action' : 'ipServiceManage'
+# , 'permissions' : ("Manage DMD",)
+# },
{ 'id' : 'viewHistory'
, 'name' : 'Changes'
, 'action' : 'viewHistory'
Modified: trunk/Products/ZenModel/IpServiceClass.py
===================================================================
--- trunk/Products/ZenModel/IpServiceClass.py 2007-03-21 18:52:23 UTC (rev 4333)
+++ trunk/Products/ZenModel/IpServiceClass.py 2007-03-21 19:28:27 UTC (rev 4334)
@@ -57,21 +57,21 @@
, 'permissions' : (
Permissions.view, )
},
- { 'id' : 'edit'
- , 'name' : 'Edit'
- , 'action' : 'ipServiceClassEdit'
- , 'permissions' : ("Manage DMD", )
- },
- { 'id' : 'manage'
- , 'name' : 'Manage'
- , 'action' : 'ipServiceClassManage'
- , 'permissions' : ("Manage DMD",)
- },
- { 'id' : 'zproperties'
- , 'name' : 'zProperties'
- , 'action' : 'zPropertyEdit'
- , 'permissions' : ("Change Device",)
- },
+# { 'id' : 'edit'
+# , 'name' : 'Edit'
+# , 'action' : 'ipServiceClassEdit'
+# , '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'
Modified: trunk/Products/ZenModel/Manufacturer.py
===================================================================
--- trunk/Products/ZenModel/Manufacturer.py 2007-03-21 18:52:23 UTC (rev 4333)
+++ trunk/Products/ZenModel/Manufacturer.py 2007-03-21 19:28:27 UTC (rev 4334)
@@ -79,16 +79,16 @@
, 'action' : 'viewManufacturerOverview'
, 'permissions' : (permissions.view, )
},
- { 'id' : 'edit'
- , 'name' : 'Edit'
- , 'action' : 'editManufacturer'
- , 'permissions' : ("Manage DMD", )
- },
- { 'id' : 'config'
- , 'name' : 'zProperties'
- , 'action' : 'zPropertyEdit'
- , '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'
Modified: trunk/Products/ZenModel/OSProcess.py
===================================================================
--- trunk/Products/ZenModel/OSProcess.py 2007-03-21 18:52:23 UTC (rev 4333)
+++ trunk/Products/ZenModel/OSProcess.py 2007-03-21 19:28:27 UTC (rev 4334)
@@ -45,16 +45,16 @@
, 'action' : 'osProcessDetail'
, 'permissions' : ( Permissions.view, )
},
- { 'id' : 'perfConf'
- , 'name' : 'PerfConf'
- , 'action' : 'objRRDTemplate'
- , 'permissions' : ("Change Device", )
- },
- { 'id' : 'manage'
- , 'name' : 'Manage'
- , 'action' : 'osProcessManage'
- , 'permissions' : ("Manage DMD",)
- },
+# { 'id' : 'perfConf'
+# , 'name' : 'PerfConf'
+# , 'action' : 'objRRDTemplate'
+# , 'permissions' : ("Change Device", )
+# },
+# { 'id' : 'manage'
+# , 'name' : 'Manage'
+# , 'action' : 'osProcessManage'
+# , 'permissions' : ("Manage DMD",)
+# },
{ 'id' : 'viewHistory'
, 'name' : 'Changes'
, 'action' : 'viewHistory'
Modified: trunk/Products/ZenModel/OSProcessClass.py
===================================================================
--- trunk/Products/ZenModel/OSProcessClass.py 2007-03-21 18:52:23 UTC (rev 4333)
+++ trunk/Products/ZenModel/OSProcessClass.py 2007-03-21 19:28:27 UTC (rev 4334)
@@ -67,21 +67,21 @@
, 'permissions' : (
Permissions.view, )
},
- { 'id' : 'edit'
- , 'name' : 'Edit'
- , 'action' : 'osProcessClassEdit'
- , 'permissions' : ("Manage DMD", )
- },
- { 'id' : 'manage'
- , 'name' : 'Manage'
- , 'action' : 'osProcessClassManage'
- , 'permissions' : ("Manage DMD",)
- },
- { 'id' : 'zproperties'
- , 'name' : 'zProperties'
- , 'action' : 'zPropertyEdit'
- , 'permissions' : ("Change Device",)
- },
+ #{ 'id' : 'edit'
+ #, 'name' : 'Edit'
+ #, 'action' : 'osProcessClassEdit'
+ #, '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'
Modified: trunk/Products/ZenModel/OSProcessOrganizer.py
===================================================================
--- trunk/Products/ZenModel/OSProcessOrganizer.py 2007-03-21 18:52:23 UTC (rev 4333)
+++ trunk/Products/ZenModel/OSProcessOrganizer.py 2007-03-21 19:28:27 UTC (rev 4334)
@@ -58,16 +58,16 @@
, 'permissions' : (
Permissions.view, )
},
- { 'id' : 'manage'
- , 'name' : 'Manage'
- , 'action' : 'osProcessOrganizerManage'
- , 'permissions' : ("Manage DMD",)
- },
- { 'id' : 'zproperties'
- , 'name' : 'zProperties'
- , 'action' : 'zPropertyEdit'
- , 'permissions' : ("Change Device",)
- },
+# { 'id' : 'manage'
+# , 'name' : 'Manage'
+# , 'action' : 'osProcessOrganizerManage'
+# , 'permissions' : ("Manage DMD",)
+# },
+# { 'id' : 'zproperties'
+# , 'name' : 'zProperties'
+# , 'action' : 'zPropertyEdit'
+# , 'permissions' : ("Change Device",)
+# },
{ 'id' : 'viewHistory'
, 'name' : 'Changes'
, 'action' : 'viewHistory'
Modified: trunk/Products/ZenModel/PerformanceConf.py
===================================================================
--- trunk/Products/ZenModel/PerformanceConf.py 2007-03-21 18:52:23 UTC (rev 4333)
+++ trunk/Products/ZenModel/PerformanceConf.py 2007-03-21 19:28:27 UTC (rev 4334)
@@ -109,11 +109,11 @@
, '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'
, 'action' : 'viewHistory'
Modified: trunk/Products/ZenModel/ProductClass.py
===================================================================
--- trunk/Products/ZenModel/ProductClass.py 2007-03-21 18:52:23 UTC (rev 4333)
+++ trunk/Products/ZenModel/ProductClass.py 2007-03-21 19:28:27 UTC (rev 4334)
@@ -62,16 +62,16 @@
, 'permissions' : (
permissions.view, )
},
- { 'id' : 'edit'
- , 'name' : 'Edit'
- , 'action' : 'editProductClass'
- , 'permissions' : ("Manage DMD", )
- },
- { 'id' : 'config'
- , 'name' : 'zProperties'
- , 'action' : 'zPropertyEdit'
- , 'permissions' : ("Manage DMD",)
- },
+ #{ 'id' : 'edit'
+ #, 'name' : 'Edit'
+ #, 'action' : 'editProductClass'
+ #, 'permissions' : ("Manage DMD", )
+ #},
+ #{ 'id' : 'config'
+ #, 'name' : 'zProperties'
+ #, 'action' : 'zPropertyEdit'
+ #, 'permissions' : ("Manage DMD",)
+ #},
{ 'id' : 'viewHistory'
, 'name' : 'Changes'
, 'action' : 'viewHistory'
Modified: trunk/Products/ZenModel/ServiceClass.py
===================================================================
--- trunk/Products/ZenModel/ServiceClass.py 2007-03-21 18:52:23 UTC (rev 4333)
+++ trunk/Products/ZenModel/ServiceClass.py 2007-03-21 19:28:27 UTC (rev 4334)
@@ -80,21 +80,21 @@
, 'permissions' : (
Permissions.view, )
},
- { 'id' : 'edit'
- , 'name' : 'Edit'
- , 'action' : 'serviceClassEdit'
- , 'permissions' : ("Manage DMD", )
- },
- { 'id' : 'manage'
- , 'name' : 'Manage'
- , 'action' : 'serviceClassManage'
- , 'permissions' : ("Manage DMD",)
- },
- { 'id' : 'zproperties'
- , 'name' : 'zProperties'
- , 'action' : 'zPropertyEdit'
- , 'permissions' : ("Change Device",)
- },
+# { 'id' : 'edit'
+# , 'name' : 'Edit'
+# , 'action' : 'serviceClassEdit'
+# , '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'
Modified: trunk/Products/ZenModel/ServiceOrganizer.py
===================================================================
--- trunk/Products/ZenModel/ServiceOrganizer.py 2007-03-21 18:52:23 UTC (rev 4333)
+++ trunk/Products/ZenModel/ServiceOrganizer.py 2007-03-21 19:28:27 UTC (rev 4334)
@@ -63,16 +63,16 @@
, 'permissions' : (
Permissions.view, )
},
- { 'id' : 'manage'
- , 'name' : 'Manage'
- , 'action' : 'serviceOrganizerManage'
- , 'permissions' : ("Manage DMD",)
- },
- { 'id' : 'zproperties'
- , 'name' : 'zProperties'
- , 'action' : 'zPropertyEdit'
- , 'permissions' : ("Change Device",)
- },
+# { 'id' : 'manage'
+# , 'name' : 'Manage'
+# , 'action' : 'serviceOrganizerManage'
+# , 'permissions' : ("Manage DMD",)
+# },
+# { 'id' : 'zproperties'
+# , 'name' : 'zProperties'
+# , 'action' : 'zPropertyEdit'
+# , 'permissions' : ("Change Device",)
+# },
{ 'id' : 'viewHistory'
, 'name' : 'Changes'
, 'action' : 'viewHistory'
Modified: trunk/Products/ZenModel/StatusMonitorConf.py
===================================================================
--- trunk/Products/ZenModel/StatusMonitorConf.py 2007-03-21 18:52:23 UTC (rev 4333)
+++ trunk/Products/ZenModel/StatusMonitorConf.py 2007-03-21 19:28:27 UTC (rev 4334)
@@ -94,11 +94,11 @@
, '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'
, 'action' : 'viewHistory'
Modified: trunk/Products/ZenModel/System.py
===================================================================
--- trunk/Products/ZenModel/System.py 2007-03-21 18:52:23 UTC (rev 4333)
+++ trunk/Products/ZenModel/System.py 2007-03-21 19:28:27 UTC (rev 4334)
@@ -98,11 +98,11 @@
, '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'
, 'action' : 'viewHistory'
Modified: trunk/Products/ZenModel/WinService.py
===================================================================
--- trunk/Products/ZenModel/WinService.py 2007-03-21 18:52:23 UTC (rev 4333)
+++ trunk/Products/ZenModel/WinService.py 2007-03-21 19:28:27 UTC (rev 4334)
@@ -48,11 +48,11 @@
, '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'
, 'action' : 'viewHistory'
Modified: trunk/Products/ZenModel/migrate/menus.py
===================================================================
--- trunk/Products/ZenModel/migrate/menus.py 2007-03-21 18:52:23 UTC (rev 4333)
+++ trunk/Products/ZenModel/migrate/menus.py 2007-03-21 19:28:27 UTC (rev 4334)
@@ -58,11 +58,6 @@
dmd.buildMenus(
{'Edit':[
- {'action': 'editSettings',
- 'allowed_classes': ['DataRoot'],
- 'description': 'Settings',
- 'id': 'editSettings',
- 'permissions': ('Manage DMD',)},
{'action': 'objRRDTemplate',
'allowed_classes': ['Device',
'FileSystem',
@@ -83,15 +78,10 @@
'id': 'deviceCustomEdit',
'permissions': ('View',)},
{'action': 'eventClassInstEdit',
- 'allowed_classes': ['EventClassPropertyMixin'],
+ 'allowed_classes': ['EventClassInst'],
'description': 'Edit',
'id': 'eventClassInstEdit',
'permissions': ('Manage DMD',)},
- {'action': 'editEventCommand',
- 'allowed_classes': ['EventCommand'],
- 'description': 'Edit',
- 'id': 'editEventCommand',
- 'permissions': ('Manage DMD',)},
{'action': 'ipServiceClassEdit',
'allowed_classes': ['IpServiceClass'],
'description': 'Edit',
@@ -107,11 +97,6 @@
'description': 'Manage',
'id': 'serviceOrganizerManage',
'permissions': ('Manage DMD',)},
- {'action': 'deviceStatus',
- 'allowed_classes': ['Device'],
- 'description': 'Status',
- 'id': 'deviceStatus',
- 'permissions': ('View',)},
{'action': 'osProcessOrganizerManage',
'allowed_classes': ['OSProcessOrganizer'],
'description': 'Manage',
@@ -127,31 +112,11 @@
'description': 'Edit',
'id': 'editManufacturer',
'permissions': ('Manage DMD',)},
- {'action': 'editActionRuleMessage',
- 'allowed_classes': ['ActionRule'],
- 'description': 'Message',
- 'id': 'editActionRuleMessage',
- 'permissions': ('Change Settings',)},
- {'action': 'addDevice',
- 'allowed_classes': ['ZDeviceLoader'],
- 'description': 'Status',
- 'id': 'addDevice',
- 'permissions': ('View',)},
- {'action': 'editRRDDataPoint',
- 'allowed_classes': ['RRDDataPointError'],
- 'description': 'Data Point',
- 'id': 'editRRDDataPoint',
- 'permissions': ('View',)},
{'action': 'osProcessManage',
'allowed_classes': ['OSProcess'],
'description': 'Manage',
'id': 'osProcessManage',
'permissions': ('Manage DMD',)},
- {'action': 'editNagiosCmd',
- 'allowed_classes': ['NagiosCmd'],
- 'description': 'Nagios Command',
- 'id': 'editNagiosCmd',
- 'permissions': ('View',)},
{'action': 'serviceClassManage',
'allowed_classes': ['ServiceClass'],
'description': 'Manage',
@@ -172,58 +137,17 @@
'description': 'Edit',
'id': 'editProductClass',
'permissions': ('Manage DMD',)},
- {'action': 'editMibModule',
- 'allowed_classes': ['MibModule'],
- 'description': 'Edit',
- 'id': 'editMibModule',
- 'permissions': ('View',)},
- {'action': 'editDeviceReport',
- 'allowed_classes': ['DeviceReport'],
- 'description': 'Edit',
- 'id': 'editDeviceReport',
- 'permissions': ('Manage DMD',)},
{'action': 'osProcessClassManage',
'allowed_classes': ['OSProcessClass'],
'description': 'Manage',
'id': 'osProcessClassManage',
'permissions': ('Manage DMD',)},
- {'action': 'deviceOrganizerStatus',
- 'allowed_classes': ['DeviceClass', 'DeviceOrganizer', 'System'],
- 'description': 'Classes',
- 'id': 'deviceOrganizerStatus',
- 'permissions': ('View',)},
- {'action': 'viewManufacturerOverview',
- 'allowed_classes': ['Manufacturer'],
- 'description': 'Overview',
- 'id': 'viewManufacturerOverview',
- 'permissions': ('View',)},
- {'action': 'viewNagiosTemplate',
- 'allowed_classes': ['NagiosTemplate'],
- 'description': 'Nagios Config',
- 'id': 'viewNagiosTemplate',
- 'permissions': ('View',)},
- {'action': 'viewStatusMonitorOverview',
- 'allowed_classes': ['StatusMonitorConf'],
- 'description': 'Overview',
- 'id': 'viewStatusMonitorOverview',
- 'permissions': ('View',)},
- {'action': 'getEventView',
- 'allowed_classes': ['CustomEventView'],
- 'description': 'View',
- 'id': 'getEventView',
- 'permissions': ('View',)},
- {'action': 'ipServiceDetail',
- 'allowed_classes': ['IpService'],
- 'description': 'Status',
- 'id': 'ipServiceDetail',
- 'permissions': ('View',)},
- {'action': 'editRRDGraph',
- 'allowed_classes': ['RRDGraph'],
- 'description': 'Graph',
- 'id': 'editRRDGraph',
- 'permissions': ('View',)},
{'action': 'deviceOrganizerManage',
- 'allowed_classes': ['DeviceOrganizer', 'DeviceClass', 'System'],
+ 'allowed_classes': ['DeviceOrganizer',
+ 'DeviceGroup',
+ 'Location',
+ 'DeviceClass',
+ 'System'],
'description': 'Manage',
'id': 'deviceOrganizerManage',
'permissions': ('Manage DMD',)},
@@ -232,116 +156,21 @@
'description': 'Edit',
'id': 'editDevice',
'permissions': ('Change Device',)},
- {'action': 'editRRDThreshold',
- 'allowed_classes': ['RRDThreshold'],
- 'description': 'RRD Threshold',
- 'id': 'editRRDThreshold',
- 'permissions': ('View',)},
- {'action': 'osProcessClassStatus',
- 'allowed_classes': ['OSProcessClass'],
- 'description': 'Status',
- 'id': 'osProcessClassStatus',
- 'permissions': ('View',)},
{'action': 'winServiceManage',
'allowed_classes': ['WinService'],
'description': 'Manage',
'id': 'winServiceManage',
'permissions': ('Manage DMD',)},
- {'action': 'dataRootManage',
- 'allowed_classes': ['DataRoot'],
- 'description': 'Manage',
- 'id': 'dataRootManage',
- 'permissions': ('Manage DMD',)},
- {'action': 'viewMibNode',
- 'allowed_classes': ['MibNode'],
- 'description': 'Overview',
- 'id': 'viewMibNode',
- 'permissions': ('View',)},
{'action': 'eventClassInstSequence',
- 'allowed_classes': ['EventClassPropertyMixin'],
+ 'allowed_classes': ['EventClassInst'],
'description': 'Sequence',
'id': 'eventClassInstSequence',
'permissions': ('View',)},
- {'action': 'listEventCommands',
- 'allowed_classes': ['EventManagerBase'],
- 'description': 'Commands',
- 'id': 'listEventCommands',
- 'permissions': ('Manage DMD',)},
- {'action': 'viewEventLog',
- 'allowed_classes': ['EventDetail'],
- 'description': 'Log',
- 'id': 'viewEventLog',
- 'permissions': ('View',)},
- {'action': 'viewEventDetail',
- 'allowed_classes': ['EventDetail'],
- 'description': 'Details',
- 'id': 'viewEventDetail',
- 'permissions': ('View',)},
- {'action': 'manageClassifiers',
- 'allowed_classes': ['Classifier'],
- 'description': 'Overview',
- 'id': 'manageClassifiers',
- 'permissions': ('View',)},
- {'action': 'viewIpInterface',
- 'allowed_classes': ['IpInterface'],
- 'description': 'Status',
- 'id': 'viewIpInterface',
- 'permissions': ('View',)},
- {'action': 'viewEventFields',
- 'allowed_classes': ['EventDetail'],
- 'description': 'Fields',
- 'id': 'viewEventFields',
- 'permissions': ('View',)},
- {'action': 'editActionRuleSchedule',
- 'allowed_classes': ['ActionRule'],
- 'description': 'Schedule',
- 'id': 'editActionRuleSchedule',
- 'permissions': ('Change Settings',)},
- {'action': 'osProcessOrganizerOverview',
- 'allowed_classes': ['OSProcessOrganizer'],
- 'description': 'Classes',
- 'id': 'osProcessOrganizerOverview',
- 'permissions': ('View',)},
- {'action': 'serviceOrganizerOverview',
- 'allowed_classes': ['ServiceOrganizer'],
- 'description': 'Classes',
- 'id': 'serviceOrganizerOverview',
- 'permissions': ('View',)},
- {'action': 'eventMappingList',
- 'allowed_classes': ['EventClass'],
- 'description': 'Mappings',
- 'id': 'eventMappingList',
- 'permissions': ('View',)},
- {'action': 'eventFields',
- 'allowed_classes': ['BetterEventDetail'],
- 'description': 'Fields',
- 'id': 'eventFields',
- 'permissions': ('View',)},
{'action': 'osProcessClassEdit',
'allowed_classes': ['OSProcessClass'],
'description': 'Edit',
'id': 'osProcessClassEdit',
'permissions': ('Manage DMD',)},
- {'action': 'editActionRule',
- 'allowed_classes': ['ActionRule'],
- 'description': 'Edit',
- 'id': 'editActionRule',
- 'permissions': ('Change Settings',)},
- {'action': 'monitorList',
- 'allowed_classes': ['MonitorClass'],
- 'description': 'View',
- 'id': 'monitorList',
- 'permissions': ('View',)},
- {'action': 'viewProductClassOverview',
- 'allowed_classes': ['ProductClass'],
- 'description': 'Overview',
- 'id': 'viewProductClassOverview',
- 'permissions': ('View',)},
- {'action': 'eventDetail',
- 'allowed_classes': ['BetterEventDetail'],
- 'description': 'Details',
- 'id': 'eventDetail',
- 'permissions': ('View',)},
{'action': 'perfConfig',
'allowed_classes': ['DeviceClass'],
'description': 'Perf Config',
@@ -358,7 +187,7 @@
'ProductClass',
'ServiceClass',
'ServiceOrganizer',
- 'EventClassPropertyMixin',
+ 'EventClassInst',
'EventClass'],
'description': 'zProperties',
'id': 'zPropertyEdit',
@@ -368,37 +197,7 @@
'description': 'Edit',
'id': 'serviceClassEdit',
'permissions': ('Manage DMD',)},
- {'action': 'editEventView',
- 'allowed_classes': ['CustomEventView'],
- 'description': 'Edit',
- 'id': 'editEventView',
- 'permissions': ('Change Settings',)},
- {'action': 'viewRRDTemplate',
- 'allowed_classes': ['ConfigurationError'],
- 'description': 'Performance Template',
- 'id': 'viewRRDTemplate',
- 'permissions': ('View',)},
- {'action': 'viewReportClass',
- 'allowed_classes': ['ReportClass'],
- 'description': 'View',
- 'id': 'viewReportClass',
- 'permissions': ('View',)},
- {'action': 'winServiceDetail',
- 'allowed_classes': ['WinService'],
- 'description': 'Status',
- 'id': 'winServiceDetail',
- 'permissions': ('View',)},
- {'action': 'manageUserFolder',
- 'allowed_classes': ['UserSettingsManager'],
- 'description': 'Overview',
- 'id': 'manageUserFolder',
- 'permissions': ('View',)},
- {'action': 'osProcessDetail',
- 'allowed_classes': ['OSProcess'],
- 'description': 'Status',
- 'id': 'osProcessDetail',
- 'permissions': ('View',)}] ,
-
+],
'DeviceOrganizer_list':[
dict(
id= 'addToZenPack',
|
|
From: <sv...@ze...> - 2007-03-21 18:52:27
|
Author: jstevens
Date: 2007-03-21 14:52:23 -0400 (Wed, 21 Mar 2007)
New Revision: 4333
Modified:
trunk/Products/ZenModel/Device.py
Log:
Empty newid was causing an error
Modified: trunk/Products/ZenModel/Device.py
===================================================================
--- trunk/Products/ZenModel/Device.py 2007-03-21 18:22:53 UTC (rev 4332)
+++ trunk/Products/ZenModel/Device.py 2007-03-21 18:52:23 UTC (rev 4333)
@@ -476,8 +476,8 @@
def getPageChecks(self):
pageChecks = super(Device, self).getDataSourceCommands(pageChecks=True)
for pc in pageChecks:
- pc['device'] = self.id or ''
- pc['manageIp'] = self.manageIp or ''
+ pc['device'] = self.id
+ pc['manageIp'] = self.manageIp
return pageChecks
@@ -844,9 +844,10 @@
return self.callZenScreen(REQUEST)
security.declareProtected('Change Device', 'manage_addAdministrativeRole')
- def manage_addAdministrativeRole(self, newId, REQUEST=None):
+ def manage_addAdministrativeRole(self, newId=None, REQUEST=None):
"Add a Admin Role to this device"
- us = self.ZenUsers.getUserSettings(newId)
+ if newId:
+ us = self.ZenUsers.getUserSettings(newId)
if us:
ar = DeviceAdministrativeRole(newId)
if us.defaultAdminRole:
|
|
From: <sv...@ze...> - 2007-03-21 18:22:57
|
Author: ian
Date: 2007-03-21 14:22:53 -0400 (Wed, 21 Mar 2007)
New Revision: 4332
Modified:
trunk/Products/ZenModel/migrate/menus.py
trunk/Products/ZenModel/skins/zenmodel/deviceOrganizerManage.pt
trunk/Products/ZenModel/skins/zenmodel/deviceOrganizerStatus.pt
trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt
Log:
* Moved AddZenPack menu item to device organizer lists
Modified: trunk/Products/ZenModel/migrate/menus.py
===================================================================
--- trunk/Products/ZenModel/migrate/menus.py 2007-03-21 17:49:17 UTC (rev 4331)
+++ trunk/Products/ZenModel/migrate/menus.py 2007-03-21 18:22:53 UTC (rev 4332)
@@ -57,27 +57,12 @@
if hasmenus(dmd.Networks): dmd.Networks.zenMenus.removeRelation()
dmd.buildMenus(
- {'Tabs':[
-{'action': 'eventLog',
- 'allowed_classes': ['BetterEventDetail'],
- 'description': 'Log',
- 'id': 'eventLog',
- 'permissions': ('View',)},
+ {'Edit':[
{'action': 'editSettings',
'allowed_classes': ['DataRoot'],
'description': 'Settings',
'id': 'editSettings',
'permissions': ('Manage DMD',)},
- {'action': 'viewNetworkOverview',
- 'allowed_classes': ['IpNetwork'],
- 'description': 'Overview',
- 'id': 'viewNetworkOverview',
- 'permissions': ('View',)},
- {'action': 'zenossInfo',
- 'allowed_classes': ['ZenossInfo'],
- 'description': 'Status',
- 'id': 'zenossInfo',
- 'permissions': ('Manage DMD',)},
{'action': 'objRRDTemplate',
'allowed_classes': ['Device',
'FileSystem',
@@ -92,133 +77,31 @@
'description': 'Edit',
'id': 'editStatusMonitorConf',
'permissions': ('Manage DMD',)},
- {'action': 'viewHistory',
- 'allowed_classes': ['Classifier',
- 'CPU',
- 'DataRoot',
- 'DeviceOrganizer',
- 'Device',
- 'DeviceClass',
- 'ExpansionCard',
- 'FileSystem',
- 'HardDisk',
- 'IpInterface',
- 'IpNetwork',
- 'IpServiceClass',
- 'IpService',
- 'MaintenanceWindow',
- 'Manufacturer',
- 'ManufacturerRoot',
- 'MibModule',
- 'MibNode',
- 'MibNotification',
- 'MibOrganizer',
- 'NagiosCmd',
- 'NagiosTemplate',
- 'OSProcessClass',
- 'OSProcessOrganizer',
- 'OSProcess',
- 'PerformanceConf',
- 'ProductClass',
- 'ServiceClass',
- 'ServiceOrganizer',
- 'Software',
- 'StatusMonitorConf',
- 'System',
- 'UserCommand',
- 'WinService',
- 'ActionRuleWindow',
- 'EventClassPropertyMixin',
- 'EventClass',
- 'EventManagerBase'],
- 'description': 'Changes',
- 'id': 'viewHistory',
- 'permissions': ('View',)},
- {'action': 'actionRuleWindowDetail',
- 'allowed_classes': ['ActionRuleWindow'],
- 'description': 'Status',
- 'id': 'actionRuleWindowDetail',
- 'permissions': ('View',)},
{'action': 'deviceCustomEdit',
'allowed_classes': ['Device'],
'description': 'Custom',
'id': 'deviceCustomEdit',
'permissions': ('View',)},
- {'action': 'viewCPU',
- 'allowed_classes': ['CPU'],
- 'description': 'Status',
- 'id': 'viewCPU',
- 'permissions': ('View',)},
- {'action': 'editEventManagerHistoryFields',
- 'allowed_classes': ['EventManagerBase'],
- 'description': 'History Fields',
- 'id': 'editEventManagerHistoryFields',
- 'permissions': ('Manage DMD',)},
- {'action': 'editRRDDataSource',
- 'allowed_classes': ['RRDDataSourceError'],
- 'description': 'Data Source',
- 'id': 'editRRDDataSource',
- 'permissions': ('View',)},
- {'action': 'viewDevicePerformance',
- 'allowed_classes': ['Device'],
- 'description': 'Perf',
- 'id': 'viewDevicePerformance',
- 'permissions': ('View',)},
- {'action': 'zenossVersions',
- 'allowed_classes': ['ZenossInfo'],
- 'description': 'Versions',
- 'id': 'zenossVersions',
- 'permissions': ('Manage DMD',)},
{'action': 'eventClassInstEdit',
'allowed_classes': ['EventClassPropertyMixin'],
'description': 'Edit',
'id': 'eventClassInstEdit',
'permissions': ('Manage DMD',)},
- {'action': 'deviceHardwareDetail',
- 'allowed_classes': ['Device'],
- 'description': 'Hardware',
- 'id': 'deviceHardwareDetail',
- 'permissions': ('View',)},
{'action': 'editEventCommand',
'allowed_classes': ['EventCommand'],
'description': 'Edit',
'id': 'editEventCommand',
'permissions': ('Manage DMD',)},
- {'action': 'viewDeviceReport',
- 'allowed_classes': ['DeviceReport'],
- 'description': 'Report',
- 'id': 'viewDeviceReport',
- 'permissions': ('View',)},
- {'action': 'viewHistoryEvents',
- 'allowed_classes': ['DeviceClass',
- 'DeviceOrganizer',
- 'Device',
- 'System',
- 'EventClassPropertyMixin',
- 'EventClass'],
- 'description': 'History',
- 'id': 'viewHistoryEvents',
- 'permissions': ('View',)},
{'action': 'ipServiceClassEdit',
'allowed_classes': ['IpServiceClass'],
'description': 'Edit',
'id': 'ipServiceClassEdit',
'permissions': ('Manage DMD',)},
- {'action': 'eventClassStatus',
- 'allowed_classes': ['EventClass'],
- 'description': 'Classes',
- 'id': 'eventClassStatus',
- 'permissions': ('View',)},
{'action': 'deviceManagement',
'allowed_classes': ['Device'],
'description': 'Manage',
'id': 'deviceManagement',
'permissions': ('Change Device',)},
- {'action': 'viewExpansionCard',
- 'allowed_classes': ['ExpansionCard'],
- 'description': 'Status',
- 'id': 'viewExpansionCard',
- 'permissions': ('View',)},
{'action': 'serviceOrganizerManage',
'allowed_classes': ['ServiceOrganizer'],
'description': 'Manage',
@@ -234,46 +117,11 @@
'description': 'Manage',
'id': 'osProcessOrganizerManage',
'permissions': ('Manage DMD',)},
- {'action': 'viewSystemPerformance',
- 'allowed_classes': ['System'],
- 'description': 'Performance',
- 'id': 'viewSystemPerformance',
- 'permissions': ('View',)},
- {'action': 'viewSoftwareOverview',
- 'allowed_classes': ['Software'],
- 'description': 'Overview',
- 'id': 'viewSoftwareOverview',
- 'permissions': ('View',)},
- {'action': 'zenossConfigs',
- 'allowed_classes': ['ZenossInfo'],
- 'description': 'Configuration',
- 'id': 'zenossConfigs',
- 'permissions': ('Manage DMD',)},
- {'action': 'ipServiceClassStatus',
- 'allowed_classes': ['IpServiceClass'],
- 'description': 'Status',
- 'id': 'ipServiceClassStatus',
- 'permissions': ('View',)},
- {'action': 'deviceOsDetail',
- 'allowed_classes': ['Device'],
- 'description': 'OS',
- 'id': 'deviceOsDetail',
- 'permissions': ('View',)},
- {'action': 'eventClassInstStatus',
- 'allowed_classes': ['EventClassPropertyMixin'],
- 'description': 'Status',
- 'id': 'eventClassInstStatus',
- 'permissions': ('View',)},
{'action': 'ipServiceClassManage',
'allowed_classes': ['IpServiceClass'],
'description': 'Manage',
'id': 'ipServiceClassManage',
'permissions': ('Manage DMD',)},
- {'action': 'viewMibNotification',
- 'allowed_classes': ['MibNotification'],
- 'description': 'Overview',
- 'id': 'viewMibNotification',
- 'permissions': ('View',)},
{'action': 'editManufacturer',
'allowed_classes': ['Manufacturer'],
'description': 'Edit',
@@ -289,56 +137,11 @@
'description': 'Status',
'id': 'addDevice',
'permissions': ('View',)},
- {'action': 'maintenanceWindowDetail',
- 'allowed_classes': ['MaintenanceWindow'],
- 'description': 'Status',
- 'id': 'maintenanceWindowDetail',
- 'permissions': ('View',)},
- {'action': 'mibOrganizerOverview',
- 'allowed_classes': ['MibOrganizer'],
- 'description': 'Overview',
- 'id': 'mibOrganizerOverview',
- 'permissions': ('View',)},
- {'action': 'serviceClassStatus',
- 'allowed_classes': ['ServiceClass'],
- 'description': 'Status',
- 'id': 'serviceClassStatus',
- 'permissions': ('View',)},
- {'action': 'viewFileSystem',
- 'allowed_classes': ['FileSystem'],
- 'description': 'Status',
- 'id': 'viewFileSystem',
- 'permissions': ('View',)},
{'action': 'editRRDDataPoint',
'allowed_classes': ['RRDDataPointError'],
'description': 'Data Point',
'id': 'editRRDDataPoint',
'permissions': ('View',)},
- {'action': 'viewEvents',
- 'allowed_classes': ['DeviceClass',
- 'DeviceOrganizer',
- 'Device',
- 'System',
- 'EventClassPropertyMixin',
- 'EventClass'],
- 'description': 'Events',
- 'id': 'viewEvents',
- 'permissions': ('View',)},
- {'action': 'viewMibModule',
- 'allowed_classes': ['MibModule'],
- 'description': 'Overview',
- 'id': 'viewMibModule',
- 'permissions': ('View',)},
- {'action': 'editEventManager',
- 'allowed_classes': ['EventManagerBase'],
- 'description': 'Edit',
- 'id': 'editEventManager',
- 'permissions': ('Manage DMD',)},
- {'action': 'viewManufacturers',
- 'allowed_classes': ['ManufacturerRoot'],
- 'description': 'Overview',
- 'id': 'viewManufacturers',
- 'permissions': ('View',)},
{'action': 'osProcessManage',
'allowed_classes': ['OSProcess'],
'description': 'Manage',
@@ -359,66 +162,21 @@
'description': 'Edit',
'id': 'editPerformanceConf',
'permissions': ('Manage DMD',)},
- {'action': 'viewPackDetail',
- 'allowed_classes': ['ZenPack'],
- 'description': 'Detail',
- 'id': 'viewPackDetail',
- 'permissions': ('Manage DMD',)},
{'action': 'ipServiceManage',
'allowed_classes': ['IpService'],
'description': 'Manage',
'id': 'ipServiceManage',
'permissions': ('Manage DMD',)},
- {'action': 'viewHardDisk',
- 'allowed_classes': ['HardDisk'],
- 'description': 'Status',
- 'id': 'viewHardDisk',
- 'permissions': ('View',)},
- {'action': 'editEventManagerFields',
- 'allowed_classes': ['EventManagerBase'],
- 'description': 'Fields',
- 'id': 'editEventManagerFields',
- 'permissions': ('Manage DMD',)},
- {'action': 'userCommandDetail',
- 'allowed_classes': ['UserCommand'],
- 'description': 'User Command',
- 'id': 'userCommandDetail',
- 'permissions': ('View',)},
{'action': 'editProductClass',
'allowed_classes': ['ProductClass'],
'description': 'Edit',
'id': 'editProductClass',
'permissions': ('Manage DMD',)},
- {'action': 'viewZenPacks',
- 'allowed_classes': ['ZenossInfo'],
- 'description': 'ZenPacks',
- 'id': 'viewZenPacks',
- 'permissions': ('Manage DMD',)},
{'action': 'editMibModule',
'allowed_classes': ['MibModule'],
'description': 'Edit',
'id': 'editMibModule',
'permissions': ('View',)},
- {'action': 'deviceList',
- 'allowed_classes': ['DeviceClass'],
- 'description': 'Devices',
- 'id': 'deviceList',
- 'permissions': ('View',)},
- {'action': 'viewIpAddressOverview',
- 'allowed_classes': ['IpAddress'],
- 'description': 'Overview',
- 'id': 'viewIpAddressOverview',
- 'permissions': ('View',)},
- {'action': 'viewPerformanceConfOverview',
- 'allowed_classes': ['PerformanceConf'],
- 'description': 'Overview',
- 'id': 'viewPerformanceConfOverview',
- 'permissions': ('View',)},
- {'action': 'deviceSoftwareDetail',
- 'allowed_classes': ['Device'],
- 'description': 'Software',
- 'id': 'deviceSoftwareDetail',
- 'permissions': ('View',)},
{'action': 'editDeviceReport',
'allowed_classes': ['DeviceReport'],
'description': 'Edit',
@@ -641,6 +399,14 @@
'id': 'osProcessDetail',
'permissions': ('View',)}] ,
+ 'DeviceOrganizer_list':[
+ dict(
+ id= 'addToZenPack',
+ description='Add to ZenPack...',
+ action= 'dialog_addToZenPack',
+ permissions=('View',)
+ )
+ ],
'Device_list':[
dict(
id= 'moveclass',
@@ -671,13 +437,7 @@
description='Delete devices...',
action= 'dialog_removeDevices',
permissions=('Change Device',)
- ),
- dict(
- id= 'addToZenPack',
- description='Add to ZenPack...',
- action= 'dialog_addToZenPack',
- permissions=('View',)
- ),
+ )
],
})
Modified: trunk/Products/ZenModel/skins/zenmodel/deviceOrganizerManage.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/deviceOrganizerManage.pt 2007-03-21 17:49:17 UTC (rev 4331)
+++ trunk/Products/ZenModel/skins/zenmodel/deviceOrganizerManage.pt 2007-03-21 18:22:53 UTC (rev 4332)
@@ -8,7 +8,7 @@
<tal:block tal:define="
-tabletitle string:Device Management
+tabletitle string:Device Management;
">
<tal:block metal:use-macro="here/zenuimacros/macros/zentable">
Modified: trunk/Products/ZenModel/skins/zenmodel/deviceOrganizerStatus.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/deviceOrganizerStatus.pt 2007-03-21 17:49:17 UTC (rev 4331)
+++ trunk/Products/ZenModel/skins/zenmodel/deviceOrganizerStatus.pt 2007-03-21 18:22:53 UTC (rev 4332)
@@ -78,6 +78,7 @@
<tal:block tal:define="objects here/children;
tableName string:children;
tblcolspan string:5;
+ menu_id string:DeviceOrganizer_list;
batch python:here.ZenTableManager.getBatch(tableName,objects);
showfilterbox python:True;
tblcolspan string:5;
Modified: trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt 2007-03-21 17:49:17 UTC (rev 4331)
+++ trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt 2007-03-21 18:22:53 UTC (rev 4332)
@@ -3,7 +3,7 @@
<link href="css/menus.css" rel="stylesheet" type="text/css" />
<div class="menu" tal:define="
- menu_ids menu_ids | python:['Tabs','Actions'];
+ menu_ids menu_ids | python:['Edit','Actions'];
pathtrans here/REQUEST/PATH_TRANSLATED;
basepath python:test(
pathtrans.endswith(template.id),
|
|
From: <sv...@ze...> - 2007-03-21 17:49:17
|
Author: ecn
Date: 2007-03-21 13:49:17 -0400 (Wed, 21 Mar 2007)
New Revision: 4331
Modified:
trunk/Products/ZenModel/MaintenanceWindow.py
Log:
conceptually start & started are seconds (a date) but are stored as gmt seconds
Modified: trunk/Products/ZenModel/MaintenanceWindow.py
===================================================================
--- trunk/Products/ZenModel/MaintenanceWindow.py 2007-03-21 17:36:02 UTC (rev 4330)
+++ trunk/Products/ZenModel/MaintenanceWindow.py 2007-03-21 17:49:17 UTC (rev 4331)
@@ -81,8 +81,8 @@
skip = 1
_properties = (
- {'id':'start', 'type':'date', 'mode':'w'},
- {'id':'started', 'type':'date', 'mode':'w'},
+ {'id':'start', 'type':'int', 'mode':'w'},
+ {'id':'started', 'type':'int', 'mode':'w'},
{'id':'duration', 'type':'int', 'mode':'w'},
{'id':'repeat', 'type':'string', 'mode':'w'},
{'id':'skip', 'type':'int', 'mode':'w'},
|
|
From: <sv...@ze...> - 2007-03-21 17:36:22
|
Author: ecn
Date: 2007-03-21 13:36:02 -0400 (Wed, 21 Mar 2007)
New Revision: 4330
Modified:
trunk/Products/ZenUtils/Time.py
Log:
convert a DateTime to seconds
Modified: trunk/Products/ZenUtils/Time.py
===================================================================
--- trunk/Products/ZenUtils/Time.py 2007-03-21 15:59:52 UTC (rev 4329)
+++ trunk/Products/ZenUtils/Time.py 2007-03-21 17:36:02 UTC (rev 4330)
@@ -19,7 +19,7 @@
def _maybenow(gmtSecondsSince1970):
if gmtSecondsSince1970 is None:
return time.time()
- return gmtSecondsSince1970
+ return int(gmtSecondsSince1970)
def LocalDateTime(gmtSecondsSince1970 = None):
value = _maybenow(gmtSecondsSince1970)
|
|
From: <sv...@ze...> - 2007-03-21 15:59:56
|
Author: ian
Date: 2007-03-21 11:59:52 -0400 (Wed, 21 Mar 2007)
New Revision: 4329
Modified:
trunk/Products/ZenModel/migrate/menus.py
Log:
* Added conditional menu removal in case haven't built menu relations before
Modified: trunk/Products/ZenModel/migrate/menus.py
===================================================================
--- trunk/Products/ZenModel/migrate/menus.py 2007-03-21 14:57:32 UTC (rev 4328)
+++ trunk/Products/ZenModel/migrate/menus.py 2007-03-21 15:59:52 UTC (rev 4329)
@@ -51,9 +51,10 @@
# Get rid of all menus
- dmd.zenMenus.removeRelation()
- dmd.Devices.zenMenus.removeRelation()
- dmd.Networks.zenMenus.removeRelation()
+ hasmenus = lambda x: hasattr(x, 'zenMenus')
+ if hasmenus(dmd): dmd.zenMenus.removeRelation()
+ if hasmenus(dmd.Devices): dmd.Devices.zenMenus.removeRelation()
+ if hasmenus(dmd.Networks): dmd.Networks.zenMenus.removeRelation()
dmd.buildMenus(
{'Tabs':[
|
|
From: <sv...@ze...> - 2007-03-21 14:57:41
|
Author: ian
Date: 2007-03-21 10:57:32 -0400 (Wed, 21 Mar 2007)
New Revision: 4328
Modified:
trunk/Products/ZenModel/migrate/menus.py
trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt
Log:
* Duplicated tabs in menus. Next: organization of menus
Modified: trunk/Products/ZenModel/migrate/menus.py
===================================================================
--- trunk/Products/ZenModel/migrate/menus.py 2007-03-21 12:19:08 UTC (rev 4327)
+++ trunk/Products/ZenModel/migrate/menus.py 2007-03-21 14:57:32 UTC (rev 4328)
@@ -56,104 +56,590 @@
dmd.Networks.zenMenus.removeRelation()
dmd.buildMenus(
- {'Context':[
- dict(
- id= 'manageob',
- description='Manage',
- action= 'dataRootManage',
- permissions=('View',),
- isglobal= False
- ),
- dict(
- id= 'viewHistory',
- description='View Changes',
- action= 'viewHistory',
- permissions=('View',)
- )
- ]
- })
+ {'Tabs':[
+{'action': 'eventLog',
+ 'allowed_classes': ['BetterEventDetail'],
+ 'description': 'Log',
+ 'id': 'eventLog',
+ 'permissions': ('View',)},
+ {'action': 'editSettings',
+ 'allowed_classes': ['DataRoot'],
+ 'description': 'Settings',
+ 'id': 'editSettings',
+ 'permissions': ('Manage DMD',)},
+ {'action': 'viewNetworkOverview',
+ 'allowed_classes': ['IpNetwork'],
+ 'description': 'Overview',
+ 'id': 'viewNetworkOverview',
+ 'permissions': ('View',)},
+ {'action': 'zenossInfo',
+ 'allowed_classes': ['ZenossInfo'],
+ 'description': 'Status',
+ 'id': 'zenossInfo',
+ 'permissions': ('Manage DMD',)},
+ {'action': 'objRRDTemplate',
+ 'allowed_classes': ['Device',
+ 'FileSystem',
+ 'HardDisk',
+ 'IpInterface',
+ 'OSProcess'],
+ 'description': 'PerfConf',
+ 'id': 'objRRDTemplate',
+ 'permissions': ('Change Device',)},
+ {'action': 'editStatusMonitorConf',
+ 'allowed_classes': ['StatusMonitorConf'],
+ 'description': 'Edit',
+ 'id': 'editStatusMonitorConf',
+ 'permissions': ('Manage DMD',)},
+ {'action': 'viewHistory',
+ 'allowed_classes': ['Classifier',
+ 'CPU',
+ 'DataRoot',
+ 'DeviceOrganizer',
+ 'Device',
+ 'DeviceClass',
+ 'ExpansionCard',
+ 'FileSystem',
+ 'HardDisk',
+ 'IpInterface',
+ 'IpNetwork',
+ 'IpServiceClass',
+ 'IpService',
+ 'MaintenanceWindow',
+ 'Manufacturer',
+ 'ManufacturerRoot',
+ 'MibModule',
+ 'MibNode',
+ 'MibNotification',
+ 'MibOrganizer',
+ 'NagiosCmd',
+ 'NagiosTemplate',
+ 'OSProcessClass',
+ 'OSProcessOrganizer',
+ 'OSProcess',
+ 'PerformanceConf',
+ 'ProductClass',
+ 'ServiceClass',
+ 'ServiceOrganizer',
+ 'Software',
+ 'StatusMonitorConf',
+ 'System',
+ 'UserCommand',
+ 'WinService',
+ 'ActionRuleWindow',
+ 'EventClassPropertyMixin',
+ 'EventClass',
+ 'EventManagerBase'],
+ 'description': 'Changes',
+ 'id': 'viewHistory',
+ 'permissions': ('View',)},
+ {'action': 'actionRuleWindowDetail',
+ 'allowed_classes': ['ActionRuleWindow'],
+ 'description': 'Status',
+ 'id': 'actionRuleWindowDetail',
+ 'permissions': ('View',)},
+ {'action': 'deviceCustomEdit',
+ 'allowed_classes': ['Device'],
+ 'description': 'Custom',
+ 'id': 'deviceCustomEdit',
+ 'permissions': ('View',)},
+ {'action': 'viewCPU',
+ 'allowed_classes': ['CPU'],
+ 'description': 'Status',
+ 'id': 'viewCPU',
+ 'permissions': ('View',)},
+ {'action': 'editEventManagerHistoryFields',
+ 'allowed_classes': ['EventManagerBase'],
+ 'description': 'History Fields',
+ 'id': 'editEventManagerHistoryFields',
+ 'permissions': ('Manage DMD',)},
+ {'action': 'editRRDDataSource',
+ 'allowed_classes': ['RRDDataSourceError'],
+ 'description': 'Data Source',
+ 'id': 'editRRDDataSource',
+ 'permissions': ('View',)},
+ {'action': 'viewDevicePerformance',
+ 'allowed_classes': ['Device'],
+ 'description': 'Perf',
+ 'id': 'viewDevicePerformance',
+ 'permissions': ('View',)},
+ {'action': 'zenossVersions',
+ 'allowed_classes': ['ZenossInfo'],
+ 'description': 'Versions',
+ 'id': 'zenossVersions',
+ 'permissions': ('Manage DMD',)},
+ {'action': 'eventClassInstEdit',
+ 'allowed_classes': ['EventClassPropertyMixin'],
+ 'description': 'Edit',
+ 'id': 'eventClassInstEdit',
+ 'permissions': ('Manage DMD',)},
+ {'action': 'deviceHardwareDetail',
+ 'allowed_classes': ['Device'],
+ 'description': 'Hardware',
+ 'id': 'deviceHardwareDetail',
+ 'permissions': ('View',)},
+ {'action': 'editEventCommand',
+ 'allowed_classes': ['EventCommand'],
+ 'description': 'Edit',
+ 'id': 'editEventCommand',
+ 'permissions': ('Manage DMD',)},
+ {'action': 'viewDeviceReport',
+ 'allowed_classes': ['DeviceReport'],
+ 'description': 'Report',
+ 'id': 'viewDeviceReport',
+ 'permissions': ('View',)},
+ {'action': 'viewHistoryEvents',
+ 'allowed_classes': ['DeviceClass',
+ 'DeviceOrganizer',
+ 'Device',
+ 'System',
+ 'EventClassPropertyMixin',
+ 'EventClass'],
+ 'description': 'History',
+ 'id': 'viewHistoryEvents',
+ 'permissions': ('View',)},
+ {'action': 'ipServiceClassEdit',
+ 'allowed_classes': ['IpServiceClass'],
+ 'description': 'Edit',
+ 'id': 'ipServiceClassEdit',
+ 'permissions': ('Manage DMD',)},
+ {'action': 'eventClassStatus',
+ 'allowed_classes': ['EventClass'],
+ 'description': 'Classes',
+ 'id': 'eventClassStatus',
+ 'permissions': ('View',)},
+ {'action': 'deviceManagement',
+ 'allowed_classes': ['Device'],
+ 'description': 'Manage',
+ 'id': 'deviceManagement',
+ 'permissions': ('Change Device',)},
+ {'action': 'viewExpansionCard',
+ 'allowed_classes': ['ExpansionCard'],
+ 'description': 'Status',
+ 'id': 'viewExpansionCard',
+ 'permissions': ('View',)},
+ {'action': 'serviceOrganizerManage',
+ 'allowed_classes': ['ServiceOrganizer'],
+ 'description': 'Manage',
+ 'id': 'serviceOrganizerManage',
+ 'permissions': ('Manage DMD',)},
+ {'action': 'deviceStatus',
+ 'allowed_classes': ['Device'],
+ 'description': 'Status',
+ 'id': 'deviceStatus',
+ 'permissions': ('View',)},
+ {'action': 'osProcessOrganizerManage',
+ 'allowed_classes': ['OSProcessOrganizer'],
+ 'description': 'Manage',
+ 'id': 'osProcessOrganizerManage',
+ 'permissions': ('Manage DMD',)},
+ {'action': 'viewSystemPerformance',
+ 'allowed_classes': ['System'],
+ 'description': 'Performance',
+ 'id': 'viewSystemPerformance',
+ 'permissions': ('View',)},
+ {'action': 'viewSoftwareOverview',
+ 'allowed_classes': ['Software'],
+ 'description': 'Overview',
+ 'id': 'viewSoftwareOverview',
+ 'permissions': ('View',)},
+ {'action': 'zenossConfigs',
+ 'allowed_classes': ['ZenossInfo'],
+ 'description': 'Configuration',
+ 'id': 'zenossConfigs',
+ 'permissions': ('Manage DMD',)},
+ {'action': 'ipServiceClassStatus',
+ 'allowed_classes': ['IpServiceClass'],
+ 'description': 'Status',
+ 'id': 'ipServiceClassStatus',
+ 'permissions': ('View',)},
+ {'action': 'deviceOsDetail',
+ 'allowed_classes': ['Device'],
+ 'description': 'OS',
+ 'id': 'deviceOsDetail',
+ 'permissions': ('View',)},
+ {'action': 'eventClassInstStatus',
+ 'allowed_classes': ['EventClassPropertyMixin'],
+ 'description': 'Status',
+ 'id': 'eventClassInstStatus',
+ 'permissions': ('View',)},
+ {'action': 'ipServiceClassManage',
+ 'allowed_classes': ['IpServiceClass'],
+ 'description': 'Manage',
+ 'id': 'ipServiceClassManage',
+ 'permissions': ('Manage DMD',)},
+ {'action': 'viewMibNotification',
+ 'allowed_classes': ['MibNotification'],
+ 'description': 'Overview',
+ 'id': 'viewMibNotification',
+ 'permissions': ('View',)},
+ {'action': 'editManufacturer',
+ 'allowed_classes': ['Manufacturer'],
+ 'description': 'Edit',
+ 'id': 'editManufacturer',
+ 'permissions': ('Manage DMD',)},
+ {'action': 'editActionRuleMessage',
+ 'allowed_classes': ['ActionRule'],
+ 'description': 'Message',
+ 'id': 'editActionRuleMessage',
+ 'permissions': ('Change Settings',)},
+ {'action': 'addDevice',
+ 'allowed_classes': ['ZDeviceLoader'],
+ 'description': 'Status',
+ 'id': 'addDevice',
+ 'permissions': ('View',)},
+ {'action': 'maintenanceWindowDetail',
+ 'allowed_classes': ['MaintenanceWindow'],
+ 'description': 'Status',
+ 'id': 'maintenanceWindowDetail',
+ 'permissions': ('View',)},
+ {'action': 'mibOrganizerOverview',
+ 'allowed_classes': ['MibOrganizer'],
+ 'description': 'Overview',
+ 'id': 'mibOrganizerOverview',
+ 'permissions': ('View',)},
+ {'action': 'serviceClassStatus',
+ 'allowed_classes': ['ServiceClass'],
+ 'description': 'Status',
+ 'id': 'serviceClassStatus',
+ 'permissions': ('View',)},
+ {'action': 'viewFileSystem',
+ 'allowed_classes': ['FileSystem'],
+ 'description': 'Status',
+ 'id': 'viewFileSystem',
+ 'permissions': ('View',)},
+ {'action': 'editRRDDataPoint',
+ 'allowed_classes': ['RRDDataPointError'],
+ 'description': 'Data Point',
+ 'id': 'editRRDDataPoint',
+ 'permissions': ('View',)},
+ {'action': 'viewEvents',
+ 'allowed_classes': ['DeviceClass',
+ 'DeviceOrganizer',
+ 'Device',
+ 'System',
+ 'EventClassPropertyMixin',
+ 'EventClass'],
+ 'description': 'Events',
+ 'id': 'viewEvents',
+ 'permissions': ('View',)},
+ {'action': 'viewMibModule',
+ 'allowed_classes': ['MibModule'],
+ 'description': 'Overview',
+ 'id': 'viewMibModule',
+ 'permissions': ('View',)},
+ {'action': 'editEventManager',
+ 'allowed_classes': ['EventManagerBase'],
+ 'description': 'Edit',
+ 'id': 'editEventManager',
+ 'permissions': ('Manage DMD',)},
+ {'action': 'viewManufacturers',
+ 'allowed_classes': ['ManufacturerRoot'],
+ 'description': 'Overview',
+ 'id': 'viewManufacturers',
+ 'permissions': ('View',)},
+ {'action': 'osProcessManage',
+ 'allowed_classes': ['OSProcess'],
+ 'description': 'Manage',
+ 'id': 'osProcessManage',
+ 'permissions': ('Manage DMD',)},
+ {'action': 'editNagiosCmd',
+ 'allowed_classes': ['NagiosCmd'],
+ 'description': 'Nagios Command',
+ 'id': 'editNagiosCmd',
+ 'permissions': ('View',)},
+ {'action': 'serviceClassManage',
+ 'allowed_classes': ['ServiceClass'],
+ 'description': 'Manage',
+ 'id': 'serviceClassManage',
+ 'permissions': ('Manage DMD',)},
+ {'action': 'editPerformanceConf',
+ 'allowed_classes': ['PerformanceConf'],
+ 'description': 'Edit',
+ 'id': 'editPerformanceConf',
+ 'permissions': ('Manage DMD',)},
+ {'action': 'viewPackDetail',
+ 'allowed_classes': ['ZenPack'],
+ 'description': 'Detail',
+ 'id': 'viewPackDetail',
+ 'permissions': ('Manage DMD',)},
+ {'action': 'ipServiceManage',
+ 'allowed_classes': ['IpService'],
+ 'description': 'Manage',
+ 'id': 'ipServiceManage',
+ 'permissions': ('Manage DMD',)},
+ {'action': 'viewHardDisk',
+ 'allowed_classes': ['HardDisk'],
+ 'description': 'Status',
+ 'id': 'viewHardDisk',
+ 'permissions': ('View',)},
+ {'action': 'editEventManagerFields',
+ 'allowed_classes': ['EventManagerBase'],
+ 'description': 'Fields',
+ 'id': 'editEventManagerFields',
+ 'permissions': ('Manage DMD',)},
+ {'action': 'userCommandDetail',
+ 'allowed_classes': ['UserCommand'],
+ 'description': 'User Command',
+ 'id': 'userCommandDetail',
+ 'permissions': ('View',)},
+ {'action': 'editProductClass',
+ 'allowed_classes': ['ProductClass'],
+ 'description': 'Edit',
+ 'id': 'editProductClass',
+ 'permissions': ('Manage DMD',)},
+ {'action': 'viewZenPacks',
+ 'allowed_classes': ['ZenossInfo'],
+ 'description': 'ZenPacks',
+ 'id': 'viewZenPacks',
+ 'permissions': ('Manage DMD',)},
+ {'action': 'editMibModule',
+ 'allowed_classes': ['MibModule'],
+ 'description': 'Edit',
+ 'id': 'editMibModule',
+ 'permissions': ('View',)},
+ {'action': 'deviceList',
+ 'allowed_classes': ['DeviceClass'],
+ 'description': 'Devices',
+ 'id': 'deviceList',
+ 'permissions': ('View',)},
+ {'action': 'viewIpAddressOverview',
+ 'allowed_classes': ['IpAddress'],
+ 'description': 'Overview',
+ 'id': 'viewIpAddressOverview',
+ 'permissions': ('View',)},
+ {'action': 'viewPerformanceConfOverview',
+ 'allowed_classes': ['PerformanceConf'],
+ 'description': 'Overview',
+ 'id': 'viewPerformanceConfOverview',
+ 'permissions': ('View',)},
+ {'action': 'deviceSoftwareDetail',
+ 'allowed_classes': ['Device'],
+ 'description': 'Software',
+ 'id': 'deviceSoftwareDetail',
+ 'permissions': ('View',)},
+ {'action': 'editDeviceReport',
+ 'allowed_classes': ['DeviceReport'],
+ 'description': 'Edit',
+ 'id': 'editDeviceReport',
+ 'permissions': ('Manage DMD',)},
+ {'action': 'osProcessClassManage',
+ 'allowed_classes': ['OSProcessClass'],
+ 'description': 'Manage',
+ 'id': 'osProcessClassManage',
+ 'permissions': ('Manage DMD',)},
+ {'action': 'deviceOrganizerStatus',
+ 'allowed_classes': ['DeviceClass', 'DeviceOrganizer', 'System'],
+ 'description': 'Classes',
+ 'id': 'deviceOrganizerStatus',
+ 'permissions': ('View',)},
+ {'action': 'viewManufacturerOverview',
+ 'allowed_classes': ['Manufacturer'],
+ 'description': 'Overview',
+ 'id': 'viewManufacturerOverview',
+ 'permissions': ('View',)},
+ {'action': 'viewNagiosTemplate',
+ 'allowed_classes': ['NagiosTemplate'],
+ 'description': 'Nagios Config',
+ 'id': 'viewNagiosTemplate',
+ 'permissions': ('View',)},
+ {'action': 'viewStatusMonitorOverview',
+ 'allowed_classes': ['StatusMonitorConf'],
+ 'description': 'Overview',
+ 'id': 'viewStatusMonitorOverview',
+ 'permissions': ('View',)},
+ {'action': 'getEventView',
+ 'allowed_classes': ['CustomEventView'],
+ 'description': 'View',
+ 'id': 'getEventView',
+ 'permissions': ('View',)},
+ {'action': 'ipServiceDetail',
+ 'allowed_classes': ['IpService'],
+ 'description': 'Status',
+ 'id': 'ipServiceDetail',
+ 'permissions': ('View',)},
+ {'action': 'editRRDGraph',
+ 'allowed_classes': ['RRDGraph'],
+ 'description': 'Graph',
+ 'id': 'editRRDGraph',
+ 'permissions': ('View',)},
+ {'action': 'deviceOrganizerManage',
+ 'allowed_classes': ['DeviceOrganizer', 'DeviceClass', 'System'],
+ 'description': 'Manage',
+ 'id': 'deviceOrganizerManage',
+ 'permissions': ('Manage DMD',)},
+ {'action': 'editDevice',
+ 'allowed_classes': ['Device'],
+ 'description': 'Edit',
+ 'id': 'editDevice',
+ 'permissions': ('Change Device',)},
+ {'action': 'editRRDThreshold',
+ 'allowed_classes': ['RRDThreshold'],
+ 'description': 'RRD Threshold',
+ 'id': 'editRRDThreshold',
+ 'permissions': ('View',)},
+ {'action': 'osProcessClassStatus',
+ 'allowed_classes': ['OSProcessClass'],
+ 'description': 'Status',
+ 'id': 'osProcessClassStatus',
+ 'permissions': ('View',)},
+ {'action': 'winServiceManage',
+ 'allowed_classes': ['WinService'],
+ 'description': 'Manage',
+ 'id': 'winServiceManage',
+ 'permissions': ('Manage DMD',)},
+ {'action': 'dataRootManage',
+ 'allowed_classes': ['DataRoot'],
+ 'description': 'Manage',
+ 'id': 'dataRootManage',
+ 'permissions': ('Manage DMD',)},
+ {'action': 'viewMibNode',
+ 'allowed_classes': ['MibNode'],
+ 'description': 'Overview',
+ 'id': 'viewMibNode',
+ 'permissions': ('View',)},
+ {'action': 'eventClassInstSequence',
+ 'allowed_classes': ['EventClassPropertyMixin'],
+ 'description': 'Sequence',
+ 'id': 'eventClassInstSequence',
+ 'permissions': ('View',)},
+ {'action': 'listEventCommands',
+ 'allowed_classes': ['EventManagerBase'],
+ 'description': 'Commands',
+ 'id': 'listEventCommands',
+ 'permissions': ('Manage DMD',)},
+ {'action': 'viewEventLog',
+ 'allowed_classes': ['EventDetail'],
+ 'description': 'Log',
+ 'id': 'viewEventLog',
+ 'permissions': ('View',)},
+ {'action': 'viewEventDetail',
+ 'allowed_classes': ['EventDetail'],
+ 'description': 'Details',
+ 'id': 'viewEventDetail',
+ 'permissions': ('View',)},
+ {'action': 'manageClassifiers',
+ 'allowed_classes': ['Classifier'],
+ 'description': 'Overview',
+ 'id': 'manageClassifiers',
+ 'permissions': ('View',)},
+ {'action': 'viewIpInterface',
+ 'allowed_classes': ['IpInterface'],
+ 'description': 'Status',
+ 'id': 'viewIpInterface',
+ 'permissions': ('View',)},
+ {'action': 'viewEventFields',
+ 'allowed_classes': ['EventDetail'],
+ 'description': 'Fields',
+ 'id': 'viewEventFields',
+ 'permissions': ('View',)},
+ {'action': 'editActionRuleSchedule',
+ 'allowed_classes': ['ActionRule'],
+ 'description': 'Schedule',
+ 'id': 'editActionRuleSchedule',
+ 'permissions': ('Change Settings',)},
+ {'action': 'osProcessOrganizerOverview',
+ 'allowed_classes': ['OSProcessOrganizer'],
+ 'description': 'Classes',
+ 'id': 'osProcessOrganizerOverview',
+ 'permissions': ('View',)},
+ {'action': 'serviceOrganizerOverview',
+ 'allowed_classes': ['ServiceOrganizer'],
+ 'description': 'Classes',
+ 'id': 'serviceOrganizerOverview',
+ 'permissions': ('View',)},
+ {'action': 'eventMappingList',
+ 'allowed_classes': ['EventClass'],
+ 'description': 'Mappings',
+ 'id': 'eventMappingList',
+ 'permissions': ('View',)},
+ {'action': 'eventFields',
+ 'allowed_classes': ['BetterEventDetail'],
+ 'description': 'Fields',
+ 'id': 'eventFields',
+ 'permissions': ('View',)},
+ {'action': 'osProcessClassEdit',
+ 'allowed_classes': ['OSProcessClass'],
+ 'description': 'Edit',
+ 'id': 'osProcessClassEdit',
+ 'permissions': ('Manage DMD',)},
+ {'action': 'editActionRule',
+ 'allowed_classes': ['ActionRule'],
+ 'description': 'Edit',
+ 'id': 'editActionRule',
+ 'permissions': ('Change Settings',)},
+ {'action': 'monitorList',
+ 'allowed_classes': ['MonitorClass'],
+ 'description': 'View',
+ 'id': 'monitorList',
+ 'permissions': ('View',)},
+ {'action': 'viewProductClassOverview',
+ 'allowed_classes': ['ProductClass'],
+ 'description': 'Overview',
+ 'id': 'viewProductClassOverview',
+ 'permissions': ('View',)},
+ {'action': 'eventDetail',
+ 'allowed_classes': ['BetterEventDetail'],
+ 'description': 'Details',
+ 'id': 'eventDetail',
+ 'permissions': ('View',)},
+ {'action': 'perfConfig',
+ 'allowed_classes': ['DeviceClass'],
+ 'description': 'Perf Config',
+ 'id': 'perfConfig',
+ 'permissions': ('Change Device',)},
+ {'action': 'zPropertyEdit',
+ 'allowed_classes': ['Device',
+ 'DeviceClass',
+ 'IpNetwork',
+ 'IpServiceClass',
+ 'Manufacturer',
+ 'OSProcessClass',
+ 'OSProcessOrganizer',
+ 'ProductClass',
+ 'ServiceClass',
+ 'ServiceOrganizer',
+ 'EventClassPropertyMixin',
+ 'EventClass'],
+ 'description': 'zProperties',
+ 'id': 'zPropertyEdit',
+ 'permissions': ('View',)},
+ {'action': 'serviceClassEdit',
+ 'allowed_classes': ['ServiceClass'],
+ 'description': 'Edit',
+ 'id': 'serviceClassEdit',
+ 'permissions': ('Manage DMD',)},
+ {'action': 'editEventView',
+ 'allowed_classes': ['CustomEventView'],
+ 'description': 'Edit',
+ 'id': 'editEventView',
+ 'permissions': ('Change Settings',)},
+ {'action': 'viewRRDTemplate',
+ 'allowed_classes': ['ConfigurationError'],
+ 'description': 'Performance Template',
+ 'id': 'viewRRDTemplate',
+ 'permissions': ('View',)},
+ {'action': 'viewReportClass',
+ 'allowed_classes': ['ReportClass'],
+ 'description': 'View',
+ 'id': 'viewReportClass',
+ 'permissions': ('View',)},
+ {'action': 'winServiceDetail',
+ 'allowed_classes': ['WinService'],
+ 'description': 'Status',
+ 'id': 'winServiceDetail',
+ 'permissions': ('View',)},
+ {'action': 'manageUserFolder',
+ 'allowed_classes': ['UserSettingsManager'],
+ 'description': 'Overview',
+ 'id': 'manageUserFolder',
+ 'permissions': ('View',)},
+ {'action': 'osProcessDetail',
+ 'allowed_classes': ['OSProcess'],
+ 'description': 'Status',
+ 'id': 'osProcessDetail',
+ 'permissions': ('View',)}] ,
- dmd.Devices.buildMenus(
- {'Context':[
- dict(
- id= 'manageob',
- description='Manage',
- action= 'deviceOrganizerManage',
- permissions=('View',),
- allowed_classes=('DeviceClass',)
- ),
- dict(
- id= 'managedev',
- description='Manage',
- action= 'deviceManagement',
- permissions=('View',),
- allowed_classes=('Device',)
- ),
- dict(
- id= 'editCustSchema',
- description='Custom Schema',
- action= 'editCustSchema',
- permissions=('Change Device',)
- ),
- dict(
- id= 'perfConfig',
- description='perfConf',
- action= 'perfConfig',
- permissions=('Change Device',),
- allowed_classes=('DeviceClass',)
- ),
- dict(
- id= 'perfConfigDevice',
- description='perfConf',
- action= 'objRRDTemplate',
- permissions=('Change Device',),
- allowed_classes=('Device',)
- ),
- dict(
- id= 'zproperties',
- description='zProperties',
- action= 'zPropertyEdit',
- permissions=('Change Device',)
- ),
- dict(
- id= 'unlock',
- description='Unlock',
- action= 'unlock',
- permissions=('Change Device',),
- allowed_classes=('Device','DeviceComponent')
- ),
- dict(
- id= 'lockFromDeletion',
- description='Lock from deletion',
- action= 'lockFromDeletion',
- permissions=('Change Device',),
- allowed_classes=('Device','DeviceComponent')
- ),
- dict(
- id= 'lockFromUpdate',
- description='Lock from update/deletion',
- action= 'lockFromUpdate',
- permissions=('Change Device',),
- allowed_classes=('Device','DeviceComponent')
- ),
- dict(
- id= 'setSendEventWhenBlockedFlag',
- description='Send event when blocked',
- action= 'setSendEventWhenBlockedFlag',
- permissions=('Change Device',),
- allowed_classes=('Device','DeviceComponent')
- ),
- dict(
- id= 'unsetSendEventWhenBlockedFlag',
- description='Do not send event when blocked',
- action= 'unsetSendEventWhenBlockedFlag',
- permissions=('Change Device',),
- allowed_classes=('Device','DeviceComponent')
- ),
- ],
- 'Device_org_list':[
-
- ],
'Device_list':[
dict(
id= 'moveclass',
@@ -196,7 +682,7 @@
dmd.Networks.buildMenus(
- {'Context':[
+ {'Actions':[
dict(
id= 'discover',
description= 'Discover Devices',
Modified: trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt 2007-03-21 12:19:08 UTC (rev 4327)
+++ trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt 2007-03-21 14:57:32 UTC (rev 4328)
@@ -3,7 +3,7 @@
<link href="css/menus.css" rel="stylesheet" type="text/css" />
<div class="menu" tal:define="
- menu_ids menu_ids | python:['Context'];
+ menu_ids menu_ids | python:['Tabs','Actions'];
pathtrans here/REQUEST/PATH_TRANSLATED;
basepath python:test(
pathtrans.endswith(template.id),
@@ -18,7 +18,8 @@
<div class="menu_bottom"> </div>
<ul class="zenMenu">
-<li tal:repeat="menu menu_ids">
+<tal:block tal:repeat="menu menu_ids">
+<li tal:condition="python:here.getMenus(menu, here)">
<a href="javascript:void(0)">
<tal:block tal:content="menu">
Menu
@@ -35,6 +36,7 @@
</ul>
</div>
</li>
+</tal:block>
</ul>
</div>
</div>
|
|
From: <sv...@ze...> - 2007-03-21 12:19:08
|
Author: ian
Date: 2007-03-21 08:19:08 -0400 (Wed, 21 Mar 2007)
New Revision: 4327
Added:
trunk/Products/ZenWidgets/skins/zenui/img/expandable_menu_arrow.gif
trunk/Products/ZenWidgets/skins/zenui/img/menu_top_rounded.gif
Modified:
trunk/Products/ZenModel/skins/zenmodel/templates.pt
trunk/Products/ZenWidgets/skins/zenui/css/menus.css
trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt
Log:
* Added CSS and ZPT support for submenus.
* Made the context menu display first a list of menus, then their items in a submenu
Modified: trunk/Products/ZenModel/skins/zenmodel/templates.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/templates.pt 2007-03-21 12:12:04 UTC (rev 4326)
+++ trunk/Products/ZenModel/skins/zenmodel/templates.pt 2007-03-21 12:19:08 UTC (rev 4327)
@@ -264,7 +264,7 @@
</div>
</td>
<td class="contextmenutab">
- <span metal:use-macro="here/zenuimacros/macros/contextmenu"/>
+ <span metal:use-macro="here/zenuimacros/macros/basemenu"/>
</td>
</tr>
</table>
Modified: trunk/Products/ZenWidgets/skins/zenui/css/menus.css
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/css/menus.css 2007-03-21 12:12:04 UTC (rev 4326)
+++ trunk/Products/ZenWidgets/skins/zenui/css/menus.css 2007-03-21 12:19:08 UTC (rev 4327)
@@ -70,6 +70,15 @@
z-index: 2000;
width: 174px;
}
+div.menu_top_rounded {
+ background: transparent url('img/menu_top_rounded.gif') top left no-repeat;
+ position: absolute;
+ top: 0px;
+ left: -2px;
+ height: 20px;
+ z-index: 2000;
+ width: 174px;
+}
.devmovemenuitems {
top: 0px;
@@ -102,7 +111,7 @@
}
ul.zenMenu li a:hover {
- background-color: #DEDEFF;
+ background-color: #DEDEFF !important;
color: black;
}
@@ -129,6 +138,77 @@
background: #E0E0E0 url('img/actions_button_depressed.gif') bottom left no-repeat;
}
+.menu * {
+ padding:0;
+ margin:0;
+ position: relative;
+ font-weight: normal;
+}
+.menu {
+ position: relative;
+ cursor:pointer;
+}
+#contextmenu_items {
+ position: absolute;
+ top: 24px;
+ padding-top: 10px;
+ padding-bottom: 10px;
+ border-top: 0px;
+ z-index:4005;
+}
+.menu ul {
+ padding:0;
+ margin:0;
+ list-style-type:none;
+ width:173px;
+ border-left: 1px solid #5A6F8F;
+ border-right: 1px solid #5A6F8F;
+ background-color: #666;
+ z-index: 4006;
+}
+
+ul.zenMenu > li > a {
+ background: transparent url(img/expandable_menu_arrow.gif) 150px no-repeat;
+}
+
+div.devmovemenuitems ul.zenMenu li a {
+ background: #666 url();
+}
+
+* html .menu li {margin-left:-16px; margin-lef\t:0;}
+.menu table {position:absolute; border-collapse:collapse; top:0; left:0;
+ font-size:1em;width:0;height:0;}
+/* style the link hover */
+* html .menu a:hover {color:#fff; background:#999;}
+
+.menu :hover > a {
+color:#fff;
+background-color:#999;
+}
+
+/* hide the sub levels and give them a positon absolute so that they take up no room */
+.menu ul div.submenu {
+visibility:hidden;
+position:absolute;
+top:-1px;
+left:100px;
+padding: 0px;
+padding-top: 10px;
+padding-bottom: 10px;
+}
+
+/* make the second level visible when hover on first level list OR link */
+.menu ul li:hover div.submenu,
+.menu ul a:hover div.submenu {
+visibility:visible;
+top: 10px;
+}
+
+.menu div.submenu div.menu_top_rounded,
+.menu div.submenu div.menu_bottom {
+ left: 0px;
+}
+
/* IE HACKS */
* html .contextmenubutton {
Added: trunk/Products/ZenWidgets/skins/zenui/img/expandable_menu_arrow.gif
Property changes on: trunk/Products/ZenWidgets/skins/zenui/img/expandable_menu_arrow.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/Products/ZenWidgets/skins/zenui/img/menu_top_rounded.gif
Property changes on: trunk/Products/ZenWidgets/skins/zenui/img/menu_top_rounded.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt 2007-03-21 12:12:04 UTC (rev 4326)
+++ trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt 2007-03-21 12:19:08 UTC (rev 4327)
@@ -1,3 +1,69 @@
+<tal:block metal:define-macro="basemenu"
+ tal:condition="python:hasattr(here, 'getMenus')">
+<link href="css/menus.css" rel="stylesheet" type="text/css" />
+
+<div class="menu" tal:define="
+ menu_ids menu_ids | python:['Context'];
+ pathtrans here/REQUEST/PATH_TRANSLATED;
+ basepath python:test(
+ pathtrans.endswith(template.id),
+ '/'.join(pathtrans.split('/')[:-1]),
+ pathtrans)">
+<div tal:attributes="id string:contextmenu_btn">
+ <a class="tabletitle"> </a>
+</div>
+
+<div style="position:absolute;" class="invisible" id="contextmenu_items">
+<div class="menu_top"> </div>
+<div class="menu_bottom"> </div>
+
+<ul class="zenMenu">
+<li tal:repeat="menu menu_ids">
+<a href="javascript:void(0)">
+<tal:block tal:content="menu">
+Menu
+</tal:block>
+</a>
+<div class="submenu">
+<div class="menu_top_rounded"> </div>
+<div class="menu_bottom"> </div>
+<ul>
+<li tal:repeat="item python:here.getMenus(menu, here)">
+<a tal:attributes="href string:${basepath}/${item/action}"
+ tal:content="item/description">description</a>
+</li>
+</ul>
+</div>
+</li>
+</ul>
+</div>
+</div>
+<script tal:content="string:
+ var cxmto;
+ var hidectxmenu = function() {
+ removeElementClass('contextmenu_btn','menuselected');
+ makeInvisible('contextmenu_items') }
+ connect('contextmenu_btn','onclick',function() {
+ clearTimeout(cxmto);
+ makeVisible('contextmenu_items');
+ addElementClass('contextmenu_btn','menuselected');});
+ connect('contextmenu_items', 'onmouseout',function() {
+ cxmto = setTimeout('hidectxmenu()', 500); });
+ connect('contextmenu_btn', 'onmouseout',function() {
+ cxmto = setTimeout('hidectxmenu()', 500); });
+ connect('contextmenu_items','onmouseover',function() {
+ clearTimeout(cxmto);
+ addElementClass('contextmenu_btn','menuselected');
+ makeVisible('contextmenu_items'); });
+ connect('contextmenu_items','onclick',function() {
+ makeInvisible('contextmenu_items');
+ });
+">
+</script>
+
+</tal:block>
+
+
<tal:block metal:define-macro="contextmenu"
tal:condition="python:hasattr(here, 'getMenus')"
tal:define="menu_id string:Context">
@@ -51,7 +117,6 @@
</tal:block>
-
<!-- TABLE HEADER MACRO -->
<tal:block metal:define-macro="tabletitle">
|
|
From: <sv...@ze...> - 2007-03-21 12:12:29
|
Author: ian
Date: 2007-03-21 08:12:04 -0400 (Wed, 21 Mar 2007)
New Revision: 4326
Modified:
trunk/Products/ZenModel/ZenMenuable.py
Log:
Added reference to new isdialog field to the docstring
Modified: trunk/Products/ZenModel/ZenMenuable.py
===================================================================
--- trunk/Products/ZenModel/ZenMenuable.py 2007-03-20 17:24:58 UTC (rev 4325)
+++ trunk/Products/ZenModel/ZenMenuable.py 2007-03-21 12:12:04 UTC (rev 4326)
@@ -40,6 +40,7 @@
action
permissions
isglobal
+ isdialog
banned_classes
allowed_classes
"""
|
|
From: <sv...@ze...> - 2007-03-20 17:28:43
|
Author: jstevens
Date: 2007-03-20 13:23:22 -0400 (Tue, 20 Mar 2007)
New Revision: 4324
Modified:
trunk/Products/ZenUtils/Utils.py
Log:
refs #1105
* strip leading/trailing space from the pager number in sendPage()
Modified: trunk/Products/ZenUtils/Utils.py
===================================================================
--- trunk/Products/ZenUtils/Utils.py 2007-03-20 13:49:39 UTC (rev 4323)
+++ trunk/Products/ZenUtils/Utils.py 2007-03-20 17:23:22 UTC (rev 4324)
@@ -452,7 +452,7 @@
'''
import Pager
try:
- rcpt = Pager.Recipient(recipient)
+ rcpt = Pager.Recipient((recipient or '').strip())
pmsg = Pager.Message(msg)
page = Pager.Pager((rcpt,), pmsg, snppHost, snppPort)
page.send()
|
|
From: <sv...@ze...> - 2007-03-20 17:28:41
|
Author: jstevens
Date: 2007-03-20 13:24:58 -0400 (Tue, 20 Mar 2007)
New Revision: 4325
Modified:
trunk/Products/ZenModel/UserSettings.py
Log:
fixes #1105
* strips leading/trailing space from pager number
* fixes typo in manage_pagerTest()
Modified: trunk/Products/ZenModel/UserSettings.py
===================================================================
--- trunk/Products/ZenModel/UserSettings.py 2007-03-20 17:23:22 UTC (rev 4324)
+++ trunk/Products/ZenModel/UserSettings.py 2007-03-20 17:24:58 UTC (rev 4325)
@@ -607,7 +607,7 @@
''' Send a test page
'''
destSettings = self.getUserSettings(self.getId())
- destPager = destSettings.pager
+ destPager = (destSettings.pager or '').strip()
msg = None
if destPager:
fqdn = socket.getfqdn()
@@ -617,7 +617,7 @@
result, errorMsg = Utils.sendPage(destPager, msg,
self.dmd.snppHost, self.dmd.snppPort)
if result:
- msg = 'Test page sent to %s' % settings.pager
+ msg = 'Test page sent to %s' % destPager
else:
msg = 'Test failed: %s' % errorMsg
else:
|
|
From: <sv...@ze...> - 2007-03-20 13:49:41
|
Author: ecn
Date: 2007-03-20 09:49:39 -0400 (Tue, 20 Mar 2007)
New Revision: 4323
Modified:
trunk/Products/ZenModel/RRDView.py
Log:
* remove useless code
* if a template is local, return when searching
Modified: trunk/Products/ZenModel/RRDView.py
===================================================================
--- trunk/Products/ZenModel/RRDView.py 2007-03-20 13:17:29 UTC (rev 4322)
+++ trunk/Products/ZenModel/RRDView.py 2007-03-20 13:49:39 UTC (rev 4323)
@@ -227,18 +227,15 @@
def getRRDTemplateByName(self, name):
"Return the template of the given name."
+ try:
+ return self._getOb(name)
+ except AttributeError:
+ pass
for obj in aq_chain(self):
try:
return obj.rrdTemplates._getOb(name)
except AttributeError:
pass
- if 0:
- # I think this is a bad idea
- from RRDTemplate import RRDTemplate
- templ = RRDTemplate(name)
- devs = self.getDmdRoot("Devices")
- devs.rrdTemplates._setObject(name, templ)
- return templ
return None
|
|
From: <sv...@ze...> - 2007-03-20 13:17:30
|
Author: ian
Date: 2007-03-20 09:17:29 -0400 (Tue, 20 Mar 2007)
New Revision: 4322
Modified:
trunk/Products/ZenModel/ZenMenu.py
Log:
* Coerced allowed_classes and banned_classes into lists to avoid dump 'n' load screwups
Modified: trunk/Products/ZenModel/ZenMenu.py
===================================================================
--- trunk/Products/ZenModel/ZenMenu.py 2007-03-20 13:05:59 UTC (rev 4321)
+++ trunk/Products/ZenModel/ZenMenu.py 2007-03-20 13:17:29 UTC (rev 4322)
@@ -51,8 +51,8 @@
mi.action = action
mi.permissions = permissions
mi.isglobal = isglobal
- mi.banned_classes=banned_classes
- mi.allowed_classes=allowed_classes
+ mi.banned_classes=list(banned_classes)
+ mi.allowed_classes=list(allowed_classes)
return mi
security.declareProtected('Change Device', 'manage_deleteZenMenuItem')
|
|
From: <sv...@ze...> - 2007-03-20 13:06:09
|
Author: ian
Date: 2007-03-20 09:05:59 -0400 (Tue, 20 Mar 2007)
New Revision: 4321
Modified:
trunk/Products/ZenModel/migrate/menus.py
Log:
* Remove all old menus before building new ones
Modified: trunk/Products/ZenModel/migrate/menus.py
===================================================================
--- trunk/Products/ZenModel/migrate/menus.py 2007-03-20 12:51:35 UTC (rev 4320)
+++ trunk/Products/ZenModel/migrate/menus.py 2007-03-20 13:05:59 UTC (rev 4321)
@@ -48,6 +48,13 @@
# pc.buildRelations()
# Add menus.
+
+# Get rid of all menus
+
+ dmd.zenMenus.removeRelation()
+ dmd.Devices.zenMenus.removeRelation()
+ dmd.Networks.zenMenus.removeRelation()
+
dmd.buildMenus(
{'Context':[
dict(
@@ -188,7 +195,6 @@
})
- dmd.Networks.manage_deleteZenMenu('Context')
dmd.Networks.buildMenus(
{'Context':[
dict(
|
