Commit 345b357b authored by Sebastien Robin's avatar Sebastien Robin

small fixes and cosmetics improvements on javascript watcher of ERP5

parent b14e59e7
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
</item> </item>
<item> <item>
<key> <string>priority</string> </key> <key> <string>priority</string> </key>
<value> <float>1.0</float> </value> <value> <float>2.0</float> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
......
...@@ -52,17 +52,15 @@ ...@@ -52,17 +52,15 @@
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
#from Products.ERP5Type.Log import log\n
#log("getMessageList", context.getMessageTempObjectList())\n
\n
# searching\n # searching\n
# processing_node column is manage by methods called by getMessageTempObjectList\n # processing_node column is manage by methods called by getMessageTempObjectList\n
if kw[\'processing_node\'] == \'\':\n if kw.get(\'processing_node\', None) == \'\':\n
del kw[\'processing_node\']\n del kw[\'processing_node\']\n
\n \n
#key_list_to_search = [x for (x,y) in [(k,kw[k]) for k in [\'uid_activity\',\'str_object_path\',\'method_id\',\'retry\',\'processing\']] if y != \'\']\n #key_list_to_search = [x for (x,y) in [(k,kw[k]) for k in [\'uid_activity\',\'str_object_path\',\'method_id\',\'retry\',\'processing\']] if y != \'\']\n
message_kw = dict([(k,kw[k]) for k in [\'uid_activity\',\'str_object_path\',\'method_id\',\'retry\',\'processing\'] if not(kw.get(k) in (\'\',None))])\n
\n \n
message_list = context.getMessageTempObjectList(**kw)\n message_list = context.getMessageTempObjectList(**message_kw)\n
message_list_to_show = []\n message_list_to_show = []\n
while len(message_list) > 0:\n while len(message_list) > 0:\n
message = message_list.pop(0)\n message = message_list.pop(0)\n
......
...@@ -74,9 +74,10 @@ ...@@ -74,9 +74,10 @@
type: \'POST\',\n type: \'POST\',\n
timeout: 10000,\n timeout: 10000,\n
success: function (response) {\n success: function (response) {\n
var i, data;\n var i, data, today = new Date();\n
data = JSON.parse(response);\n data = JSON.parse(response);\n
html_content =\n html_content =\n
\'Date : \' + today.toTimeString() +\n
\'<table>\' +\n \'<table>\' +\n
\' <tr>\' +\n \' <tr>\' +\n
\' <th>Type</th>\'+\n \' <th>Type</th>\'+\n
......
41053 41054
\ No newline at end of file \ No newline at end of file
Acquired Property | view Acquired Property | view
Action Information | view Action Information | view
Activity Tool | watch_report
Alarm Tool | alarm_report Alarm Tool | alarm_report
Alarm Tool | view Alarm Tool | view
Alarm | call_active_sense Alarm | call_active_sense
......
testActivityTool
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment