Commit 7ecfeb8c authored by LE GAC Renaud's avatar LE GAC Renaud
Browse files

Fix a bug in the views/harvester/layout.html.

parent ef1c6948
......@@ -3,7 +3,7 @@
#--------------------------------------------------------------------------
# The python controller return:
# - collection_logs (list of MsgCollection) one for each collection
# - harvester (Storage)
# - harvester (Storage/Row)
# - logs (list of MSg) one for each publication
# - selector (Selector)
#--------------------------------------------------------------------------
......@@ -17,6 +17,7 @@
# - export python variable to the javascript
#
#--------------------------------------------------------------------------
import gluon
import json
from datetime import datetime
......@@ -139,6 +140,14 @@
response.write(P(delta, _style="".join(style)))
#
# convert the harvester
# either Storage (run_all) or a Row depending on the controller
#
if isinstance(harvester, gluon.dal.Row):
harvester = harvester.as_dict()
pass
#
# Export python variables to the javascript
#
......@@ -148,7 +157,7 @@
"divlogs = '%s'" % divlogs,
"gridStat",
"gridLog",
"harvester = %s" % json.dumps(harvester.as_dict()),
"harvester = %s" % json.dumps(harvester),
"menu",
"trAction = '%s'" % T('Action'),
"trAdded = '%s'" % T('Added'),
......@@ -290,13 +299,13 @@
renderer: rTitle,
summaryRenderer: rTotal
},
{text: trFound, dataIndex: 'found', flex: 1, summaryType: 'sum'},
{text: trExisting, dataIndex: 'idle', flex: 1, summaryType: 'sum'},
{text: trAdded, dataIndex: 'add', flex: 1, summaryType: 'sum'},
{text: trModified, dataIndex: 'modify', flex: 1, summaryType: 'sum'},
{text: trRejected, dataIndex: 'reject', flex: 1, summaryType: 'sum'},
{text: trLost, dataIndex: 'lost', flex: 1, summaryType: 'sum'},
{text: trError, dataIndex: 'error', flex: 1}
{align: 'right', text: trFound, dataIndex: 'found', flex: 1, summaryType: 'sum'},
{align: 'right', text: trExisting, dataIndex: 'idle', flex: 1, summaryType: 'sum'},
{align: 'right', text: trAdded, dataIndex: 'add', flex: 1, summaryType: 'sum'},
{align: 'right', text: trModified, dataIndex: 'modify', flex: 1, summaryType: 'sum'},
{align: 'right', text: trRejected, dataIndex: 'reject', flex: 1, summaryType: 'sum'},
{align: 'right', text: trLost, dataIndex: 'lost', flex: 1, summaryType: 'sum'},
{align: 'right', text: trError, dataIndex: 'error', flex: 1}
],
collapsible: true,
features: [{ftype:'summary'}],
......
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