Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Aaron Chen
erp5
Commits
a3230950
Commit
a3230950
authored
Aug 05, 2011
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Really fix alarms wrt ActiveResult cleanup
cf commit
b9ceb45e
parent
f677ab02
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
4 deletions
+3
-4
product/ERP5/Document/Alarm.py
product/ERP5/Document/Alarm.py
+1
-2
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ActiveProcess_sense.xml
...mplateItem/portal_skins/erp5_core/ActiveProcess_sense.xml
+1
-1
product/ERP5/bootstrap/erp5_core/bt/revision
product/ERP5/bootstrap/erp5_core/bt/revision
+1
-1
No files found.
product/ERP5/Document/Alarm.py
View file @
a3230950
...
@@ -37,7 +37,6 @@ from Products.ERP5Type import Permissions, PropertySheet
...
@@ -37,7 +37,6 @@ from Products.ERP5Type import Permissions, PropertySheet
from
Products.ERP5Type.XMLObject
import
XMLObject
from
Products.ERP5Type.XMLObject
import
XMLObject
from
Products.ERP5Security.ERP5UserManager
import
SUPER_USER
from
Products.ERP5Security.ERP5UserManager
import
SUPER_USER
from
Products.ERP5.mixin.periodicity
import
PeriodicityMixin
from
Products.ERP5.mixin.periodicity
import
PeriodicityMixin
from
zLOG
import
INFO
class
Alarm
(
XMLObject
,
PeriodicityMixin
):
class
Alarm
(
XMLObject
,
PeriodicityMixin
):
"""
"""
...
@@ -204,7 +203,7 @@ class Alarm(XMLObject, PeriodicityMixin):
...
@@ -204,7 +203,7 @@ class Alarm(XMLObject, PeriodicityMixin):
# active process but no method_id is defined
# active process but no method_id is defined
for
result
in
process
.
getResultList
():
for
result
in
process
.
getResultList
():
# This is useful is result is returned as a Return instance
# This is useful is result is returned as a Return instance
if
result
.
severity
>
INFO
:
if
result
.
isError
()
:
return
True
return
True
# This is the default case
# This is the default case
if
getattr
(
result
,
'result'
,
False
):
if
getattr
(
result
,
'result'
,
False
):
...
...
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ActiveProcess_sense.xml
View file @
a3230950
...
@@ -56,7 +56,7 @@ for result in context.getResultList():\n
...
@@ -56,7 +56,7 @@ for result in context.getResultList():\n
if result is None:\n
if result is None:\n
continue # Workaround for bogus results\n
continue # Workaround for bogus results\n
# This is useful is result is returned as a Return instance\n
# This is useful is result is returned as a Return instance\n
if result.
severity >
result.INFO
:\n
if result.
isError()
:\n
return True\n
return True\n
# This is the default case\n
# This is the default case\n
if getattr(result, \'result\', False):\n
if getattr(result, \'result\', False):\n
...
...
product/ERP5/bootstrap/erp5_core/bt/revision
View file @
a3230950
40972
40973
\ No newline at end of file
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment