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-05-02 14:15:40
|
Author: chris Date: 2007-05-02 10:15:34 -0400 (Wed, 02 May 2007) New Revision: 5045 Removed: tags/zenoss-2.0/ Log: cleanup |
|
From: <sv...@ze...> - 2007-05-02 14:07:59
|
Author: ecn
Date: 2007-05-02 10:07:57 -0400 (Wed, 02 May 2007)
New Revision: 5044
Modified:
trunk/Products/ZenWin/zeneventlog.py
trunk/Products/ZenWin/zenwin.py
trunk/Products/ZenWin/zenwinmodeler.py
Log:
eliminate unicode values from WMI calls
Modified: trunk/Products/ZenWin/zeneventlog.py
===================================================================
--- trunk/Products/ZenWin/zeneventlog.py 2007-05-02 14:06:32 UTC (rev 5043)
+++ trunk/Products/ZenWin/zeneventlog.py 2007-05-02 14:07:57 UTC (rev 5044)
@@ -68,7 +68,7 @@
def getWatcher(self, name, user, passwd, minSeverity):
"""Setup WMI connection to monitored server.
"""
- c = wmiclient.WMI(name, user, passwd)
+ c = wmiclient.WMI(*map(str, (name, user, passwd) ))
c.connect()
wql = """SELECT * FROM __InstanceCreationEvent where """\
"""TargetInstance ISA 'Win32_NTLogEvent' """\
Modified: trunk/Products/ZenWin/zenwin.py
===================================================================
--- trunk/Products/ZenWin/zenwin.py 2007-05-02 14:06:32 UTC (rev 5043)
+++ trunk/Products/ZenWin/zenwin.py 2007-05-02 14:07:57 UTC (rev 5044)
@@ -87,11 +87,14 @@
self.sendEvent(self.mkevt(srec.name, name, msg, 0))
self.log.info("svc up %s, %s", srec.name, name)
+ def _wmi(self, srec):
+ return WMI(str(srec.name), str(srec.username), str(srec.password))
+
def scanDevice(self, srec):
if not srec.services:
return None
wql = "select Name from Win32_Service where State='Running'"
- w = WMI(srec.name, srec.username, srec.password)
+ w = self._wmi(srec)
w.connect()
svcs = [ svc.Name for svc in w.query(wql) ]
nextFd = os.open('/dev/null', os.O_RDONLY)
@@ -106,7 +109,7 @@
def getWatcher(self, srec):
wql = ("""SELECT * FROM __InstanceModificationEvent within 5 where """
"""TargetInstance ISA 'Win32_Service' """)
- w = WMI(srec.name, srec.username, srec.password)
+ w = self._wmi(srec)
w.connect()
return w.watcher(wql)
Modified: trunk/Products/ZenWin/zenwinmodeler.py
===================================================================
--- trunk/Products/ZenWin/zenwinmodeler.py 2007-05-02 14:06:32 UTC (rev 5043)
+++ trunk/Products/ZenWin/zenwinmodeler.py 2007-05-02 14:07:57 UTC (rev 5044)
@@ -85,7 +85,7 @@
data = []
attrs = ("acceptPause","acceptStop","name","caption",
"pathName","serviceType","startMode","startName")
- dev = wmiclient.WMI(name, user, passwd)
+ dev = wmiclient.WMI(*map(str, (name, user, passwd)))
dev.connect()
wql = "select %s from Win32_Service" % (",".join(attrs))
svcs = dev.query(wql)
|
|
From: <sv...@ze...> - 2007-05-02 14:06:40
|
Author: jstevens
Date: 2007-05-02 10:06:32 -0400 (Wed, 02 May 2007)
New Revision: 5043
Modified:
trunk/Products/ZenUtils/patches/pasmonkey.py
Log:
fixes #1045
* Login page now works even if there is no came_from in qs
* &submitted is appended to qs correctly, so certain links going through the login page won't break (esp. links from alert emails.)
Modified: trunk/Products/ZenUtils/patches/pasmonkey.py
===================================================================
--- trunk/Products/ZenUtils/patches/pasmonkey.py 2007-05-02 13:36:11 UTC (rev 5042)
+++ trunk/Products/ZenUtils/patches/pasmonkey.py 2007-05-02 14:06:32 UTC (rev 5043)
@@ -34,6 +34,8 @@
# monkey patches for the PAS login form
from Products.PluggableAuthService.plugins import CookieAuthHelper
+import urlparse
+import urllib
def manage_afterAdd(self, item, container):
"""We don't want CookieAuthHelper setting the login attribute, we we'll
@@ -63,12 +65,21 @@
pas_instance.updateCredentials(request, response, login, password)
came_from = request.form.get('came_from') or ''
- if 'submitted' not in came_from:
- came_from += '?submitted=%s' % submitted
+ submittedQs = 'submitted=%s' % submitted
+ if came_from:
+ parts = urlparse.urlsplit(came_from)
+ if 'submitted' not in [p.split('=')[0] for p in parts[3].split('&')]:
+ queryPart = '&'.join([parts[3], submittedQs])
+ parts = (parts[:3] + (queryPart,) + parts[4:])
+ came_from = urlparse.urlunsplit(parts)
+ else:
+ came_from = '/zport/dmd?%s' % submittedQs
if self.dmd.acceptedTerms:
url = came_from
else:
- url = "%s/zenoss_terms/?came_from=%s" % (self.absolute_url(), came_from)
+ url = "%s/zenoss_terms/?came_from=%s" % (
+ self.absolute_url(), urllib.quote(came_from))
+
return response.redirect(url)
CookieAuthHelper.CookieAuthHelper.login = login
|
|
From: <sv...@ze...> - 2007-05-02 13:36:10
|
Author: chris
Date: 2007-05-02 09:36:11 -0400 (Wed, 02 May 2007)
New Revision: 5042
Modified:
tags/zenoss-2.0/inst/rpm/zenoss.spec
Log:
* synchronized with tagname by zenpkg
Modified: tags/zenoss-2.0/inst/rpm/zenoss.spec
===================================================================
--- tags/zenoss-2.0/inst/rpm/zenoss.spec 2007-05-02 13:33:32 UTC (rev 5041)
+++ tags/zenoss-2.0/inst/rpm/zenoss.spec 2007-05-02 13:36:11 UTC (rev 5042)
@@ -27,7 +27,7 @@
# set to 1 if the version of the software to be built is the trunk
# if trunk is set to 0 the version will be extrapolated from the
# rpm information contained in the %{version} and %{release} vars
-%define trunk 1
+%define trunk 0
# the name of the ctl file for zenoss (in /etc/rc.d/rc#.d)
%define S_zenoss S99zenoss
@@ -41,8 +41,8 @@
# the RPM meta information
Name: zenoss
Summary: The Open Source Network Management System
-Version: 1.1.0
-Release: 0
+Version: 2.0
+Release: 0
License: GPL
Vendor: Zenoss, Inc.
Packager: Christopher Blunck <ch...@ze...>
|
|
From: <sv...@ze...> - 2007-05-02 13:33:32
|
Author: chris Date: 2007-05-02 09:33:32 -0400 (Wed, 02 May 2007) New Revision: 5041 Added: tags/zenoss-2.0/ Log: * auto-build of zenoss-2.0 by zenpkg Copied: tags/zenoss-2.0 (from rev 5040, trunk) |
|
From: <sv...@ze...> - 2007-05-02 13:30:40
|
Author: ecn
Date: 2007-05-02 09:30:42 -0400 (Wed, 02 May 2007)
New Revision: 5040
Modified:
trunk/inst/GNUmakefile
Log:
winexe is now part of wmi
Modified: trunk/inst/GNUmakefile
===================================================================
--- trunk/inst/GNUmakefile 2007-05-02 13:30:31 UTC (rev 5039)
+++ trunk/inst/GNUmakefile 2007-05-02 13:30:42 UTC (rev 5040)
@@ -83,7 +83,6 @@
TWILL= $(call ROOT, twill)
PYDOT= $(call ROOT, pydot)
SIMPLEJSON= $(call ROOT, simplejson)
-WINEXE= $(call ROOT, winexe)
TESTGEN= $(call ROOT, testgen)
PDISXPATH= $(call ROOT, PDIS-XPath)
ELEMENTTREE= $(call ROOT, elementtree)
@@ -105,7 +104,7 @@
endif
# normal configure ; make ; make install
-NORMALS=$(LIBPNG) $(LIBART) $(FREETYPE) $(LIBSMI) $(WINEXE)
+NORMALS=$(LIBPNG) $(LIBART) $(FREETYPE) $(LIBSMI)
#
@@ -155,12 +154,11 @@
yapps-install \
nagios-install \
libsmi-install \
- simplejson-install \
- winexe-install
+ simplejson-install
-# don't build winexe-install on a mac
+# don't build wmi-install on a mac
ifeq ($(DARWIN),1)
- products-install: $(filter-out winexe-install, $(EVERYTHING))
+ products-install: $(filter-out wmi-install, $(EVERYTHING))
else
products-install: $(EVERYTHING)
endif
@@ -264,13 +262,8 @@
rm -rf $(DESTDIR)$(ZENHOME)/share/rrdtool/examples
rm -rf $(DESTDIR)$(ZENHOME)/lib/perl
-winexe-install: build/$(WINEXE)/.unpacked
- @cd $(<D)/source ; $(CONFIGURE) --without-readline $(LOG)
- @cd $(<D)/source ; $(MAKE) BIN_PROGS=bin/winexe SBIN_PROGS= $(LOG)
- @cd $(<D)/source ; $(MAKE) BIN_PROGS=bin/winexe SBIN_PROGS= installbin $(LOG)
-
wmi-install: build/$(WMI)/.unpacked
- @cd $(<D) ; $(MAKE) install
+ @cd $(<D) ; $(MAKE) install $(LOG)
build/$(NAGIOS)/Makefile: build/$(NAGIOS)/.unpacked
@cd $(<D) ; export LIBS=-ldl ; $(CONFIGURE) $(LOG)
|
|
From: <sv...@ze...> - 2007-05-02 13:30:29
|
Author: chris Date: 2007-05-02 09:30:31 -0400 (Wed, 02 May 2007) New Revision: 5039 Removed: tags/zenoss-2.0/ Log: cleanup |
|
From: <sv...@ze...> - 2007-05-02 13:30:15
|
Author: chris Date: 2007-05-02 09:30:16 -0400 (Wed, 02 May 2007) New Revision: 5038 Added: tags/zenoss-2.0/ Log: * auto-build of zenoss-2.0 by zenpkg Copied: tags/zenoss-2.0 (from rev 5037, trunk) |
|
From: <sv...@ze...> - 2007-05-02 13:29:49
|
Author: chris Date: 2007-05-02 09:29:50 -0400 (Wed, 02 May 2007) New Revision: 5037 Removed: tags/zenoss-2.0/ Log: cleanup |
|
From: <sv...@ze...> - 2007-05-02 13:29:35
|
Author: ecn Date: 2007-05-02 09:29:35 -0400 (Wed, 02 May 2007) New Revision: 5036 Modified: trunk/inst/externallibs/wmi-20070502.tar.bz2 Log: makefile tweaks Modified: trunk/inst/externallibs/wmi-20070502.tar.bz2 =================================================================== (Binary files differ) |
|
From: <sv...@ze...> - 2007-05-02 13:17:41
|
Author: ecn
Date: 2007-05-02 09:17:39 -0400 (Wed, 02 May 2007)
New Revision: 5035
Modified:
trunk/Products/ZenModel/Device.py
trunk/Products/ZenModel/PerformanceConf.py
Log:
move snmpMonitorDevice check into getOSProcessConf
Modified: trunk/Products/ZenModel/Device.py
===================================================================
--- trunk/Products/ZenModel/Device.py 2007-05-02 13:09:33 UTC (rev 5034)
+++ trunk/Products/ZenModel/Device.py 2007-05-02 13:17:39 UTC (rev 5035)
@@ -451,9 +451,12 @@
def getOSProcessConf(self):
"""Return process monitoring configuration.
"""
+ if not self.snmpMonitorDevice():
+ return None
procs = [ o.getOSProcessConf() for o in self.os.processes() \
- if o.monitored() ]
- if not procs: return None
+ if o.monitored() ]
+ if not procs:
+ return None
return (float(self.getLastChange()), self.getSnmpConnInfo(), procs)
Modified: trunk/Products/ZenModel/PerformanceConf.py
===================================================================
--- trunk/Products/ZenModel/PerformanceConf.py 2007-05-02 13:09:33 UTC (rev 5034)
+++ trunk/Products/ZenModel/PerformanceConf.py 2007-05-02 13:17:39 UTC (rev 5035)
@@ -251,16 +251,16 @@
'''
result = []
for dev in self.devices():
- if devices and dev.id not in devices: continue
+ if devices and dev.id not in devices:
+ continue
dev = dev.primaryAq()
- if dev.snmpMonitorDevice():
- try:
- procinfo = dev.getOSProcessConf()
- if procinfo is None: continue
+ try:
+ procinfo = dev.getOSProcessConf()
+ if procinfo:
result.append(procinfo)
- except POSError: raise
- except:
- log.exception("device %s", dev.id)
+ except POSError: raise
+ except:
+ log.exception("device %s", dev.id)
return result
|
|
From: <sv...@ze...> - 2007-05-02 13:09:34
|
Author: chris
Date: 2007-05-02 09:09:33 -0400 (Wed, 02 May 2007)
New Revision: 5034
Modified:
tags/zenoss-2.0/inst/rpm/zenoss.spec
Log:
* synchronized with tagname by zenpkg
Modified: tags/zenoss-2.0/inst/rpm/zenoss.spec
===================================================================
--- tags/zenoss-2.0/inst/rpm/zenoss.spec 2007-05-02 13:08:02 UTC (rev 5033)
+++ tags/zenoss-2.0/inst/rpm/zenoss.spec 2007-05-02 13:09:33 UTC (rev 5034)
@@ -27,7 +27,7 @@
# set to 1 if the version of the software to be built is the trunk
# if trunk is set to 0 the version will be extrapolated from the
# rpm information contained in the %{version} and %{release} vars
-%define trunk 1
+%define trunk 0
# the name of the ctl file for zenoss (in /etc/rc.d/rc#.d)
%define S_zenoss S99zenoss
@@ -41,8 +41,8 @@
# the RPM meta information
Name: zenoss
Summary: The Open Source Network Management System
-Version: 1.1.0
-Release: 0
+Version: 2.0
+Release: 0
License: GPL
Vendor: Zenoss, Inc.
Packager: Christopher Blunck <ch...@ze...>
|
|
From: <sv...@ze...> - 2007-05-02 13:08:05
|
Author: marc
Date: 2007-05-02 09:08:02 -0400 (Wed, 02 May 2007)
New Revision: 5033
Modified:
trunk/Products/ZenModel/skins/zenmodel/viewNetworkOverview.pt
trunk/Products/ZenModel/skins/zenmodel/viewReportClass.pt
Log:
* Removed "editor" row
Modified: trunk/Products/ZenModel/skins/zenmodel/viewNetworkOverview.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/viewNetworkOverview.pt 2007-05-02 13:05:35 UTC (rev 5032)
+++ trunk/Products/ZenModel/skins/zenmodel/viewNetworkOverview.pt 2007-05-02 13:08:02 UTC (rev 5033)
@@ -139,11 +139,7 @@
</td>
</tr>
</tal:block>
- <tr tal:condition="here/isManager">
- <td class="tableheader" colspan="5">
- <span metal:use-macro="here/deviceOrganizerStatus/macros/editor" />
- </td>
- </tr>
+
<!-- END TABLE CONTENTS -->
</tal:block>
Modified: trunk/Products/ZenModel/skins/zenmodel/viewReportClass.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/viewReportClass.pt 2007-05-02 13:05:35 UTC (rev 5032)
+++ trunk/Products/ZenModel/skins/zenmodel/viewReportClass.pt 2007-05-02 13:08:02 UTC (rev 5033)
@@ -56,11 +56,6 @@
<span metal:use-macro="here/zenTableNavigation/macros/navbody"/>
</td>
</tr>
- <tr tal:condition="here/isManager">
- <td class="tableheader" colspan="3">
- <span metal:use-macro="here/deviceOrganizerStatus/macros/editor"/>
- </td>
- </tr>
<!-- END TABLE CONTENTS -->
|
|
From: <sv...@ze...> - 2007-05-02 13:05:36
|
Author: chris Date: 2007-05-02 09:05:35 -0400 (Wed, 02 May 2007) New Revision: 5032 Added: tags/zenoss-2.0/ Log: * auto-build of zenoss-2.0 by zenpkg Copied: tags/zenoss-2.0 (from rev 5031, trunk) |
|
From: <sv...@ze...> - 2007-05-02 13:03:50
|
Author: ecn Date: 2007-05-02 09:03:49 -0400 (Wed, 02 May 2007) New Revision: 5031 Added: trunk/inst/externallibs/wmi-20070502.tar.bz2 Removed: trunk/inst/externallibs/winexe-0.7.tar.bz2 trunk/inst/externallibs/wmi-20070425.tar.bz2 Log: winexe and segv patches Deleted: trunk/inst/externallibs/winexe-0.7.tar.bz2 Deleted: trunk/inst/externallibs/wmi-20070425.tar.bz2 Added: trunk/inst/externallibs/wmi-20070502.tar.bz2 Property changes on: trunk/inst/externallibs/wmi-20070502.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
|
From: <sv...@ze...> - 2007-05-02 13:00:28
|
Author: marc
Date: 2007-05-02 09:00:23 -0400 (Wed, 02 May 2007)
New Revision: 5030
Modified:
trunk/Products/ZenEvents/skins/zenevents/editActionRuleSchedule.pt
trunk/Products/ZenEvents/skins/zenevents/editActionRules.pt
trunk/Products/ZenEvents/skins/zenevents/editEventViews.pt
trunk/Products/ZenEvents/skins/zenevents/eventClassStatus.pt
trunk/Products/ZenEvents/skins/zenevents/listEventCommands.pt
trunk/Products/ZenModel/skins/zenmodel/administeredDevices.pt
trunk/Products/ZenModel/skins/zenmodel/deviceListMacro.pt
trunk/Products/ZenModel/skins/zenmodel/deviceManagement.pt
trunk/Products/ZenModel/skins/zenmodel/deviceOrganizerStatus.pt
trunk/Products/ZenModel/skins/zenmodel/editBasicDataSource.pt
trunk/Products/ZenModel/skins/zenmodel/editRRDDataSource.pt
trunk/Products/ZenModel/skins/zenmodel/maintenanceWindowsMacro.pt
trunk/Products/ZenModel/skins/zenmodel/mibOrganizerOverview.pt
trunk/Products/ZenModel/skins/zenmodel/osProcessOrganizerOverview.pt
trunk/Products/ZenModel/skins/zenmodel/serviceOrganizerOverview.pt
trunk/Products/ZenModel/skins/zenmodel/userCommandsMacros.pt
trunk/Products/ZenModel/skins/zenmodel/viewManufacturerOverview.pt
trunk/Products/ZenModel/skins/zenmodel/viewManufacturers.pt
trunk/Products/ZenModel/skins/zenmodel/viewPackDetail.pt
trunk/Products/ZenModel/skins/zenmodel/viewRRDTemplate.pt
Log:
* Removed Select Alls
Modified: trunk/Products/ZenEvents/skins/zenevents/editActionRuleSchedule.pt
===================================================================
--- trunk/Products/ZenEvents/skins/zenevents/editActionRuleSchedule.pt 2007-05-02 12:51:59 UTC (rev 5029)
+++ trunk/Products/ZenEvents/skins/zenevents/editActionRuleSchedule.pt 2007-05-02 13:00:23 UTC (rev 5030)
@@ -75,10 +75,6 @@
|
<input class="tableheader" type="submit"
name="manage_deleteActionRuleWindow:method" value=" Delete " />
- |
- <input class="tableheader" type="submit"
- name="SelectButton" value="Select All"
- onClick="toggleSelect(this.form);return false"/>
</td>
</tr>
Modified: trunk/Products/ZenEvents/skins/zenevents/editActionRules.pt
===================================================================
--- trunk/Products/ZenEvents/skins/zenevents/editActionRules.pt 2007-05-02 12:51:59 UTC (rev 5029)
+++ trunk/Products/ZenEvents/skins/zenevents/editActionRules.pt 2007-05-02 13:00:23 UTC (rev 5030)
@@ -64,10 +64,6 @@
|
<input class="tableheader" type="submit"
name="manage_deleteObjects:method" value=" Delete " />
- |
- <input class="tableheader" type="submit"
- name="SelectButton" value="Select All"
- onClick="toggleSelect(this.form);return false"/>
</td>
</tr>
Modified: trunk/Products/ZenEvents/skins/zenevents/editEventViews.pt
===================================================================
--- trunk/Products/ZenEvents/skins/zenevents/editEventViews.pt 2007-05-02 12:51:59 UTC (rev 5029)
+++ trunk/Products/ZenEvents/skins/zenevents/editEventViews.pt 2007-05-02 13:00:23 UTC (rev 5030)
@@ -74,10 +74,6 @@
|
<input class="tableheader" type="submit"
name="manage_deleteObjects:method" value=" Delete " />
- |
- <input class="tableheader" type="submit"
- name="SelectButton" value="Select All"
- onClick="toggleSelect(this.form);return false"/>
</td>
</tr>
Modified: trunk/Products/ZenEvents/skins/zenevents/eventClassStatus.pt
===================================================================
--- trunk/Products/ZenEvents/skins/zenevents/eventClassStatus.pt 2007-05-02 12:51:59 UTC (rev 5029)
+++ trunk/Products/ZenEvents/skins/zenevents/eventClassStatus.pt 2007-05-02 13:00:23 UTC (rev 5030)
@@ -86,15 +86,6 @@
</td>
</tr>
</tal:block>
- <tr tal:condition="here/isManager">
- <td class="tableheader" colspan="6">
- <span metal:define-macro="editor" tal:omit-tag="">
- <input class="tableheader" type="submit"
- name="SelectButton" value="Select All"
- onClick="toggleSelect(this.form);return false"/>
- </span>
- </td>
- </tr>
<!-- END TABLE CONTENTS -->
@@ -165,14 +156,8 @@
</td>
</tr>
</tal:block>
- <tr tal:condition="here/isManager">
- <td class="tableheader" colspan="4">
- <input class="tableheader" type="submit"
- name="SelectButton" value="Select All"
- onClick="toggleSelect(this.form);return false"/>
- </td>
- </tr>
+
<!-- END TABLE CONTENTS -->
</tal:block>
Modified: trunk/Products/ZenEvents/skins/zenevents/listEventCommands.pt
===================================================================
--- trunk/Products/ZenEvents/skins/zenevents/listEventCommands.pt 2007-05-02 12:51:59 UTC (rev 5029)
+++ trunk/Products/ZenEvents/skins/zenevents/listEventCommands.pt 2007-05-02 13:00:23 UTC (rev 5030)
@@ -69,10 +69,6 @@
name="manage_addCommand:method" />
<input class="tableheader" type="submit"
name="manage_deleteCommands:method" value="Delete" />
- |
- <input class="tableheader" type="submit"
- name="SelectButton" value="Select All"
- onClick="toggleSelect(this.form);return false"/>
</td>
</tr>
Modified: trunk/Products/ZenModel/skins/zenmodel/administeredDevices.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/administeredDevices.pt 2007-05-02 12:51:59 UTC (rev 5029)
+++ trunk/Products/ZenModel/skins/zenmodel/administeredDevices.pt 2007-05-02 13:00:23 UTC (rev 5030)
@@ -101,10 +101,6 @@
|
<input class="tableheader" type="submit"
name="manage_deleteAdministrativeRole:method" value=" Delete " />
- |
- <input class="tableheader" type="submit"
- name="SelectButton" value="Select All"
- onClick="toggleSelect(this.form);return false"/>
</td>
</tr>
Modified: trunk/Products/ZenModel/skins/zenmodel/deviceListMacro.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/deviceListMacro.pt 2007-05-02 12:51:59 UTC (rev 5029)
+++ trunk/Products/ZenModel/skins/zenmodel/deviceListMacro.pt 2007-05-02 13:00:23 UTC (rev 5030)
@@ -22,10 +22,6 @@
name="removeDevices:method" value="Delete"
tal:attributes="onclick string:return SetFormAction(event, '${here/absolute_url_path}');"
/>
- |
- <input class="tableheader" type="submit"
- name="SelectButton" value="Select All"
- onClick="toggleSelect(this.form);return false"/>
</td>-->
</tr>
Modified: trunk/Products/ZenModel/skins/zenmodel/deviceManagement.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/deviceManagement.pt 2007-05-02 12:51:59 UTC (rev 5029)
+++ trunk/Products/ZenModel/skins/zenmodel/deviceManagement.pt 2007-05-02 13:00:23 UTC (rev 5030)
@@ -100,10 +100,6 @@
|
<input class="tableheader" type="submit"
name="manage_deleteAdministrativeRole:method" value=" Delete " />
- |
- <input class="tableheader" type="submit"
- name="SelectButton" value="Select All"
- onClick="toggleSelect(this.form);return false"/>
</td>
</tr>
Modified: trunk/Products/ZenModel/skins/zenmodel/deviceOrganizerStatus.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/deviceOrganizerStatus.pt 2007-05-02 12:51:59 UTC (rev 5029)
+++ trunk/Products/ZenModel/skins/zenmodel/deviceOrganizerStatus.pt 2007-05-02 13:00:23 UTC (rev 5030)
@@ -142,16 +142,6 @@
</td>
</tr>
</tal:block>
- <tr tal:condition="here/isManager">
- <td class="tableheader" colspan="6">
- <span metal:define-macro="editor" tal:omit-tag="">
- <input class="tableheader" type="submit"
- name="SelectButton" value="Select All"
- onClick="toggleSelect(this.form);return false"/>
- </span>
- </td>
-
- </tr>
</tal:block>
</tal:block>
</tal:block>
Modified: trunk/Products/ZenModel/skins/zenmodel/editBasicDataSource.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/editBasicDataSource.pt 2007-05-02 12:51:59 UTC (rev 5029)
+++ trunk/Products/ZenModel/skins/zenmodel/editBasicDataSource.pt 2007-05-02 13:00:23 UTC (rev 5030)
@@ -272,13 +272,6 @@
<span metal:use-macro="here/zenTableNavigation/macros/navbody"/>
</td>
</tr>
- <tr class="tableheader" tal:condition="editable">
- <td colspan="4">
- <input class="tableheader" type="submit"
- name="SelectButton" value="Select All"
- onClick="toggleSelect(this.form);return false"/>
- </td>
- </tr>
<input type='hidden' name='tableName' tal:attributes="value tableName" />
<!-- END TABLE CONTENTS -->
Modified: trunk/Products/ZenModel/skins/zenmodel/editRRDDataSource.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/editRRDDataSource.pt 2007-05-02 12:51:59 UTC (rev 5029)
+++ trunk/Products/ZenModel/skins/zenmodel/editRRDDataSource.pt 2007-05-02 13:00:23 UTC (rev 5030)
@@ -194,10 +194,6 @@
|
<input class="tableheader" type="submit"
name="manage_deleteRRDDataPoints:method" value=" Delete " />
- |
- <input class="tableheader" type="submit"
- name="SelectButton" value="Select All"
- onClick="toggleSelect(this.form);return false"/>
</td>
</tr>
<input type='hidden' name='tableName' tal:attributes="value tableName" />
Modified: trunk/Products/ZenModel/skins/zenmodel/maintenanceWindowsMacro.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/maintenanceWindowsMacro.pt 2007-05-02 12:51:59 UTC (rev 5029)
+++ trunk/Products/ZenModel/skins/zenmodel/maintenanceWindowsMacro.pt 2007-05-02 13:00:23 UTC (rev 5030)
@@ -86,10 +86,6 @@
|
<input class="tableheader" type="submit"
name="manage_deleteMaintenanceWindow:method" value=" Delete " />
- |
- <input class="tableheader" type="submit"
- name="SelectButton" value="Select All"
- onClick="toggleSelect(this.form);return false"/>
</td>
</tr>
<!-- END TABLE CONTENTS -->
Modified: trunk/Products/ZenModel/skins/zenmodel/mibOrganizerOverview.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/mibOrganizerOverview.pt 2007-05-02 12:51:59 UTC (rev 5029)
+++ trunk/Products/ZenModel/skins/zenmodel/mibOrganizerOverview.pt 2007-05-02 13:00:23 UTC (rev 5030)
@@ -57,15 +57,6 @@
</td>
</tr>
</span>
- <tr tal:condition="here/isManager">
- <td class="tableheader" colspan="6">
- <span metal:define-macro="editor" tal:omit-tag="">
- <input class="tableheader" type="submit"
- name="SelectButton" value="Select All"
- onClick="toggleSelect(this.form);return false"/>
- </span>
- </td>
- </tr>
<!-- END TABLE CONTENTS -->
@@ -130,13 +121,6 @@
</td>
</tr>
</span>
- <tr tal:condition="here/isManager">
- <td class="tableheader" colspan="5">
- <input class="tableheader" type="submit"
- name="SelectButton" value="Select All"
- onClick="toggleSelect(this.form);return false"/>
- </td>
- </tr>
<!-- END TABLE CONTENTS -->
Modified: trunk/Products/ZenModel/skins/zenmodel/osProcessOrganizerOverview.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/osProcessOrganizerOverview.pt 2007-05-02 12:51:59 UTC (rev 5029)
+++ trunk/Products/ZenModel/skins/zenmodel/osProcessOrganizerOverview.pt 2007-05-02 13:00:23 UTC (rev 5030)
@@ -44,15 +44,7 @@
</td>
</tr>
</span>
- <tr tal:condition="here/isManager">
- <td class="tableheader" colspan="6">
- <span metal:define-macro="editor" tal:omit-tag="">
- <input class="tableheader" type="submit"
- name="SelectButton" value="Select All"
- onClick="toggleSelect(this.form);return false"/>
- </span>
- </td>
- </tr>
+
<!-- END TABLE CONTENTS -->
</tal:block>
@@ -106,13 +98,7 @@
</td>
</tr>
</span>
- <tr tal:condition="here/isManager">
- <td class="tableheader" colspan="5">
- <input class="tableheader" type="submit"
- name="SelectButton" value="Select All"
- onClick="toggleSelect(this.form);return false"/>
- </td>
- </tr>
+
<!-- END TABLE CONTENTS -->
</tal:block>
Modified: trunk/Products/ZenModel/skins/zenmodel/serviceOrganizerOverview.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/serviceOrganizerOverview.pt 2007-05-02 12:51:59 UTC (rev 5029)
+++ trunk/Products/ZenModel/skins/zenmodel/serviceOrganizerOverview.pt 2007-05-02 13:00:23 UTC (rev 5030)
@@ -46,16 +46,8 @@
</td>
</tr>
</span>
- <tr tal:condition="here/isManager">
- <td class="tableheader" colspan="6">
- <span metal:define-macro="editor" tal:omit-tag="">
- <input class="tableheader" type="submit"
- name="SelectButton" value="Select All"
- onClick="toggleSelect(this.form);return false"/>
- </span>
- </td>
- </tr>
+
<!-- END TABLE CONTENTS -->
</tal:block>
@@ -118,14 +110,8 @@
</td>
</tr>
</span>
- <tr tal:condition="here/isManager">
- <td class="tableheader" colspan="5">
- <input class="tableheader" type="submit"
- name="SelectButton" value="Select All"
- onClick="toggleSelect(this.form);return false"/>
- </td>
- </tr>
+
<!-- END TABLE CONTENTS -->
</tal:block>
Modified: trunk/Products/ZenModel/skins/zenmodel/userCommandsMacros.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/userCommandsMacros.pt 2007-05-02 12:51:59 UTC (rev 5029)
+++ trunk/Products/ZenModel/skins/zenmodel/userCommandsMacros.pt 2007-05-02 13:00:23 UTC (rev 5030)
@@ -71,10 +71,6 @@
|
<input class="tableheader" type="submit"
name="manage_deleteUserCommand:method" value=" Delete " />
- |
- <input class="tableheader" type="submit"
- name="SelectButton" value="Select All"
- onClick="toggleSelect(this.form);return false"/>
</td>
</tr>
<!-- END TABLE CONTENTS -->
Modified: trunk/Products/ZenModel/skins/zenmodel/viewManufacturerOverview.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/viewManufacturerOverview.pt 2007-05-02 12:51:59 UTC (rev 5029)
+++ trunk/Products/ZenModel/skins/zenmodel/viewManufacturerOverview.pt 2007-05-02 13:00:23 UTC (rev 5030)
@@ -111,10 +111,6 @@
<form metal:use-macro="here/zenTableNavigation/macros/navtool"></form>
</td>
</tr>
- <tr tal:condition="here/isManager">
- <td class="tableheader" colspan="4">
- </td>
- </tr>
<!-- END TABLE CONTENTS -->
Modified: trunk/Products/ZenModel/skins/zenmodel/viewManufacturers.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/viewManufacturers.pt 2007-05-02 12:51:59 UTC (rev 5029)
+++ trunk/Products/ZenModel/skins/zenmodel/viewManufacturers.pt 2007-05-02 13:00:23 UTC (rev 5030)
@@ -59,13 +59,7 @@
<span metal:use-macro="here/zenTableNavigation/macros/navbody"/>
</td>
</tr>
- <tr tal:condition="here/isManager">
- <td class="tableheader" colspan="4">
- <input class="tableheader" type="submit"
- name="SelectButton" value="Select All"
- onClick="toggleSelect(this.form);return false"/>
- </td>
- </tr>
+
<!-- END TABLE CONTENTS -->
</tal:block>
Modified: trunk/Products/ZenModel/skins/zenmodel/viewPackDetail.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/viewPackDetail.pt 2007-05-02 12:51:59 UTC (rev 5029)
+++ trunk/Products/ZenModel/skins/zenmodel/viewPackDetail.pt 2007-05-02 13:00:23 UTC (rev 5030)
@@ -40,10 +40,6 @@
<input class="tableheader" type="submit"
name="manage_deletePackable:method" value=" Delete " />
|
- <input class="tableheader" type="submit"
- name="SelectButton" value="Select All"
- onClick="toggleSelect(this.form);return false"/>
- |
<input class="tableheader" type="submit"
name="manage_exportPack:method" value=" Export " />
</tr>
Modified: trunk/Products/ZenModel/skins/zenmodel/viewRRDTemplate.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/viewRRDTemplate.pt 2007-05-02 12:51:59 UTC (rev 5029)
+++ trunk/Products/ZenModel/skins/zenmodel/viewRRDTemplate.pt 2007-05-02 13:00:23 UTC (rev 5030)
@@ -115,13 +115,6 @@
<span metal:use-macro="here/zenTableNavigation/macros/navbody"/>
</td>
</tr>
- <tr class="tableheader" tal:condition="editable">
- <td colspan="5">
- <input class="tableheader" type="submit"
- name="SelectButton" value="Select All"
- onClick="toggleSelect(this.form);return false"/>
- </td>
- </tr>
</tal:block>
<!-- END TABLE CONTENTS -->
@@ -191,13 +184,6 @@
<span metal:use-macro="here/zenTableNavigation/macros/navbody"/>
</td>
</tr>
- <tr class="tableheader" tal:condition="editable">
- <td colspan="5">
- <input class="tableheader" type="submit"
- name="SelectButton" value="Select All"
- onClick="toggleSelect(this.form);return false"/>
- </td>
- </tr>
</tal:block>
<!-- END TABLE CONTENTS -->
@@ -283,13 +269,6 @@
<span metal:use-macro="here/zenTableNavigation/macros/navbody"/>
</td>
</tr>
- <tr class="tableheader" tal:condition="editable">
- <td colspan="6">
- <input class="tableheader" type="submit"
- name="SelectButton" value="Select All"
- onClick="toggleSelect(this.form);return false"/>
- </td>
- </tr>
</tal:block>
<!-- END TABLE CONTENTS -->
|
|
From: <sv...@ze...> - 2007-05-02 12:52:30
|
Author: ecn Date: 2007-05-02 08:51:59 -0400 (Wed, 02 May 2007) New Revision: 5029 Modified: trunk/wmi/GNUmakefile Log: winexe is in wmi Modified: trunk/wmi/GNUmakefile =================================================================== --- trunk/wmi/GNUmakefile 2007-05-02 05:35:19 UTC (rev 5028) +++ trunk/wmi/GNUmakefile 2007-05-02 12:51:59 UTC (rev 5029) @@ -9,16 +9,21 @@ DESTDIR= / PYLIBDIR= $(DESTDIR)$(ZENHOME)/lib/python ZENBIN= $(DESTDIR)$(ZENHOME)/bin -PYINCLUDE= $(DESTDIR)$(shell $(PYTHON) pyinclude.py) +PYINCLUDE= $(shell $(PYTHON) pyinclude.py) +DATE=$(shell date +%Y%m%d) -pywmi-installed: +pywmi-installed: $(PYLIBDIR) $(ZENBIN) cd Samba/source && \ ./autogen.sh && \ - CPPFLAGS="-I$(PYINCLUDE)" ./configure && \ - $(MAKE) proto bin/wmic bin/wmis wmi/_pywmi.so && \ + CPPFLAGS="-I$(PYINCLUDE)" ./configure --without-readline && \ + $(MAKE) proto bin/wmic bin/wmis wmi/_pywmi.so bin/winexe && \ + cp bin/winexe $(ZENBIN) && \ cp wmi/_pywmi.so $(PYLIBDIR) && \ cp wmi/pywmi.py $(PYLIBDIR) +$(ZENBIN) $(PYLIBDIR): + mkdir -p $@ + clean: cd pycom && rm -rf build cd Samba/source && make clean @@ -34,7 +39,7 @@ tarball: clean tar --exclude=".svn" \ --exclude='*~' \ - --transform "s%^\.%wmi-`date +%Y%m%d`%" \ - -cjf "../wmi-`date +%Y%m%d`.tar.bz2" \ + --transform "s%^\.%wmi-$(DATE)%" \ + -cjf "../wmi-$(DATE).tar.bz2" \ . |
|
From: <sv...@ze...> - 2007-05-02 05:35:25
|
Author: jstevens
Date: 2007-05-02 01:35:19 -0400 (Wed, 02 May 2007)
New Revision: 5028
Modified:
trunk/Products/ZenEvents/CustomEventView.py
trunk/Products/ZenEvents/EventManagerBase.py
trunk/Products/ZenEvents/skins/zenevents/viewHistoryEvents.pt
trunk/Products/ZenModel/EventView.py
trunk/Products/ZenModel/ZenModelBase.py
trunk/Products/ZenModel/skins/zenmodel/templates.pt
trunk/Products/ZenWidgets/skins/zenui/javascript/zengrid.js
Log:
Confirmation dialogs for event console commands
* confirmation are now hidden divs that can be controlled via javascript
* several more EventManagerBase methods pass messages up the call chain
* EventView better wrangles calls from event console with regard to messages and destination rendering.
Modified: trunk/Products/ZenEvents/CustomEventView.py
===================================================================
--- trunk/Products/ZenEvents/CustomEventView.py 2007-05-02 02:06:42 UTC (rev 5027)
+++ trunk/Products/ZenEvents/CustomEventView.py 2007-05-02 05:35:19 UTC (rev 5028)
@@ -151,17 +151,14 @@
def manage_deleteEvents(self, evids=(), REQUEST=None):
"""Delete events form this managed entity.
"""
- self.getEventManager().manage_deleteEvents(evids)
- if REQUEST: return self.callZenScreen(REQUEST)
+ return self.getEventManager().manage_deleteEvents(evids, REQUEST)
+
security.declareProtected('Manage Events','manage_undeleteEvents')
def manage_undeleteEvents(self, evids=(), REQUEST=None):
"""Delete events form this managed entity.
"""
- self.getEventManager().manage_undeleteEvents(evids)
- if REQUEST:
- REQUEST['message'] = "%s events undeleted." % len(evids)
- return self.callZenScreen(REQUEST)
+ return self.getEventManager().manage_undeleteEvents(evids, REQUEST)
security.declareProtected('Manage Events','manage_deleteHeartbeat')
@@ -170,27 +167,27 @@
"""
dev = self.device()
if dev:
- self.getEventManager().manage_deleteHeartbeat(dev.id)
- if REQUEST: return self.callZenScreen(REQUEST)
+ return self.getEventManager().manage_deleteHeartbeat(dev.id, REQUEST)
+ if REQUEST:
+ return self.callZenScreen(REQUEST)
security.declareProtected('Manage Events','manage_ackEvents')
def manage_ackEvents(self, evids=(), REQUEST=None):
"""Set event state form this managed entity.
"""
- self.getEventManager().manage_ackEvents(evids)
- if REQUEST: return self.callZenScreen(REQUEST)
+ return self.getEventManager().manage_ackEvents(evids, REQUEST)
security.declareProtected('Manage Events','manage_setEventStates')
def manage_setEventStates(self, eventState=None, evids=(), REQUEST=None):
"""Set event state form this managed entity.
"""
- self.getEventManager().manage_setEventStates(eventState, evids)
- if REQUEST: return self.callZenScreen(REQUEST)
+ return self.getEventManager().manage_setEventStates(
+ eventState, evids, REQUEST)
- security.declareProtected('Manage Events','manage_setEventStates')
+ security.declareProtected('Manage Events','manage_createEventMap')
def manage_createEventMap(self, eventClass=None, evids=(), REQUEST=None):
"""Create an event map from an event or list of events.
"""
Modified: trunk/Products/ZenEvents/EventManagerBase.py
===================================================================
--- trunk/Products/ZenEvents/EventManagerBase.py 2007-05-02 02:06:42 UTC (rev 5027)
+++ trunk/Products/ZenEvents/EventManagerBase.py 2007-05-02 05:35:19 UTC (rev 5028)
@@ -1260,12 +1260,12 @@
"Delete the given event ids"
if type(evids) == type(''):
evids = [evids]
+ num = len(evids)
if evids:
evids = ",".join([ "'%s'" % evid for evid in evids])
whereClause = ' where evid in (%s)' % evids
self.deleteEvents(whereClause, 'Deleted by user')
if REQUEST:
- num = len(evids)
REQUEST['message'] = 'Moved %s event%s to History.' % (
num, (num != 1 and 's') or '')
return self.callZenScreen(REQUEST)
@@ -1285,13 +1285,13 @@
"Move the given event ids into status and delete from history"
if type(evids) == type(''):
evids = [evids]
+ num = len(evids)
if evids:
- l = len(evids)
evids = ",".join([ "'%s'" % evid for evid in evids])
whereClause = ' where evid in (%s)' % evids
self.undeleteEvents(whereClause, 'Undeleted by user')
if REQUEST:
- REQUEST['message'] = "%s events undeleted." % l
+ REQUEST['message'] = "%s events undeleted." % num
return self.callZenScreen(REQUEST)
security.declareProtected('Manage Events','manage_deleteAllEvents')
@@ -1299,7 +1299,9 @@
"Delete the events for a given Device (used for deleting the device"
whereClause = 'where device = "%s"' % devname
self.deleteEvents(whereClause, 'Device deleted')
- if REQUEST: return self.callZenScreen(REQUEST)
+ if REQUEST:
+ REQUEST['message'] = 'Deleted all events for %s' % devname
+ return self.callZenScreen(REQUEST)
security.declareProtected('Manage Events','manage_deleteHeartbeat')
@@ -1311,7 +1313,9 @@
curs = conn.cursor()
curs.execute(delete);
finally: self.close(conn)
- if REQUEST: return self.callZenScreen(REQUEST)
+ if REQUEST:
+ REQUEST['message'] = 'Moved heartbeat(s) to History'
+ return self.callZenScreen(REQUEST)
security.declareProtected('Manage Events','manage_ackEvents')
@@ -1324,6 +1328,7 @@
security.declareProtected('Manage Events','manage_setEventStates')
def manage_setEventStates(self, eventState=None, evids=(), REQUEST=None):
+ reason = None
if eventState and evids:
eventState = int(eventState)
userid = ""
@@ -1338,8 +1343,11 @@
except KeyError:
reason += 'unknown (%d)' % eventState
self.updateEvents(update, whereClause, reason)
- if REQUEST:
- REQUEST['message'] = reason
+ if REQUEST:
+ if reason:
+ REQUEST['message'] = reason
+ else:
+ REQUEST['message'] = 'no reason'
return self.callZenScreen(REQUEST)
@@ -1399,6 +1407,10 @@
numCreated,
(numCreated != 1 and 's') or '')
REQUEST['message'] = msg
+ # EventView might pass a fake Request during an ajax call from
+ # event console. Don't bother rendering anything in this case.
+ if getattr(REQUEST, 'dontRender', False):
+ return ''
if len(evids) == 1 and evmap: return evmap()
elif evclass and evmap: return evclass()
Modified: trunk/Products/ZenEvents/skins/zenevents/viewHistoryEvents.pt
===================================================================
--- trunk/Products/ZenEvents/skins/zenevents/viewHistoryEvents.pt 2007-05-02 02:06:42 UTC (rev 5027)
+++ trunk/Products/ZenEvents/skins/zenevents/viewHistoryEvents.pt 2007-05-02 05:35:19 UTC (rev 5028)
@@ -26,6 +26,7 @@
page string:getHistoryEventListPage;
">
+<input type='hidden' name='zenScreenName' tal:attributes="value template/id" />
<tal:block tal:define="
tabletitle string:Event History;
Modified: trunk/Products/ZenModel/EventView.py
===================================================================
--- trunk/Products/ZenModel/EventView.py 2007-05-02 02:06:42 UTC (rev 5027)
+++ trunk/Products/ZenModel/EventView.py 2007-05-02 05:35:19 UTC (rev 5028)
@@ -18,6 +18,23 @@
from AccessControl import ClassSecurityInfo
from Globals import InitializeClass
+class FakeRequest(dict):
+ ''' Used for ajax calls from event console and elsewhere. This is used
+ as a container for REQUEST['message'] which we are interested in. It has
+ the advantage over the regular REQUEST object in that it won't actually
+ bother to render anything when callZenScreen() is called with one.
+ '''
+ dontRender = True
+
+ def __init__(self, *args, **kw):
+ dict.__init__(self, *args, **kw)
+ self['oneKeyValueSoInstanceIsntEmptyAndEvalToFalse'] = True
+
+ def setMessage(self, R):
+ if R and self.get('message', ''):
+ R['message'] = self['message']
+
+
class EventView(object):
security = ClassSecurityInfo()
@@ -109,8 +126,16 @@
def manage_deleteEvents(self, evids=(), REQUEST=None):
"""Delete events form this managed entity.
"""
- self.getEventManager().manage_deleteEvents(evids)
- if REQUEST: return self.callZenScreen(REQUEST)
+ # If we pass REQUEST in to the getEventManager().manage_deleteEvents()
+ # call we don't get a proper refresh of the event console. It only
+ # works if self.callZenScreen() is called from here rather than down
+ # in the event manager. I'm not sure why. Using FakeResult to fetch
+ # the message seems like best workaround for now.
+ request = FakeRequest()
+ self.getEventManager().manage_deleteEvents(evids, request)
+ if REQUEST:
+ request.setMessage(REQUEST)
+ return self.callZenScreen(REQUEST)
#security.declareProtected('Manage Events','manage_deleteBatchEvents')
@@ -134,16 +159,19 @@
enddate=enddate, severity=severity,
state=state, orderby=orderby,
**kwargs)
- return self.manage_deleteEvents(evids, REQUEST)
+ request = FakeRequest()
+ self.manage_deleteEvents(evids, request)
+ return request.get('message', '')
security.declareProtected('Manage Events','manage_undeleteEvents')
def manage_undeleteEvents(self, evids=(), REQUEST=None):
"""Delete events form this managed entity.
"""
- self.getEventManager().manage_undeleteEvents(evids)
- if REQUEST:
- REQUEST['message'] = '%s events undeleted.' % len(evids)
+ request = FakeRequest()
+ self.getEventManager().manage_undeleteEvents(evids, request)
+ if REQUEST:
+ request.setMessage(REQUEST)
return self.callZenScreen(REQUEST)
@@ -155,7 +183,9 @@
startdate=None, enddate=None,
severity=2, state=1, orderby='',
REQUEST=None, **kwargs):
- """Delete events form this managed entity.
+ """Delete events form this managed entity.
+ Only called from event console, so uses FakeRequest to avoid
+ page rendering.
"""
evids = self.getEventManager().getEventBatchME(self,
selectstatus=selectstatus,
@@ -168,7 +198,9 @@
enddate=enddate, severity=severity,
state=state, orderby=orderby,
**kwargs)
- return self.manage_undeleteEvents(evids, REQUEST)
+ request = FakeRequest()
+ self.manage_undeleteEvents(evids, request)
+ return request.get('message', '')
security.declareProtected('Manage Events','manage_deleteHeartbeat')
@@ -177,16 +209,16 @@
"""
dev = self.device()
if dev:
- self.getEventManager().manage_deleteHeartbeat(dev.id)
- if REQUEST: return self.callZenScreen(REQUEST)
+ return self.getEventManager().manage_deleteHeartbeat(dev.id, REQUEST)
+ if REQUEST:
+ return self.callZenScreen(REQUEST)
security.declareProtected('Manage Events','manage_ackEvents')
def manage_ackEvents(self, evids=(), REQUEST=None):
"""Set event state form this managed entity.
"""
- self.getEventManager().manage_ackEvents(evids)
- if REQUEST: return self.callZenScreen(REQUEST)
+ return self.getEventManager().manage_ackEvents(evids, REQUEST)
security.declareProtected('Manage Events','manage_ackBatchEvents')
@@ -198,6 +230,8 @@
severity=2, state=1, orderby='',
REQUEST=None, **kwargs):
"""Delete events form this managed entity.
+ Only called from event console, so uses FakeRequest to avoid
+ page rendering.
"""
evids = self.getEventManager().getEventBatchME(self,
selectstatus=selectstatus,
@@ -210,15 +244,17 @@
enddate=enddate, severity=severity,
state=state, orderby=orderby,
**kwargs)
- return self.manage_ackEvents(evids, REQUEST)
+ request = FakeRequest()
+ self.manage_ackEvents(evids, request)
+ return request.get('message', '')
security.declareProtected('Manage Events','manage_setEventStates')
def manage_setEventStates(self, eventState=None, evids=(), REQUEST=None):
"""Set event state form this managed entity.
"""
- self.getEventManager().manage_setEventStates(eventState, evids)
- if REQUEST: return self.callZenScreen(REQUEST)
+ return self.getEventManager().manage_setEventStates(
+ eventState, evids, REQUEST)
security.declareProtected('Manage Events','manage_createEventMap')
Modified: trunk/Products/ZenModel/ZenModelBase.py
===================================================================
--- trunk/Products/ZenModel/ZenModelBase.py 2007-05-02 02:06:42 UTC (rev 5027)
+++ trunk/Products/ZenModel/ZenModelBase.py 2007-05-02 05:35:19 UTC (rev 5028)
@@ -107,6 +107,10 @@
in functions that are called from forms to get back to the correct
screen with the correct context.
"""
+ if getattr(REQUEST, 'dontRender', False):
+ # EventView uses a FakeRequest class to avoid the overhead
+ # of rendering pages as result of ajax calls.
+ return ''
screenName = REQUEST.get("zenScreenName", "")
if redirect:
nurl = "%s/%s" % (self.getPrimaryUrlPath(), screenName)
Modified: trunk/Products/ZenModel/skins/zenmodel/templates.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/templates.pt 2007-05-02 02:06:42 UTC (rev 5027)
+++ trunk/Products/ZenModel/skins/zenmodel/templates.pt 2007-05-02 05:35:19 UTC (rev 5028)
@@ -184,25 +184,49 @@
<div metal:use-macro="here/templates/macros/breadCrumbPane"></div>
</div>
-<div id="messageSlot" tal:condition="python:hasattr(here.REQUEST,'message')"
-onclick="fade('messageSlot', {'duration':0.3} )" >
+<div id="messageSlot" style="{display: none;}"
+ onclick="fade('messageSlot', {'duration':0.3} )" >
<div class="dbox_tl"><div class="dbox_tr"><div class="dbox_tc">
</div></div></div>
<div class="dbox_ml"><div class="dbox_mr"><div class="dbox_mc"
style="position:relative;">
-<span tal:content="here/REQUEST/message">Message</span>
+<span id="messageSpan"
+ tal:content="python:here.REQUEST.get('message', '')">Message</span>
</div></div></div>
<div class="dbox_bl"><div class="dbox_br"><div class="dbox_bc">
</div></div></div>
</div>
-<script tal:condition="python:hasattr(here.REQUEST,'message')">
+<script>
+ var initialMsg = '';
+</script>
+<script tal:condition="here/REQUEST/message|nothing"
+ tal:content="structure string:
+ initialMsg = '${here/REQUEST/message}';
+ ">
+</script>
+<script>
var pulseMessage = function() {
- showElement('messageSlot');
pulsate('messageSlot', {pulses:2, duration:3});
- }
- addLoadEvent(pulseMessage);
+ }
+
+ var showMessage = function(msg) {
+ if (0 == msg.length) {
+ hideElement('messageSlot');
+ }
+ else {
+ getElement('messageSpan').innerHTML = msg;
+ showElement('messageSlot');
+ pulseMessage();
+ }
+ }
+
+ var showInitialMsg = function() {
+ showMessage(initialMsg);
+ }
+
+ addLoadEvent(showInitialMsg);
</script>
</div>
Modified: trunk/Products/ZenWidgets/skins/zenui/javascript/zengrid.js
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/javascript/zengrid.js 2007-05-02 02:06:42 UTC (rev 5027)
+++ trunk/Products/ZenWidgets/skins/zenui/javascript/zengrid.js 2007-05-02 05:35:19 UTC (rev 5028)
@@ -875,6 +875,7 @@
this.buffer.clear();
this.refreshTable(this.lastOffset);
this.setSelectNone();
+ showMessage(r.responseText);
}, this));
}
}
|
|
From: <sv...@ze...> - 2007-05-02 02:06:43
|
Author: edahl Date: 2007-05-01 22:06:42 -0400 (Tue, 01 May 2007) New Revision: 5027 Added: trunk/inst/ZEN2UPGRADE.txt Removed: trunk/inst/zenUsers2dump.py Log: * updates to upgrade instructions Added: trunk/inst/ZEN2UPGRADE.txt Deleted: trunk/inst/zenUsers2dump.py |
|
From: <sv...@ze...> - 2007-05-02 01:51:46
|
Author: edahl Date: 2007-05-01 21:51:45 -0400 (Tue, 01 May 2007) New Revision: 5026 Added: trunk/bin/zen2load.py Log: * add zen2load to the bin directory to load migrated 2.0 database Added: trunk/bin/zen2load.py Property changes on: trunk/bin/zen2load.py ___________________________________________________________________ Name: svn:executable + * |
|
From: <sv...@ze...> - 2007-05-01 23:06:05
|
Author: edahl
Date: 2007-05-01 19:06:04 -0400 (Tue, 01 May 2007)
New Revision: 5025
Modified:
trunk/Products/ZenUtils/CmdBase.py
trunk/Products/ZenUtils/ZenDaemon.py
Log:
* fix missing import and missing exception
Modified: trunk/Products/ZenUtils/CmdBase.py
===================================================================
--- trunk/Products/ZenUtils/CmdBase.py 2007-05-01 22:31:05 UTC (rev 5024)
+++ trunk/Products/ZenUtils/CmdBase.py 2007-05-01 23:06:04 UTC (rev 5025)
@@ -22,6 +22,7 @@
__version__ = "$Revision: 1.10 $"[11:-2]
import os
+import sys
import logging
import logging.config
from optparse import OptionParser
Modified: trunk/Products/ZenUtils/ZenDaemon.py
===================================================================
--- trunk/Products/ZenUtils/ZenDaemon.py 2007-05-01 22:31:05 UTC (rev 5024)
+++ trunk/Products/ZenUtils/ZenDaemon.py 2007-05-01 23:06:04 UTC (rev 5025)
@@ -93,7 +93,7 @@
pwrec = pwd.getpwnam(self.options.uid)
os.setuid(pwrec.pw_uid)
os.environ['HOME'] = pwrec.pw_dir
- except KeyError:
+ except (KeyError, OSError):
print >>sys.stderr, "WARN: user:%s not found running as:%s"%(
self.options.uid,cname)
|
|
From: <sv...@ze...> - 2007-05-01 22:31:05
|
Author: ian Date: 2007-05-01 18:31:05 -0400 (Tue, 01 May 2007) New Revision: 5024 Modified: trunk/Products/ZenModel/skins/zenmodel/zSortableProperty.pt Log: * Fixes #1159: Made textareas bigger on Eric's new zProperty page. Modified: trunk/Products/ZenModel/skins/zenmodel/zSortableProperty.pt =================================================================== --- trunk/Products/ZenModel/skins/zenmodel/zSortableProperty.pt 2007-05-01 22:20:20 UTC (rev 5023) +++ trunk/Products/ZenModel/skins/zenmodel/zSortableProperty.pt 2007-05-01 22:31:05 UTC (rev 5024) @@ -49,7 +49,8 @@ ul python:'ul_' + prop;"> <div style="float:left;"> <textarea tal:content="pvalue" - tal:attributes="name propName; id ta"/> + tal:attributes="name propName; id ta" + rows="20" style="height:350px;width:250px"/> <h5>Plugins (drag to change order)</h5> </div> <div style="float:left;"> |
|
From: <sv...@ze...> - 2007-05-01 22:20:39
|
Author: ian
Date: 2007-05-01 18:20:20 -0400 (Tue, 01 May 2007)
New Revision: 5023
Added:
trunk/Products/ZenWidgets/skins/zenui/dialog_addHardware.pt
trunk/Products/ZenWidgets/skins/zenui/dialog_addSoftware.pt
trunk/Products/ZenWidgets/skins/zenui/dialog_deleteProducts.pt
trunk/Products/ZenWidgets/skins/zenui/dialog_moveToManufacturer.pt
Modified:
trunk/Products/ZenModel/migrate/menus.py
trunk/Products/ZenModel/skins/zenmodel/viewManufacturerOverview.pt
Log:
* Fixes #538: Added dialogs and menus for Product management
Modified: trunk/Products/ZenModel/migrate/menus.py
===================================================================
--- trunk/Products/ZenModel/migrate/menus.py 2007-05-01 22:06:32 UTC (rev 5022)
+++ trunk/Products/ZenModel/migrate/menus.py 2007-05-01 22:20:20 UTC (rev 5023)
@@ -728,6 +728,41 @@
'isdialog': True,
'ordering': 80.0,
'permissions': ('Manage DMD',)}],
+ 'Product_list': [
+ ZenPackItems,
+ dict(
+ ordering=90.0,
+ id= 'addHardware',
+ description='Add New Hardware...',
+ action= 'dialog_addHardware',
+ permissions=('Manage DMD',),
+ isdialog= True
+ ),
+ dict(
+ ordering=80.0,
+ id= 'addSoftware',
+ description='Add New Software...',
+ action= 'dialog_addSoftware',
+ permissions=('Manage DMD',),
+ isdialog= True
+ ),
+ dict(
+ ordering=70.0,
+ id= 'moveToManufacturer',
+ description='Move To Manufacturer...',
+ action= 'dialog_moveToManufacturer',
+ permissions=('Manage DMD',),
+ isdialog= True
+ ),
+ dict(
+ ordering=60.0,
+ id= 'deleteProducts',
+ description='Delete Products...',
+ action= 'dialog_deleteProducts',
+ permissions=('Manage DMD',),
+ isdialog= True
+ )
+ ],
'ReportClass_list': [ { 'action': 'dialog_addToZenPack',
'description': 'Add to ZenPack...',
'id': 'addToZenPack',
Modified: trunk/Products/ZenModel/skins/zenmodel/viewManufacturerOverview.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/viewManufacturerOverview.pt 2007-05-01 22:06:32 UTC (rev 5022)
+++ trunk/Products/ZenModel/skins/zenmodel/viewManufacturerOverview.pt 2007-05-01 22:20:20 UTC (rev 5023)
@@ -63,6 +63,7 @@
<tal:block tal:define="
tableName string:manufacturerproducts;
objects here/products/objectValuesAll;
+ menu_id string:Product_list;
showfilterbox python:True;
batch python:here.ZenTableManager.getBatch(tableName,objects);
tabletitle string:Products">
@@ -112,27 +113,6 @@
</tr>
<tr tal:condition="here/isManager">
<td class="tableheader" colspan="4">
- <input class="tableheader" type="text" name="prodName"
- onkeypress="return submitViaEnter(event);"/>
- <input class="tableheader" type="submit"
- name="manage_addHardware:method" value="Add Hardware" />
- <input class="tableheader" type="submit"
- name="manage_addSoftware:method" value="Add Software" />
- |
- <input class="tableheader" type="submit" name="moveProducts:method"
- value="Move To" />
- <select class="tableheader" name="moveTarget"
- tal:define="targets here/getManufacturerNames">
- <option value=""></option>
- <option tal:repeat="target targets"
- tal:content="target">Zentinel</option>
- </select>
- <input class="tableheader" type="submit"
- name="manage_deleteProducts:method" value=" Delete " />
- |
- <input class="tableheader" type="submit"
- name="SelectButton" value="Select All"
- onClick="toggleSelect(this.form);return false"/>
</td>
</tr>
Added: trunk/Products/ZenWidgets/skins/zenui/dialog_addHardware.pt
Added: trunk/Products/ZenWidgets/skins/zenui/dialog_addSoftware.pt
Added: trunk/Products/ZenWidgets/skins/zenui/dialog_deleteProducts.pt
Added: trunk/Products/ZenWidgets/skins/zenui/dialog_moveToManufacturer.pt
|
|
From: <sv...@ze...> - 2007-05-01 22:06:38
|
Author: marc
Date: 2007-05-01 18:06:32 -0400 (Tue, 01 May 2007)
New Revision: 5022
Modified:
trunk/Products/ZenModel/DeviceReport.py
trunk/Products/ZenModel/ReportClass.py
trunk/Products/ZenModel/ZenModelRM.py
trunk/Products/ZenModel/skins/zenmodel/dialog_addReport.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_addReportClass.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_deleteReportClasses.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_deleteReports.pt
trunk/Products/ZenWidgets/skins/zenui/dialog_deleteFileSystems.pt
trunk/Products/ZenWidgets/skins/zenui/dialog_deleteIpInterfaces.pt
trunk/Products/ZenWidgets/skins/zenui/dialog_deleteIpRouteEntries.pt
trunk/Products/ZenWidgets/skins/zenui/dialog_deleteIpServices.pt
trunk/Products/ZenWidgets/skins/zenui/dialog_deleteOSProcesses.pt
trunk/Products/ZenWidgets/skins/zenui/dialog_deleteWinServices.pt
trunk/Products/ZenWidgets/skins/zenui/dialog_moveEventsToHistory.pt
trunk/Products/ZenWidgets/skins/zenui/dialog_removeDevices.pt
trunk/Products/ZenWidgets/skins/zenui/dialog_removeInstances.pt
trunk/Products/ZenWidgets/skins/zenui/dialog_removeManufacturers.pt
trunk/Products/ZenWidgets/skins/zenui/dialog_removeMibModules.pt
trunk/Products/ZenWidgets/skins/zenui/dialog_removeMonitors.pt
trunk/Products/ZenWidgets/skins/zenui/dialog_removeOSProcesses.pt
trunk/Products/ZenWidgets/skins/zenui/dialog_removeOrganizer.pt
trunk/Products/ZenWidgets/skins/zenui/dialog_removeServiceClasses.pt
trunk/Products/ZenWidgets/skins/zenui/dialog_removeZenPacks.pt
trunk/Products/ZenWidgets/skins/zenui/dialog_undeleteHistoryEvents.pt
Log:
* Fixed some dialog buttons
* Added messages to Report Organizer, Device Report dialogs
Modified: trunk/Products/ZenModel/DeviceReport.py
===================================================================
--- trunk/Products/ZenModel/DeviceReport.py 2007-05-01 21:55:27 UTC (rev 5021)
+++ trunk/Products/ZenModel/DeviceReport.py 2007-05-01 22:06:32 UTC (rev 5022)
@@ -29,6 +29,7 @@
dc = DeviceReprot(id, title)
context._setObject(id, dc)
if REQUEST is not None:
+ REQUEST['message'] = "Device report created"
REQUEST['RESPONSE'].redirect(context.absolute_url() + '/manage_main')
Modified: trunk/Products/ZenModel/ReportClass.py
===================================================================
--- trunk/Products/ZenModel/ReportClass.py 2007-05-01 21:55:27 UTC (rev 5021)
+++ trunk/Products/ZenModel/ReportClass.py 2007-05-01 22:06:32 UTC (rev 5022)
@@ -38,6 +38,7 @@
context._setObject(id, dc)
if REQUEST is not None:
+ REQUEST['message'] = "Report organizer created"
REQUEST['RESPONSE'].redirect(context.absolute_url() + '/manage_main')
addReportClass = DTMLFile('dtml/addReportClass',globals())
@@ -73,6 +74,7 @@
dc = ReportClass(id, title)
self._setObject(id, dc)
if REQUEST:
+ REQUEST['message'] = "Report organizer created"
return self.callZenScreen(REQUEST)
@@ -99,6 +101,7 @@
dr = DeviceReport(id)
self._setObject(id, dr)
if REQUEST:
+ REQUEST['message'] = "Device report created"
return self.callZenScreen(REQUEST)
@@ -114,6 +117,7 @@
self._delObject(rptname)
target._setObject(rptname, rpt)
if REQUEST:
+ REQUEST['message'] = "Device reports moved"
REQUEST['RESPONSE'].redirect(target.getPrimaryUrlPath())
Modified: trunk/Products/ZenModel/ZenModelRM.py
===================================================================
--- trunk/Products/ZenModel/ZenModelRM.py 2007-05-01 21:55:27 UTC (rev 5021)
+++ trunk/Products/ZenModel/ZenModelRM.py 2007-05-01 22:06:32 UTC (rev 5022)
@@ -63,6 +63,7 @@
parent.manage_renameObject(self.getId(), newId)
renamed = True
if REQUEST:
+ REQUEST['message'] = "Object renamed"
return self.callZenScreen(REQUEST, renamed)
return renamed
@@ -94,6 +95,7 @@
id = prefix + id
self._setProperty(id.strip(), value, type, label, visible)
if REQUEST:
+ REQUEST['message'] = "Property added"
return self.callZenScreen(REQUEST)
def zmanage_exportObject(self, context=None, REQUEST=None):
@@ -170,6 +172,7 @@
if doDelete and xmlfile in filenames:
os.unlink(xmlfile)
if REQUEST:
+ REQUEST['message'] = "Objects imported"
return self.callZenScreen(REQUEST)
@@ -184,6 +187,7 @@
for id in ids:
self._delProperty(id)
if REQUEST:
+ REQUEST['message'] = "Properties deleted"
return self.callZenScreen(REQUEST)
@@ -195,6 +199,7 @@
for id in ids:
target._delObject(id)
if REQUEST:
+ REQUEST['message'] = "Objects deleted"
return self.callZenScreen(REQUEST)
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_addReport.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_addReport.pt 2007-05-01 21:55:27 UTC (rev 5021)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_addReport.pt 2007-05-01 22:06:32 UTC (rev 5022)
@@ -1,20 +1,16 @@
<h2>Add Report</h2>
-<p>
-What would you like to name your Report?<br/>
-</p>
<span id="errmsg" style="color:red;"></span>
<br/>
<p style="text-align:right;">
<span id="new_id_label">ID: </span>
-<input id="new_id"
- name="id"
- tal:attributes="onblur string:checkValidId('${here/getPrimaryUrlPath}', this.id)"><br/>
+<input id="new_id" name="id"
+ tal:attributes="onblur string:checkValidId('${here/getPrimaryUrlPath}', this.id)">
+<br/><br/>
</p>
<div id="dialog_buttons">
-<input type="submit" name="manage_addDeviceReport:method"
- value="OK"
+<input type="submit" name="manage_addDeviceReport:method" value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/getPrimaryUrlPath}', 'reportForm')" />
<input id="dialog_cancel" type="button" value="Cancel"
-onclick="$('dialog').hide()"/>
+ onclick="$('dialog').hide()"/>
</div>
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_addReportClass.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_addReportClass.pt 2007-05-01 21:55:27 UTC (rev 5021)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_addReportClass.pt 2007-05-01 22:06:32 UTC (rev 5022)
@@ -1,20 +1,16 @@
<h2>Add Report Organizer</h2>
-<p>
-What would you like to name your Report Organizer?<br/>
-</p>
<span id="errmsg" style="color:red;"></span>
<br/>
<p style="text-align:right;">
<span id="new_id_label">ID: </span>
-<input id="new_id"
- name="id"
- tal:attributes="onblur string:checkValidId('${here/getPrimaryUrlPath}', this.id)"><br/><br/>
+<input id="new_id" name="id"
+ tal:attributes="onblur string:checkValidId('${here/getPrimaryUrlPath}', this.id)">
+<br/><br/>
</p>
<div id="dialog_buttons">
-<input type="submit" name="manage_addReportClass:method"
- value="OK"
+<input type="submit" name="manage_addReportClass:method" value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/getPrimaryUrlPath}', 'reportClassForm')" />
<input id="dialog_cancel" type="button" value="Cancel"
-onclick="$('dialog').hide()"/>
+ onclick="$('dialog').hide()"/>
</div>
\ No newline at end of file
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_deleteReportClasses.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_deleteReportClasses.pt 2007-05-01 21:55:27 UTC (rev 5021)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_deleteReportClasses.pt 2007-05-01 22:06:32 UTC (rev 5022)
@@ -4,10 +4,9 @@
</p>
<br/>
<div id="dialog_buttons">
-<input type="submit" name="manage_deleteOrganizers:method"
- value="OK"
+<input type="submit" name="manage_deleteOrganizers:method" value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/getPrimaryUrlPath}', 'reportClassForm')" />
<input id="dialog_cancel" type="button" value="Cancel"
-onclick="$('dialog').hide()"/>
+ onclick="$('dialog').hide()"/>
</div>
\ No newline at end of file
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_deleteReports.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_deleteReports.pt 2007-05-01 21:55:27 UTC (rev 5021)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_deleteReports.pt 2007-05-01 22:06:32 UTC (rev 5022)
@@ -4,10 +4,9 @@
</p>
<br/>
<div id="dialog_buttons">
-<input type="submit" name="zmanage_delObjects:method"
- value="OK"
+<input type="submit" name="zmanage_delObjects:method" value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/getPrimaryUrlPath}', 'reportForm')" />
<input id="dialog_cancel" type="button" value="Cancel"
-onclick="$('dialog').hide()"/>
+ onclick="$('dialog').hide()"/>
</div>
\ No newline at end of file
Modified: trunk/Products/ZenWidgets/skins/zenui/dialog_deleteFileSystems.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/dialog_deleteFileSystems.pt 2007-05-01 21:55:27 UTC (rev 5021)
+++ trunk/Products/ZenWidgets/skins/zenui/dialog_deleteFileSystems.pt 2007-05-01 22:06:32 UTC (rev 5022)
@@ -6,7 +6,7 @@
<br/>
<div id="dialog_buttons">
<input type="submit" name="deleteFileSystems:method"
- value="Yes"
+ value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/os/absolute_url_path}')" />
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenWidgets/skins/zenui/dialog_deleteIpInterfaces.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/dialog_deleteIpInterfaces.pt 2007-05-01 21:55:27 UTC (rev 5021)
+++ trunk/Products/ZenWidgets/skins/zenui/dialog_deleteIpInterfaces.pt 2007-05-01 22:06:32 UTC (rev 5022)
@@ -5,7 +5,7 @@
</p>
<br/>
<div id="dialog_buttons">
-<input type="submit" name="deleteIpInterfaces:method" value="Yes"
+<input type="submit" name="deleteIpInterfaces:method" value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/os/absolute_url_path}')" />
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenWidgets/skins/zenui/dialog_deleteIpRouteEntries.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/dialog_deleteIpRouteEntries.pt 2007-05-01 21:55:27 UTC (rev 5021)
+++ trunk/Products/ZenWidgets/skins/zenui/dialog_deleteIpRouteEntries.pt 2007-05-01 22:06:32 UTC (rev 5022)
@@ -7,7 +7,7 @@
<br/>
<div id="dialog_buttons">
<input type="submit" name="deleteIpRouteEntries:method"
- value="Yes"
+ value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/os/absolute_url_path}')" />
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenWidgets/skins/zenui/dialog_deleteIpServices.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/dialog_deleteIpServices.pt 2007-05-01 21:55:27 UTC (rev 5021)
+++ trunk/Products/ZenWidgets/skins/zenui/dialog_deleteIpServices.pt 2007-05-01 22:06:32 UTC (rev 5022)
@@ -5,7 +5,7 @@
</p>
<br/>
<div id="dialog_buttons">
-<input type="submit" name="deleteIpServices:method" value="Yes"
+<input type="submit" name="deleteIpServices:method" value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/os/absolute_url_path}')" />
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenWidgets/skins/zenui/dialog_deleteOSProcesses.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/dialog_deleteOSProcesses.pt 2007-05-01 21:55:27 UTC (rev 5021)
+++ trunk/Products/ZenWidgets/skins/zenui/dialog_deleteOSProcesses.pt 2007-05-01 22:06:32 UTC (rev 5022)
@@ -5,7 +5,7 @@
</p>
<br/>
<div id="dialog_buttons">
-<input type="submit" name="deleteOSProcesses:method" value="Yes"
+<input type="submit" name="deleteOSProcesses:method" value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/os/absolute_url_path}')" />
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenWidgets/skins/zenui/dialog_deleteWinServices.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/dialog_deleteWinServices.pt 2007-05-01 21:55:27 UTC (rev 5021)
+++ trunk/Products/ZenWidgets/skins/zenui/dialog_deleteWinServices.pt 2007-05-01 22:06:32 UTC (rev 5022)
@@ -5,7 +5,7 @@
</p>
<br/>
<div id="dialog_buttons">
-<input type="submit" name="deleteWinServices:method" value="Yes"
+<input type="submit" name="deleteWinServices:method" value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/os/absolute_url_path}')" />
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenWidgets/skins/zenui/dialog_moveEventsToHistory.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/dialog_moveEventsToHistory.pt 2007-05-01 21:55:27 UTC (rev 5021)
+++ trunk/Products/ZenWidgets/skins/zenui/dialog_moveEventsToHistory.pt 2007-05-01 22:06:32 UTC (rev 5022)
@@ -5,9 +5,10 @@
</p>
<br/>
<div id="dialog_buttons">
-<input type="button" name="manage_deleteEvents:method"
- value="Yes"
- tal:attributes="onclick string:$$('dialog').hide();;eventZenGrid.deleteBatch()" />
+<input type="submit" name="manage_deleteEvents:method"
+ value="OK"
+ tal:attributes="onclick string:return $$('dialog').submit_form(
+ '${here/absolute_url_path}')" />
<input id="dialog_cancel" type="button" value="Cancel"
onclick="$('dialog').hide()"/>
</div>
Modified: trunk/Products/ZenWidgets/skins/zenui/dialog_removeDevices.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/dialog_removeDevices.pt 2007-05-01 21:55:27 UTC (rev 5021)
+++ trunk/Products/ZenWidgets/skins/zenui/dialog_removeDevices.pt 2007-05-01 22:06:32 UTC (rev 5022)
@@ -7,7 +7,7 @@
<br/>
<div id="dialog_buttons">
<input type="submit" name="removeDevices:method"
- value="Yes"
+ value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/absolute_url_path}')" />
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenWidgets/skins/zenui/dialog_removeInstances.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/dialog_removeInstances.pt 2007-05-01 21:55:27 UTC (rev 5021)
+++ trunk/Products/ZenWidgets/skins/zenui/dialog_removeInstances.pt 2007-05-01 22:06:32 UTC (rev 5022)
@@ -7,7 +7,7 @@
<br/>
<div id="dialog_buttons">
<input type="submit" name="removeInstances:method"
- value="Yes"
+ value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/absolute_url_path}')" />
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenWidgets/skins/zenui/dialog_removeManufacturers.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/dialog_removeManufacturers.pt 2007-05-01 21:55:27 UTC (rev 5021)
+++ trunk/Products/ZenWidgets/skins/zenui/dialog_removeManufacturers.pt 2007-05-01 22:06:32 UTC (rev 5022)
@@ -7,7 +7,7 @@
<br/>
<div id="dialog_buttons">
<input type="submit" name="manage_deleteManufacturers:method"
- value="Yes"
+ value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/absolute_url_path}')" />
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenWidgets/skins/zenui/dialog_removeMibModules.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/dialog_removeMibModules.pt 2007-05-01 21:55:27 UTC (rev 5021)
+++ trunk/Products/ZenWidgets/skins/zenui/dialog_removeMibModules.pt 2007-05-01 22:06:32 UTC (rev 5022)
@@ -5,7 +5,7 @@
</p>
<br/>
<div id="dialog_buttons">
-<input type="submit" name="removeMibModules:method" value="Yes"
+<input type="submit" name="removeMibModules:method" value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/absolute_url_path}')" />
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenWidgets/skins/zenui/dialog_removeMonitors.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/dialog_removeMonitors.pt 2007-05-01 21:55:27 UTC (rev 5021)
+++ trunk/Products/ZenWidgets/skins/zenui/dialog_removeMonitors.pt 2007-05-01 22:06:32 UTC (rev 5022)
@@ -5,7 +5,7 @@
</p>
<br/>
<div id="dialog_buttons">
-<input type="submit" name="manage_removeMonitor:method" value="Yes"
+<input type="submit" name="manage_removeMonitor:method" value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/absolute_url_path}')" />
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenWidgets/skins/zenui/dialog_removeOSProcesses.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/dialog_removeOSProcesses.pt 2007-05-01 21:55:27 UTC (rev 5021)
+++ trunk/Products/ZenWidgets/skins/zenui/dialog_removeOSProcesses.pt 2007-05-01 22:06:32 UTC (rev 5022)
@@ -6,7 +6,7 @@
<br/>
<div id="dialog_buttons">
<input type="submit" name="removeOSProcessClasses:method"
- value="Yes"
+ value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/absolute_url_path}')" />
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenWidgets/skins/zenui/dialog_removeOrganizer.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/dialog_removeOrganizer.pt 2007-05-01 21:55:27 UTC (rev 5021)
+++ trunk/Products/ZenWidgets/skins/zenui/dialog_removeOrganizer.pt 2007-05-01 22:06:32 UTC (rev 5022)
@@ -6,7 +6,7 @@
<br/>
<div id="dialog_buttons">
<input type="submit" name="manage_deleteOrganizers:method"
- value="Yes"
+ value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/absolute_url_path}')" />
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenWidgets/skins/zenui/dialog_removeServiceClasses.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/dialog_removeServiceClasses.pt 2007-05-01 21:55:27 UTC (rev 5021)
+++ trunk/Products/ZenWidgets/skins/zenui/dialog_removeServiceClasses.pt 2007-05-01 22:06:32 UTC (rev 5022)
@@ -7,7 +7,7 @@
<br/>
<div id="dialog_buttons">
<input type="submit" name="removeServiceClasses:method"
- value="Yes"
+ value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/absolute_url_path}')" />
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenWidgets/skins/zenui/dialog_removeZenPacks.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/dialog_removeZenPacks.pt 2007-05-01 21:55:27 UTC (rev 5021)
+++ trunk/Products/ZenWidgets/skins/zenui/dialog_removeZenPacks.pt 2007-05-01 22:06:32 UTC (rev 5022)
@@ -6,7 +6,7 @@
<br/>
<div id="dialog_buttons">
<input type="submit" name="removeZenPacks:method"
- value="Yes"
+ value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/absolute_url_path}')" />
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenWidgets/skins/zenui/dialog_undeleteHistoryEvents.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/dialog_undeleteHistoryEvents.pt 2007-05-01 21:55:27 UTC (rev 5021)
+++ trunk/Products/ZenWidgets/skins/zenui/dialog_undeleteHistoryEvents.pt 2007-05-01 22:06:32 UTC (rev 5022)
@@ -5,9 +5,10 @@
</p>
<br/>
<div id="dialog_buttons">
-<input type="button" name="manage_undeleteEvents:method"
- value="Yes"
- tal:attributes="onclick string:$$('dialog').hide();;eventZenGrid.undeleteBatch()" />
+<input type="submit" name="manage_undeleteEvents:method"
+ value="OK"
+ tal:attributes="onclick string:return $$('dialog').submit_form(
+ '${here/absolute_url_path}')" />
<input id="dialog_cancel" type="button" value="Cancel"
onclick="$('dialog').hide()"/>
</div>
|
|
From: <sv...@ze...> - 2007-05-01 21:55:28
|
Author: marc
Date: 2007-05-01 17:55:27 -0400 (Tue, 01 May 2007)
New Revision: 5021
Modified:
trunk/Products/ZenModel/MonitorClass.py
trunk/Products/ZenWidgets/skins/zenui/dialog_addMonitor.pt
trunk/Products/ZenWidgets/skins/zenui/dialog_removeMonitors.pt
Log:
* Added messages to Monitor dialogs
Modified: trunk/Products/ZenModel/MonitorClass.py
===================================================================
--- trunk/Products/ZenModel/MonitorClass.py 2007-05-01 21:44:07 UTC (rev 5020)
+++ trunk/Products/ZenModel/MonitorClass.py 2007-05-01 21:55:27 UTC (rev 5021)
@@ -127,6 +127,7 @@
if child.hasObject(id):
child._delObject(id)
if REQUEST:
+ REQUEST['message'] = 'Monitor deleted'
return self.callZenScreen(REQUEST)
@@ -138,7 +139,9 @@
child.sub_class), values)
ctor = values[child.sub_class]
if id: child._setObject(id, ctor(id))
- if REQUEST: return self.callZenScreen(REQUEST)
+ if REQUEST:
+ REQUEST['message'] = 'Monitor created'
+ return self.callZenScreen(REQUEST)
def exportXmlHook(self, ofile, ignorerels):
Modified: trunk/Products/ZenWidgets/skins/zenui/dialog_addMonitor.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/dialog_addMonitor.pt 2007-05-01 21:44:07 UTC (rev 5020)
+++ trunk/Products/ZenWidgets/skins/zenui/dialog_addMonitor.pt 2007-05-01 21:55:27 UTC (rev 5021)
@@ -1,18 +1,14 @@
<h2>Add Monitor</h2>
-<p>
-What would you like to name this monitor?<br/>
-</p>
<span id="errmsg" style="color:red;"></span>
<br/>
<p style="text-align:right;">
<span id="new_id_label">ID: </span>
-<input id="new_id"
- name="id"
- tal:attributes="onblur string:checkValidId('${here/absolute_url_path}', this.id)"><br/>
+<input id="new_id" name="id"
+ tal:attributes="onblur string:checkValidId('${here/absolute_url_path}', this.id)">
+<br/>
</p>
<div id="dialog_buttons">
-<input type="submit" name="manage_addMonitor:method"
- value="Add"
+<input type="submit" name="manage_addMonitor:method" value="Add"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/absolute_url_path}')" />
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenWidgets/skins/zenui/dialog_removeMonitors.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/dialog_removeMonitors.pt 2007-05-01 21:44:07 UTC (rev 5020)
+++ trunk/Products/ZenWidgets/skins/zenui/dialog_removeMonitors.pt 2007-05-01 21:55:27 UTC (rev 5021)
@@ -1,4 +1,3 @@
-
<h2>Delete Monitors</h2>
<br/><br/>
<p>
@@ -6,10 +5,9 @@
</p>
<br/>
<div id="dialog_buttons">
-<input type="submit" name="manage_removeMonitor:method"
- value="Yes"
+<input type="submit" name="manage_removeMonitor:method" value="Yes"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/absolute_url_path}')" />
<input id="dialog_cancel" type="button" value="Cancel"
-onclick="$('dialog').hide()"/>
+ onclick="$('dialog').hide()"/>
</div>
|
