[MERGE] bunch of speed and code improvements to import, also make import more flexible (pluggable)
bzr revid: xmo@openerp.com-20110905142455-1nt310pqzyzk69cp
This commit is contained in:
Xavier Morel
commit
748086e678
|
|
@ -3,6 +3,7 @@
|
|||
import base64
|
||||
import csv
|
||||
import glob
|
||||
import itertools
|
||||
import operator
|
||||
import os
|
||||
import re
|
||||
|
|
@ -252,7 +253,7 @@ class Database(openerpweb.Controller):
|
|||
return req.make_response(db_dump,
|
||||
[('Content-Type', 'application/octet-stream; charset=binary'),
|
||||
('Content-Disposition', 'attachment; filename="' + backup_db + '.dump"')],
|
||||
{'fileToken': token}
|
||||
{'fileToken': int(token)}
|
||||
)
|
||||
except xmlrpclib.Fault, e:
|
||||
if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied':
|
||||
|
|
@ -1076,237 +1077,251 @@ class TreeView(View):
|
|||
req,'action', 'tree_but_open',[(model, id)],
|
||||
False)
|
||||
|
||||
def export_csv(fields, result):
|
||||
fp = StringIO()
|
||||
writer = csv.writer(fp, quoting=csv.QUOTE_ALL)
|
||||
|
||||
writer.writerow(fields)
|
||||
|
||||
for data in result:
|
||||
row = []
|
||||
for d in data:
|
||||
if isinstance(d, basestring):
|
||||
d = d.replace('\n',' ').replace('\t',' ')
|
||||
try:
|
||||
d = d.encode('utf-8')
|
||||
except:
|
||||
pass
|
||||
if d is False: d = None
|
||||
row.append(d)
|
||||
writer.writerow(row)
|
||||
|
||||
fp.seek(0)
|
||||
data = fp.read()
|
||||
fp.close()
|
||||
return data
|
||||
|
||||
def export_xls(fieldnames, table):
|
||||
try:
|
||||
import xlwt
|
||||
except ImportError:
|
||||
common.error(_('Import Error.'), _('Please install xlwt library to export to MS Excel.'))
|
||||
|
||||
workbook = xlwt.Workbook()
|
||||
worksheet = workbook.add_sheet('Sheet 1')
|
||||
|
||||
for i, fieldname in enumerate(fieldnames):
|
||||
worksheet.write(0, i, str(fieldname))
|
||||
worksheet.col(i).width = 8000 # around 220 pixels
|
||||
|
||||
style = xlwt.easyxf('align: wrap yes')
|
||||
|
||||
for row_index, row in enumerate(table):
|
||||
for cell_index, cell_value in enumerate(row):
|
||||
cell_value = str(cell_value)
|
||||
cell_value = re.sub("\r", " ", cell_value)
|
||||
worksheet.write(row_index + 1, cell_index, cell_value, style)
|
||||
|
||||
|
||||
fp = StringIO()
|
||||
workbook.save(fp)
|
||||
fp.seek(0)
|
||||
data = fp.read()
|
||||
fp.close()
|
||||
#return data.decode('ISO-8859-1')
|
||||
return unicode(data, 'utf-8', 'replace')
|
||||
|
||||
class Export(View):
|
||||
_cp_path = "/web/export"
|
||||
|
||||
@openerpweb.jsonrequest
|
||||
def formats(self, req):
|
||||
""" Returns all valid export formats
|
||||
|
||||
:returns: for each export format, a pair of identifier and printable name
|
||||
:rtype: [(str, str)]
|
||||
"""
|
||||
return sorted([
|
||||
controller.fmt
|
||||
for path, controller in openerpweb.controllers_path.iteritems()
|
||||
if path.startswith(self._cp_path)
|
||||
if hasattr(controller, 'fmt')
|
||||
], key=operator.itemgetter(1))
|
||||
|
||||
def fields_get(self, req, model):
|
||||
Model = req.session.model(model)
|
||||
fields = Model.fields_get(False, req.session.eval_context(req.context))
|
||||
return fields
|
||||
|
||||
@openerpweb.jsonrequest
|
||||
def get_fields(self, req, model, prefix='', name= '', field_parent=None, params={}):
|
||||
import_compat = params.get("import_compat", False)
|
||||
def get_fields(self, req, model, prefix='', parent_name= '',
|
||||
import_compat=True, parent_field_type=None):
|
||||
|
||||
fields = self.fields_get(req, model)
|
||||
field_parent_type = params.get("parent_field_type",False)
|
||||
|
||||
if import_compat and field_parent_type and field_parent_type == "many2one":
|
||||
if import_compat and parent_field_type == "many2one":
|
||||
fields = {}
|
||||
else:
|
||||
fields = self.fields_get(req, model)
|
||||
fields['.id'] = fields.pop('id') if 'id' in fields else {'string': 'ID'}
|
||||
|
||||
fields_sequence = sorted(fields.iteritems(),
|
||||
key=lambda field: field[1].get('string', ''))
|
||||
|
||||
fields.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}})
|
||||
records = []
|
||||
fields_order = fields.keys()
|
||||
fields_order.sort(lambda x,y: -cmp(fields[x].get('string', ''), fields[y].get('string', '')))
|
||||
for field_name, field in fields_sequence:
|
||||
if import_compat and field.get('readonly'):
|
||||
# If none of the field's states unsets readonly, skip the field
|
||||
if all(dict(attrs).get('readonly', True)
|
||||
for attrs in field.get('states', {}).values()):
|
||||
continue
|
||||
|
||||
for index, field in enumerate(fields_order):
|
||||
value = fields[field]
|
||||
record = {}
|
||||
if import_compat and value.get('readonly', False):
|
||||
ok = False
|
||||
for sl in value.get('states', {}).values():
|
||||
for s in sl:
|
||||
ok = ok or (s==['readonly',False])
|
||||
if not ok: continue
|
||||
|
||||
id = prefix + (prefix and '/'or '') + field
|
||||
nm = name + (name and '/' or '') + value['string']
|
||||
record.update(id=id, string= nm, action='javascript: void(0)',
|
||||
target=None, icon=None, children=[], field_type=value.get('type',False), required=value.get('required', False))
|
||||
id = prefix + (prefix and '/'or '') + field_name
|
||||
name = parent_name + (parent_name and '/' or '') + field['string']
|
||||
record = {'id': id, 'string': name,
|
||||
'value': id, 'children': False,
|
||||
'field_type': field.get('type'),
|
||||
'required': field.get('required')}
|
||||
records.append(record)
|
||||
|
||||
if len(nm.split('/')) < 3 and value.get('relation', False):
|
||||
if import_compat:
|
||||
ref = value.pop('relation')
|
||||
cfields = self.fields_get(req, ref)
|
||||
if (value['type'] == 'many2many'):
|
||||
record['children'] = []
|
||||
record['params'] = {'model': ref, 'prefix': id, 'name': nm}
|
||||
if len(name.split('/')) < 3 and 'relation' in field:
|
||||
ref = field.pop('relation')
|
||||
record['value'] += '/id'
|
||||
record['params'] = {'model': ref, 'prefix': id, 'name': name}
|
||||
|
||||
elif value['type'] == 'many2one':
|
||||
record['children'] = [id + '/id', id + '/.id']
|
||||
record['params'] = {'model': ref, 'prefix': id, 'name': nm}
|
||||
if not import_compat or field['type'] == 'one2many':
|
||||
# m2m field in import_compat is childless
|
||||
record['children'] = True
|
||||
|
||||
else:
|
||||
cfields_order = cfields.keys()
|
||||
cfields_order.sort(lambda x,y: -cmp(cfields[x].get('string', ''), cfields[y].get('string', '')))
|
||||
children = []
|
||||
for j, fld in enumerate(cfields_order):
|
||||
cid = id + '/' + fld
|
||||
cid = cid.replace(' ', '_')
|
||||
children.append(cid)
|
||||
record['children'] = children or []
|
||||
record['params'] = {'model': ref, 'prefix': id, 'name': nm}
|
||||
else:
|
||||
ref = value.pop('relation')
|
||||
cfields = self.fields_get(req, ref)
|
||||
cfields_order = cfields.keys()
|
||||
cfields_order.sort(lambda x,y: -cmp(cfields[x].get('string', ''), cfields[y].get('string', '')))
|
||||
children = []
|
||||
for j, fld in enumerate(cfields_order):
|
||||
cid = id + '/' + fld
|
||||
cid = cid.replace(' ', '_')
|
||||
children.append(cid)
|
||||
record['children'] = children or []
|
||||
record['params'] = {'model': ref, 'prefix': id, 'name': nm}
|
||||
|
||||
records.reverse()
|
||||
return records
|
||||
|
||||
@openerpweb.jsonrequest
|
||||
def save_export_lists(self, req, name, model, field_list):
|
||||
result = {'resource':model, 'name':name, 'export_fields': []}
|
||||
for field in field_list:
|
||||
result['export_fields'].append((0, 0, {'name': field}))
|
||||
return req.session.model("ir.exports").create(result, req.session.eval_context(req.context))
|
||||
|
||||
@openerpweb.jsonrequest
|
||||
def exist_export_lists(self, req, model):
|
||||
export_model = req.session.model("ir.exports")
|
||||
return export_model.read(export_model.search([('resource', '=', model)]), ['name'])
|
||||
|
||||
@openerpweb.jsonrequest
|
||||
def delete_export(self, req, export_id):
|
||||
req.session.model("ir.exports").unlink(export_id, req.session.eval_context(req.context))
|
||||
return True
|
||||
|
||||
@openerpweb.jsonrequest
|
||||
def namelist(self,req, model, export_id):
|
||||
# TODO: namelist really has no reason to be in Python (although itertools.groupby helps)
|
||||
export = req.session.model("ir.exports").read([export_id])[0]
|
||||
export_fields_list = req.session.model("ir.exports.line").read(
|
||||
export['export_fields'])
|
||||
|
||||
result = self.get_data(req, model, req.session.eval_context(req.context))
|
||||
ir_export_obj = req.session.model("ir.exports")
|
||||
ir_export_line_obj = req.session.model("ir.exports.line")
|
||||
fields_data = self.fields_info(
|
||||
req, model, map(operator.itemgetter('name'), export_fields_list))
|
||||
|
||||
field = ir_export_obj.read(export_id)
|
||||
fields = ir_export_line_obj.read(field['export_fields'])
|
||||
return dict(
|
||||
(field['name'], fields_data[field['name']])
|
||||
for field in export_fields_list)
|
||||
|
||||
name_list = {}
|
||||
[name_list.update({field['name']: result.get(field['name'])}) for field in fields]
|
||||
return name_list
|
||||
|
||||
def get_data(self, req, model, context=None):
|
||||
ids = []
|
||||
context = context or {}
|
||||
fields_data = {}
|
||||
proxy = req.session.model(model)
|
||||
def fields_info(self, req, model, export_fields):
|
||||
info = {}
|
||||
fields = self.fields_get(req, model)
|
||||
if not ids:
|
||||
f1 = proxy.fields_view_get(False, 'tree', context)['fields']
|
||||
f2 = proxy.fields_view_get(False, 'form', context)['fields']
|
||||
fields['.id'] = fields.pop('id') if 'id' in fields else {'string': 'ID'}
|
||||
|
||||
fields = dict(f1)
|
||||
fields.update(f2)
|
||||
fields.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}})
|
||||
# To make fields retrieval more efficient, fetch all sub-fields of a
|
||||
# given field at the same time. Because the order in the export list is
|
||||
# arbitrary, this requires ordering all sub-fields of a given field
|
||||
# together so they can be fetched at the same time
|
||||
#
|
||||
# Works the following way:
|
||||
# * sort the list of fields to export, the default sorting order will
|
||||
# put the field itself (if present, for xmlid) and all of its
|
||||
# sub-fields right after it
|
||||
# * then, group on: the first field of the path (which is the same for
|
||||
# a field and for its subfields and the length of splitting on the
|
||||
# first '/', which basically means grouping the field on one side and
|
||||
# all of the subfields on the other. This way, we have the field (for
|
||||
# the xmlid) with length 1, and all of the subfields with the same
|
||||
# base but a length "flag" of 2
|
||||
# * if we have a normal field (length 1), just add it to the info
|
||||
# mapping (with its string) as-is
|
||||
# * otherwise, recursively call fields_info via graft_subfields.
|
||||
# all graft_subfields does is take the result of fields_info (on the
|
||||
# field's model) and prepend the current base (current field), which
|
||||
# rebuilds the whole sub-tree for the field
|
||||
#
|
||||
# result: because we're not fetching the fields_get for half the
|
||||
# database models, fetching a namelist with a dozen fields (including
|
||||
# relational data) falls from ~6s to ~300ms (on the leads model).
|
||||
# export lists with no sub-fields (e.g. import_compatible lists with
|
||||
# no o2m) are even more efficient (from the same 6s to ~170ms, as
|
||||
# there's a single fields_get to execute)
|
||||
for (base, length), subfields in itertools.groupby(
|
||||
sorted(export_fields),
|
||||
lambda field: (field.split('/', 1)[0], len(field.split('/', 1)))):
|
||||
subfields = list(subfields)
|
||||
if length == 2:
|
||||
# subfields is a seq of $base/*rest, and not loaded yet
|
||||
info.update(self.graft_subfields(
|
||||
req, fields[base]['relation'], base, fields[base]['string'],
|
||||
subfields
|
||||
))
|
||||
else:
|
||||
info[base] = fields[base]['string']
|
||||
|
||||
def rec(fields):
|
||||
_fields = {'id': 'ID' , '.id': 'Database ID' }
|
||||
def model_populate(fields, prefix_node='', prefix=None, prefix_value='', level=2):
|
||||
fields_order = fields.keys()
|
||||
fields_order.sort(lambda x,y: -cmp(fields[x].get('string', ''), fields[y].get('string', '')))
|
||||
return info
|
||||
|
||||
for field in fields_order:
|
||||
fields_data[prefix_node+field] = fields[field]
|
||||
if prefix_node:
|
||||
fields_data[prefix_node + field]['string'] = '%s%s' % (prefix_value, fields_data[prefix_node + field]['string'])
|
||||
st_name = fields[field]['string'] or field
|
||||
_fields[prefix_node+field] = st_name
|
||||
if fields[field].get('relation', False) and level>0:
|
||||
fields2 = self.fields_get(req, fields[field]['relation'])
|
||||
fields2.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}})
|
||||
model_populate(fields2, prefix_node+field+'/', None, st_name+'/', level-1)
|
||||
model_populate(fields)
|
||||
return _fields
|
||||
return rec(fields)
|
||||
def graft_subfields(self, req, model, prefix, prefix_string, fields):
|
||||
export_fields = [field.split('/', 1)[1] for field in fields]
|
||||
return (
|
||||
(prefix + '/' + k, prefix_string + '/' + v)
|
||||
for k, v in self.fields_info(req, model, export_fields).iteritems())
|
||||
|
||||
#noinspection PyPropertyDefinition
|
||||
@property
|
||||
def content_type(self):
|
||||
""" Provides the format's content type """
|
||||
raise NotImplementedError()
|
||||
|
||||
def filename(self, base):
|
||||
""" Creates a valid filename for the format (with extension) from the
|
||||
provided base name (exension-less)
|
||||
"""
|
||||
raise NotImplementedError()
|
||||
|
||||
def from_data(self, fields, rows):
|
||||
""" Conversion method from OpenERP's export data to whatever the
|
||||
current export class outputs
|
||||
|
||||
:params list fields: a list of fields to export
|
||||
:params list rows: a list of records to export
|
||||
:returns:
|
||||
:rtype: bytes
|
||||
"""
|
||||
raise NotImplementedError()
|
||||
|
||||
@openerpweb.httprequest
|
||||
def index(self, req, data, token):
|
||||
model, fields, ids, domain, import_compat = \
|
||||
operator.itemgetter('model', 'fields', 'ids', 'domain',
|
||||
'import_compat')(
|
||||
simplejson.loads(data))
|
||||
|
||||
@openerpweb.jsonrequest
|
||||
def export_data(self, req, model, fields, ids, domain, import_compat=False, export_format="csv", context=None):
|
||||
context = req.session.eval_context(req.context)
|
||||
modle_obj = req.session.model(model)
|
||||
ids = ids or modle_obj.search(domain, context=context)
|
||||
Model = req.session.model(model)
|
||||
ids = ids or Model.search(domain, context=context)
|
||||
|
||||
field = fields.keys()
|
||||
result = modle_obj.export_data(ids, field , context).get('datas',[])
|
||||
field_names = map(operator.itemgetter('name'), fields)
|
||||
import_data = Model.export_data(ids, field_names, context).get('datas',[])
|
||||
|
||||
if not import_compat:
|
||||
field = [val.strip() for val in fields.values()]
|
||||
|
||||
if export_format == 'xls':
|
||||
return export_xls(field, result)
|
||||
if import_compat:
|
||||
columns_headers = field_names
|
||||
else:
|
||||
return export_csv(field, result)
|
||||
columns_headers = [val['label'].strip() for val in fields]
|
||||
|
||||
class Export(View):
|
||||
_cp_path = "/web/report"
|
||||
|
||||
@openerpweb.jsonrequest
|
||||
def get_report(self, req, action):
|
||||
report_srv = req.session.proxy("report")
|
||||
context = req.session.eval_context(openerpweb.nonliterals.CompoundContext(req.context, \
|
||||
action["context"]))
|
||||
return req.make_response(self.from_data(columns_headers, import_data),
|
||||
headers=[('Content-Disposition', 'attachment; filename="%s"' % self.filename(model)),
|
||||
('Content-Type', self.content_type)],
|
||||
cookies={'fileToken': int(token)})
|
||||
|
||||
args = [req.session._db, req.session._uid, req.session._password, action["report_name"], context["active_ids"], {"id": context["active_id"], "model": context["active_model"], "report_type": action["report_type"]}, context]
|
||||
report_id = report_srv.report(*args)
|
||||
report = None
|
||||
while True:
|
||||
args2 = [req.session._db, req.session._uid, req.session._password, report_id]
|
||||
report = report_srv.report_get(*args2)
|
||||
if report["state"]:
|
||||
break
|
||||
time.sleep(_REPORT_POLLER_DELAY)
|
||||
|
||||
#TODO: ok now we've got the report, and so what?
|
||||
return False
|
||||
class CSVExport(Export):
|
||||
_cp_path = '/web/export/csv'
|
||||
fmt = ('csv', 'CSV')
|
||||
|
||||
@property
|
||||
def content_type(self):
|
||||
return 'text/csv;charset=utf8'
|
||||
|
||||
def filename(self, base):
|
||||
return base + '.csv'
|
||||
|
||||
def from_data(self, fields, rows):
|
||||
fp = StringIO()
|
||||
writer = csv.writer(fp, quoting=csv.QUOTE_ALL)
|
||||
|
||||
writer.writerow(fields)
|
||||
|
||||
for data in rows:
|
||||
row = []
|
||||
for d in data:
|
||||
if isinstance(d, basestring):
|
||||
d = d.replace('\n',' ').replace('\t',' ')
|
||||
try:
|
||||
d = d.encode('utf-8')
|
||||
except:
|
||||
pass
|
||||
if d is False: d = None
|
||||
row.append(d)
|
||||
writer.writerow(row)
|
||||
|
||||
fp.seek(0)
|
||||
data = fp.read()
|
||||
fp.close()
|
||||
return data
|
||||
|
||||
class ExcelExport(Export):
|
||||
_cp_path = '/web/export/xls'
|
||||
fmt = ('xls', 'Excel')
|
||||
|
||||
@property
|
||||
def content_type(self):
|
||||
return 'application/vnd.ms-excel'
|
||||
|
||||
def filename(self, base):
|
||||
return base + '.xls'
|
||||
|
||||
def from_data(self, fields, rows):
|
||||
import xlwt
|
||||
|
||||
workbook = xlwt.Workbook()
|
||||
worksheet = workbook.add_sheet('Sheet 1')
|
||||
|
||||
for i, fieldname in enumerate(fields):
|
||||
worksheet.write(0, i, str(fieldname))
|
||||
worksheet.col(i).width = 8000 # around 220 pixels
|
||||
|
||||
style = xlwt.easyxf('align: wrap yes')
|
||||
|
||||
for row_index, row in enumerate(rows):
|
||||
for cell_index, cell_value in enumerate(row):
|
||||
if isinstance(cell_value, basestring):
|
||||
cell_value = re.sub("\r", " ", cell_value)
|
||||
worksheet.write(row_index + 1, cell_index, cell_value, style)
|
||||
|
||||
fp = StringIO()
|
||||
workbook.save(fp)
|
||||
fp.seek(0)
|
||||
data = fp.read()
|
||||
fp.close()
|
||||
return data
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
.openerp .oe-export {
|
||||
width: 100%;
|
||||
}
|
||||
.openerp .oe_export_row tr{
|
||||
background-color: #FFFFFF;
|
||||
font-size: 0.8em;
|
||||
|
|
@ -20,11 +23,6 @@
|
|||
background-color: #F3F3F3;
|
||||
}
|
||||
|
||||
.openerp .oe_export_fields_selector_export {
|
||||
width: 100%;
|
||||
height: 400px;
|
||||
}
|
||||
|
||||
.openerp .oe_export_fields_selector_left {
|
||||
width: 50%;
|
||||
}
|
||||
|
|
@ -35,9 +33,15 @@
|
|||
height: 400px;
|
||||
border: solid #999999 1px;
|
||||
}
|
||||
.openerp div#left_field_panel table {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.openerp .oe_export_fields_selector_center {
|
||||
width: 102px;
|
||||
text-align: center;
|
||||
}
|
||||
.openerp .oe_export_fields_selector_center button {
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.openerp .oe_export_fields_selector_right {
|
||||
|
|
@ -45,7 +49,7 @@
|
|||
height: 400px;
|
||||
}
|
||||
|
||||
.openerp .oe_export_fields_selector_export select{
|
||||
.openerp .oe_export_fields_selector_right select{
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
|
@ -78,8 +82,3 @@
|
|||
border: none;
|
||||
display: block;
|
||||
}
|
||||
|
||||
.openerp .oe_export_button_export {
|
||||
border: 1px solid #006;
|
||||
background-color: #F3F3F3;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -339,62 +339,23 @@ openerp.web.Database = openerp.web.Widget.extend({
|
|||
}
|
||||
});
|
||||
},
|
||||
wait_for_file: function (token, cleanup) {
|
||||
var self = this,
|
||||
cookie_name = 'fileToken',
|
||||
cookie_length = cookie_name.length;
|
||||
this.backup_timer = setInterval(function () {
|
||||
var cookies = document.cookie.split(';');
|
||||
for(var i=0; i<cookies.length; ++i) {
|
||||
var cookie = cookies[i].replace(/^\s*/, '');
|
||||
if(!cookie.indexOf(cookie_name) === 0) { continue; }
|
||||
var cookie_val = cookie.substring(cookie_length + 1);
|
||||
if(parseInt(cookie_val, 10) !== token) { continue; }
|
||||
|
||||
// clear waiter
|
||||
clearInterval(self.backup_timer);
|
||||
// clear cookie
|
||||
document.cookie = _.sprintf("%s=;expires=%s;path=/",
|
||||
cookie_name, new Date().toGMTString());
|
||||
|
||||
if (cleanup) { cleanup(); }
|
||||
}
|
||||
}, 200);
|
||||
},
|
||||
do_backup: function() {
|
||||
var self = this;
|
||||
self.$option_id.html(QWeb.render("BackupDB", self));
|
||||
|
||||
self.$option_id.find("form[name=backup_db_form]").validate({
|
||||
self.$option_id
|
||||
.html(QWeb.render("BackupDB", self))
|
||||
.find("form[name=backup_db_form]").validate({
|
||||
submitHandler: function (form) {
|
||||
$.blockUI({message:'<img src="/web/static/src/img/throbber2.gif">'});
|
||||
// need to detect when the file is done downloading (not used
|
||||
// yet, but we'll need it to fix the UI e.g. with a throbber
|
||||
// while dump is being generated), iframe load event only fires
|
||||
// when the iframe content loads, so we need to go smarter:
|
||||
// http://geekswithblogs.net/GruffCode/archive/2010/10/28/detecting-the-file-download-dialog-in-the-browser.aspx
|
||||
var $target = $('#backup-target'),
|
||||
token = new Date().getTime();
|
||||
if (!$target.length) {
|
||||
$target = $('<iframe id="backup-target" style="display: none;">')
|
||||
.appendTo(document.body)
|
||||
.load(function () {
|
||||
$.unblockUI();
|
||||
clearInterval(self.backup_timer);
|
||||
var error = this.contentDocument.body
|
||||
.firstChild.data
|
||||
.split('|');
|
||||
self.display_error({
|
||||
title: error[0],
|
||||
error: error[1]
|
||||
});
|
||||
self.session.get_file({
|
||||
form: form,
|
||||
error: function (body) {
|
||||
var error = body.firstChild.data.split('|');
|
||||
self.display_error({
|
||||
title: error[0],
|
||||
error: error[1]
|
||||
});
|
||||
}
|
||||
$(form).find('input[name=token]').val(token);
|
||||
form.submit();
|
||||
|
||||
self.wait_for_file(token, function () {
|
||||
$.unblockUI();
|
||||
},
|
||||
complete: $.unblockUI
|
||||
});
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -613,6 +613,97 @@ openerp.web.Session = openerp.web.CallbackEnabled.extend( /** @lends openerp.web
|
|||
this.module_loaded[mod] = true;
|
||||
}
|
||||
}
|
||||
},
|
||||
/**
|
||||
* Cooperative file download implementation, for ajaxy APIs.
|
||||
*
|
||||
* Requires that the server side implements an httprequest correctly
|
||||
* setting the `fileToken` cookie to the value provided as the `token`
|
||||
* parameter. The cookie *must* be set on the `/` path and *must not* be
|
||||
* `httpOnly`.
|
||||
*
|
||||
* It would probably also be a good idea for the response to use a
|
||||
* `Content-Disposition: attachment` header, especially if the MIME is a
|
||||
* "known" type (e.g. text/plain, or for some browsers application/json
|
||||
*
|
||||
* @param {Object} options
|
||||
* @param {String} [options.url] used to dynamically create a form
|
||||
* @param {Object} [options.data] data to add to the form submission. If can be used without a form, in which case a form is created from scratch. Otherwise, added to form data
|
||||
* @param {HTMLFormElement} [options.form] the form to submit in order to fetch the file
|
||||
* @param {Function} [options.success] callback in case of download success
|
||||
* @param {Function} [options.error] callback in case of request error, provided with the error body
|
||||
* @param {Function} [options.complete] called after both ``success`` and ``error` callbacks have executed
|
||||
*/
|
||||
get_file: function (options) {
|
||||
// need to detect when the file is done downloading (not used
|
||||
// yet, but we'll need it to fix the UI e.g. with a throbber
|
||||
// while dump is being generated), iframe load event only fires
|
||||
// when the iframe content loads, so we need to go smarter:
|
||||
// http://geekswithblogs.net/GruffCode/archive/2010/10/28/detecting-the-file-download-dialog-in-the-browser.aspx
|
||||
var timer, token = new Date().getTime(),
|
||||
cookie_name = 'fileToken', cookie_length = cookie_name.length,
|
||||
CHECK_INTERVAL = 1000, id = _.uniqueId('get_file_frame'),
|
||||
remove_form = false;
|
||||
|
||||
var $form, $form_data = $('<div>');
|
||||
|
||||
var complete = function () {
|
||||
if (options.complete) { options.complete(); }
|
||||
clearTimeout(timer);
|
||||
$form_data.remove();
|
||||
$target.remove();
|
||||
if (remove_form && $form) { $form.remove(); }
|
||||
};
|
||||
var $target = $('<iframe style="display: none;">')
|
||||
.attr({id: id, name: id})
|
||||
.appendTo(document.body)
|
||||
.load(function () {
|
||||
if (options.error) { options.error(this.contentDocument.body); }
|
||||
complete();
|
||||
});
|
||||
|
||||
if (options.form) {
|
||||
$form = $(options.form);
|
||||
} else {
|
||||
remove_form = true;
|
||||
$form = $('<form>', {
|
||||
action: options.url,
|
||||
method: 'POST'
|
||||
}).appendTo(document.body);
|
||||
}
|
||||
|
||||
_(_.extend({}, options.data || {},
|
||||
{session_id: this.session_id, token: token}))
|
||||
.each(function (value, key) {
|
||||
$('<input type="hidden" name="' + key + '">')
|
||||
.val(value)
|
||||
.appendTo($form_data);
|
||||
});
|
||||
|
||||
$form
|
||||
.append($form_data)
|
||||
.attr('target', id)
|
||||
.get(0).submit();
|
||||
|
||||
var waitLoop = function () {
|
||||
var cookies = document.cookie.split(';');
|
||||
// setup next check
|
||||
timer = setTimeout(waitLoop, CHECK_INTERVAL);
|
||||
for (var i=0; i<cookies.length; ++i) {
|
||||
var cookie = cookies[i].replace(/^\s*/, '');
|
||||
if (!cookie.indexOf(cookie_name === 0)) { continue; }
|
||||
var cookie_val = cookie.substring(cookie_length + 1);
|
||||
if (parseInt(cookie_val, 10) !== token) { continue; }
|
||||
|
||||
// clear cookie
|
||||
document.cookie = _.sprintf("%s=;expires=%s;path=/",
|
||||
cookie_name, new Date().toGMTString());
|
||||
if (options.success) { options.success(); }
|
||||
complete();
|
||||
return;
|
||||
}
|
||||
};
|
||||
timer = setTimeout(waitLoop, CHECK_INTERVAL);
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,18 @@
|
|||
openerp.web.data_export = function(openerp) {
|
||||
openerp.web.DataExport = openerp.web.Dialog.extend({
|
||||
template: 'ExportTreeView',
|
||||
dialog_title: 'Export Data',
|
||||
init: function(parent, dataset) {
|
||||
this._super(parent);
|
||||
this.records = {};
|
||||
this.dataset = dataset;
|
||||
this.exports = new openerp.web.DataSetSearch(
|
||||
this, 'ir.exports', this.dataset.get_context());
|
||||
},
|
||||
start: function() {
|
||||
var self = this;
|
||||
self._super(false);
|
||||
self.template = 'ExportTreeView';
|
||||
self.dialog_title = "Export Data";
|
||||
self.open({
|
||||
this._super.apply(this, arguments);
|
||||
this.open({
|
||||
modal: true,
|
||||
width: '55%',
|
||||
height: 'auto',
|
||||
|
|
@ -24,7 +27,6 @@ openerp.web.DataExport = openerp.web.Dialog.extend({
|
|||
},
|
||||
close: function(event, ui){ self.close();}
|
||||
});
|
||||
self.on_show_exists_export_list();
|
||||
self.$element.removeClass('ui-dialog-content ui-widget-content');
|
||||
self.$element.find('#add_field').click(function() {
|
||||
if ($('#field-tree-structure tr.ui-selected')) {
|
||||
|
|
@ -41,57 +43,66 @@ openerp.web.DataExport = openerp.web.Dialog.extend({
|
|||
self.$element.find('#fields_list option:selected').remove();
|
||||
});
|
||||
self.$element.find('#remove_all_field').click(function() {
|
||||
self.$element.find('#fields_list option').remove();
|
||||
self.$element.find('#fields_list').empty();
|
||||
});
|
||||
self.$element.find('#export_new_list').click(function() {
|
||||
self.on_show_save_list();
|
||||
});
|
||||
var import_comp = self.$element.find('#import_compat option:selected').val(),
|
||||
params = {
|
||||
import_compat: parseInt(import_comp)
|
||||
};
|
||||
self.rpc('/web/export/get_fields', { model: self.dataset.model, params: params }, self.on_show_data);
|
||||
this.$element.find('#export_new_list').click(this.on_show_save_list);
|
||||
|
||||
self.$element.find('#import_compat').change(function() {
|
||||
self.$element.find('#fields_list option').remove();
|
||||
var got_fields = new $.Deferred();
|
||||
this.$element.find('#import_compat').change(function() {
|
||||
self.$element.find('#fields_list').empty();
|
||||
self.$element.find('#field-tree-structure').remove();
|
||||
var import_comp = self.$element.find("#import_compat option:selected").val();
|
||||
if (import_comp) {
|
||||
var params = {
|
||||
import_compat: parseInt(import_comp)
|
||||
}
|
||||
self.rpc("/web/export/get_fields", { model: self.dataset.model, params: params}, self.on_show_data);
|
||||
}
|
||||
var import_comp = self.$element.find("#import_compat").val();
|
||||
self.rpc("/web/export/get_fields", {
|
||||
model: self.dataset.model,
|
||||
import_compat: Boolean(import_comp)
|
||||
}, function (records) {
|
||||
got_fields.resolve();
|
||||
self.on_show_data(records);
|
||||
});
|
||||
}).change();
|
||||
|
||||
return $.when(
|
||||
got_fields,
|
||||
this.rpc('/web/export/formats', {}, this.do_setup_export_formats),
|
||||
this.show_exports_list());
|
||||
},
|
||||
do_setup_export_formats: function (formats) {
|
||||
var $fmts = this.$element.find('#export_format');
|
||||
_(formats).each(function (format) {
|
||||
$fmts.append(new Option(format[1], format[0]));
|
||||
});
|
||||
},
|
||||
on_show_exists_export_list: function() {
|
||||
show_exports_list: function() {
|
||||
var self = this;
|
||||
if (self.$element.find('#saved_export_list').is(':hidden')) {
|
||||
self.$element.find('#ExistsExportList').show();
|
||||
} else {
|
||||
this.rpc('/web/export/exist_export_lists', { 'model': this.dataset.model}, function(export_list) {
|
||||
if (export_list.length) {
|
||||
self.$element.find('#ExistsExportList').append(QWeb.render('Exists.ExportList', {'existing_exports': export_list}));
|
||||
self.$element.find('#saved_export_list').change(function() {
|
||||
self.$element.find('#fields_list option').remove();
|
||||
var export_id = self.$element.find('#saved_export_list option:selected').val();
|
||||
if (export_id) {
|
||||
self.rpc('/web/export/namelist', {'model': self.dataset.model, export_id: parseInt(export_id)}, self.do_load_export_field);
|
||||
}
|
||||
});
|
||||
self.$element.find('#delete_export_list').click(function() {
|
||||
var select_exp = self.$element.find('#saved_export_list option:selected');
|
||||
if (select_exp.val()) {
|
||||
self.rpc('/web/export/delete_export', { export_id: parseInt(select_exp.val())}, {});
|
||||
select_exp.remove();
|
||||
if (self.$element.find('#saved_export_list option').length <= 1) {
|
||||
self.$element.find('#ExistsExportList').hide();
|
||||
}
|
||||
}
|
||||
});
|
||||
return;
|
||||
}
|
||||
return this.exports.read_slice(['name'], {
|
||||
domain: [['resource', '=', this.dataset.model]]
|
||||
}, function (export_list) {
|
||||
if (!export_list.length) {
|
||||
return;
|
||||
}
|
||||
self.$element.find('#ExistsExportList').append(QWeb.render('Exists.ExportList', {'existing_exports': export_list}));
|
||||
self.$element.find('#saved_export_list').change(function() {
|
||||
self.$element.find('#fields_list option').remove();
|
||||
var export_id = self.$element.find('#saved_export_list option:selected').val();
|
||||
if (export_id) {
|
||||
self.rpc('/web/export/namelist', {'model': self.dataset.model, export_id: parseInt(export_id)}, self.do_load_export_field);
|
||||
}
|
||||
});
|
||||
}
|
||||
self.$element.find('#delete_export_list').click(function() {
|
||||
var select_exp = self.$element.find('#saved_export_list option:selected');
|
||||
if (select_exp.val()) {
|
||||
self.exports.unlink([parseInt(select_exp.val(), 10)]);
|
||||
select_exp.remove();
|
||||
if (self.$element.find('#saved_export_list option').length <= 1) {
|
||||
self.$element.find('#ExistsExportList').hide();
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
},
|
||||
do_load_export_field: function(field_list) {
|
||||
var export_node = this.$element.find("#fields_list");
|
||||
|
|
@ -123,94 +134,82 @@ openerp.web.DataExport = openerp.web.Dialog.extend({
|
|||
},
|
||||
do_save_export_list: function(value) {
|
||||
var self = this;
|
||||
var export_field = self.get_fields();
|
||||
if (export_field.length) {
|
||||
self.rpc("/web/export/save_export_lists", {"model": self.dataset.model, "name":value, "field_list":export_field}, function(exp_id) {
|
||||
if (exp_id) {
|
||||
if (self.$element.find("#saved_export_list").length > 0) {
|
||||
self.$element.find("#saved_export_list").append(new Option(value, exp_id));
|
||||
} else {
|
||||
self.on_show_exists_export_list();
|
||||
}
|
||||
if (self.$element.find("#saved_export_list").is(":hidden")) {
|
||||
self.on_show_exists_export_list();
|
||||
}
|
||||
}
|
||||
});
|
||||
self.on_show_save_list();
|
||||
self.$element.find("#fields_list option").remove();
|
||||
var fields = self.get_fields();
|
||||
if (!fields.length) {
|
||||
return;
|
||||
}
|
||||
},
|
||||
on_click: function(id, result) {
|
||||
var self = this;
|
||||
self.field_id = id.split("-")[1];
|
||||
var is_loaded = 0;
|
||||
_.each(result, function(record) {
|
||||
if (record['id'] == self.field_id && (record['children']).length >= 1) {
|
||||
var model = record['params']['model'],
|
||||
prefix = record['params']['prefix'],
|
||||
name = record['params']['name'];
|
||||
$(record['children']).each(function(e, childid) {
|
||||
if (self.$element.find("tr[id='treerow-" + childid + "']").length > 0) {
|
||||
if (self.$element.find("tr[id='treerow-" + childid + "']").is(':hidden')) {
|
||||
is_loaded = -1;
|
||||
} else {
|
||||
is_loaded++;
|
||||
}
|
||||
}
|
||||
});
|
||||
if (is_loaded == 0) {
|
||||
if (self.$element.find("tr[id='treerow-" + self.field_id +"']").find('img').attr('src') === '/web/static/src/img/expand.gif') {
|
||||
if (model) {
|
||||
var import_comp = self.$element.find("#import_compat option:selected").val();
|
||||
var params = {
|
||||
import_compat: parseInt(import_comp),
|
||||
parent_field_type : record['field_type']
|
||||
}
|
||||
self.rpc("/web/export/get_fields", {
|
||||
model: model,
|
||||
prefix: prefix,
|
||||
name: name,
|
||||
field_parent : self.field_id,
|
||||
params: params
|
||||
}, function(results) {
|
||||
self.on_show_data(results);
|
||||
});
|
||||
}
|
||||
}
|
||||
} else if (is_loaded > 0) {
|
||||
self.showcontent(self.field_id, true);
|
||||
} else {
|
||||
self.showcontent(self.field_id, false);
|
||||
}
|
||||
this.exports.create({
|
||||
name: value,
|
||||
resource: this.dataset.model,
|
||||
export_fields: _(fields).map(function (field) {
|
||||
return [0, 0, {name: field}];
|
||||
})
|
||||
}, function (export_list_id) {
|
||||
if (!export_list_id) {
|
||||
return;
|
||||
}
|
||||
if (self.$element.find("#saved_export_list").length > 0) {
|
||||
self.$element.find("#saved_export_list").append(
|
||||
new Option(value, export_list_id));
|
||||
} else {
|
||||
self.show_exports_list();
|
||||
}
|
||||
if (self.$element.find("#saved_export_list").is(":hidden")) {
|
||||
self.show_exports_list();
|
||||
}
|
||||
});
|
||||
this.on_show_save_list();
|
||||
this.$element.find("#fields_list option").remove();
|
||||
},
|
||||
on_show_data: function(result) {
|
||||
on_click: function(id, record) {
|
||||
var self = this;
|
||||
var imp_cmpt = parseInt(self.$element.find("#import_compat option:selected").val());
|
||||
var current_tr = self.$element.find("tr[id='treerow-" + self.field_id + "']");
|
||||
if (current_tr.length >= 1) {
|
||||
if (!record['children']) {
|
||||
return;
|
||||
}
|
||||
var model = record['params']['model'],
|
||||
prefix = record['params']['prefix'],
|
||||
name = record['params']['name'];
|
||||
|
||||
if (!record.loaded) {
|
||||
var import_comp = self.$element.find("#import_compat").val();
|
||||
self.rpc("/web/export/get_fields", {
|
||||
model: model,
|
||||
prefix: prefix,
|
||||
parent_name: name,
|
||||
import_compat: Boolean(import_comp),
|
||||
parent_field_type : record['field_type']
|
||||
}, function(results) {
|
||||
record.loaded = true;
|
||||
self.on_show_data(results, record.id);
|
||||
});
|
||||
} else {
|
||||
self.showcontent(record.id);
|
||||
}
|
||||
},
|
||||
on_show_data: function(result, after) {
|
||||
var self = this;
|
||||
var imp_cmpt = Boolean(self.$element.find("#import_compat").val());
|
||||
|
||||
if (after) {
|
||||
var current_tr = self.$element.find("tr[id='treerow-" + after + "']");
|
||||
current_tr.addClass('open');
|
||||
current_tr.find('img').attr('src','/web/static/src/img/collapse.gif');
|
||||
current_tr.after(QWeb.render('ExportTreeView-Secondary.children', {'fields': result}));
|
||||
} else {
|
||||
self.$element.find('#left_field_panel').append(QWeb.render('ExportTreeView-Secondary', {'fields': result}));
|
||||
}
|
||||
_.each(result, function(record) {
|
||||
if ((record.field_type == "one2many") && imp_cmpt) {
|
||||
var o2m_fld = self.$element.find("tr[id='treerow-" + record.id + "']").find('#tree-column');
|
||||
o2m_fld.addClass("oe_export_readonlyfield");
|
||||
}
|
||||
if ((record.required == true) || record.required == "True") {
|
||||
self.records[record.id] = record.value;
|
||||
if (record.required) {
|
||||
var required_fld = self.$element.find("tr[id='treerow-" + record.id + "']").find('#tree-column');
|
||||
required_fld.addClass("oe_export_requiredfield");
|
||||
}
|
||||
self.$element.find("img[id='parentimg-" + record.id +"']").click(function() {
|
||||
self.on_click(this.id, result);
|
||||
self.on_click(this.id, record);
|
||||
});
|
||||
|
||||
self.$element.find("tr[id='treerow-" + record.id + "']").click(function(e) {
|
||||
if (e.shiftKey == true) {
|
||||
if (e.shiftKey) {
|
||||
var frst_click, scnd_click = '';
|
||||
if (self.row_index == 0) {
|
||||
self.row_index = this.rowIndex;
|
||||
|
|
@ -218,14 +217,14 @@ openerp.web.DataExport = openerp.web.Dialog.extend({
|
|||
$(frst_click).addClass("ui-selected");
|
||||
} else {
|
||||
if (this.rowIndex >=self.row_index) {
|
||||
for (i = (self.row_index-1); i < this.rowIndex; i++) {
|
||||
for (var i = (self.row_index-1); i < this.rowIndex; i++) {
|
||||
scnd_click = self.$element.find("tr[id^='treerow-']")[i];
|
||||
if (!$(scnd_click).find('#tree-column').hasClass("oe_export_readonlyfield")) {
|
||||
$(scnd_click).addClass("ui-selected");
|
||||
}
|
||||
}
|
||||
} else {
|
||||
for (i = (self.row_index-1); i >= (this.rowIndex-1); i--) {
|
||||
for (var i = (self.row_index-1); i >= (this.rowIndex-1); i--) {
|
||||
scnd_click = self.$element.find("tr[id^='treerow-']")[i];
|
||||
if (!$(scnd_click).find('#tree-column').hasClass("oe_export_readonlyfield")) {
|
||||
$(scnd_click).addClass("ui-selected");
|
||||
|
|
@ -236,47 +235,45 @@ openerp.web.DataExport = openerp.web.Dialog.extend({
|
|||
}
|
||||
self.row_index = this.rowIndex;
|
||||
|
||||
self.$element.find("tr[id='treerow-" + record.id + "']").keyup(function(e) {
|
||||
self.$element.find("tr[id='treerow-" + record.id + "']").keyup(function() {
|
||||
self.row_index = 0;
|
||||
});
|
||||
var o2m_selection = self.$element.find("tr[id='treerow-" + record.id + "']").find('#tree-column');
|
||||
if ($(o2m_selection).hasClass("oe_export_readonlyfield")) {
|
||||
return false;
|
||||
}
|
||||
var selected = self.$element.find("tr.ui-selected");
|
||||
if ($(this).hasClass("ui-selected") && (e.ctrlKey == true)) {
|
||||
$(this).find('a').blur();
|
||||
$(this).removeClass("ui-selected");
|
||||
} else if ($(this).hasClass("ui-selected") && (e.ctrlKey == false) && (e.shiftKey == false)) {
|
||||
selected.find('a').blur();
|
||||
selected.removeClass("ui-selected");
|
||||
$(this).find('a').focus();
|
||||
$(this).addClass("ui-selected");
|
||||
} else if (!$(this).hasClass("ui-selected") && (e.ctrlKey == false) && (e.shiftKey == false)) {
|
||||
selected.find('a').blur();
|
||||
selected.removeClass("ui-selected");
|
||||
$(this).find('a').focus();
|
||||
$(this).addClass("ui-selected");
|
||||
} else if (!$(this).hasClass("ui-selected") && (e.ctrlKey == true)) {
|
||||
$(this).find('a').focus();
|
||||
$(this).addClass("ui-selected");
|
||||
if (e.ctrlKey) {
|
||||
if ($(this).hasClass('ui-selected')) {
|
||||
$(this).removeClass('ui-selected').find('a').blur();
|
||||
} else {
|
||||
$(this).addClass('ui-selected').find('a').focus();
|
||||
}
|
||||
} else if (!e.shiftKey) {
|
||||
self.$element.find("tr.ui-selected")
|
||||
.removeClass("ui-selected").find('a').blur();
|
||||
$(this).addClass("ui-selected").find('a').focus();
|
||||
}
|
||||
return false;
|
||||
});
|
||||
|
||||
self.$element.find("tr[id='treerow-" + record.id + "']").keydown(function(e) {
|
||||
var keyCode = e.keyCode || e.which;
|
||||
arrow = {left: 37, up: 38, right: 39, down: 40 };
|
||||
var arrow = {left: 37, up: 38, right: 39, down: 40 };
|
||||
switch (keyCode) {
|
||||
case arrow.left:
|
||||
if ($(this).find('img').attr('src') === '/web/static/src/img/collapse.gif') {
|
||||
self.on_click(this.id, result);
|
||||
if ($(this).hasClass('open')) {
|
||||
self.on_click(this.id, record);
|
||||
}
|
||||
break;
|
||||
case arrow.right:
|
||||
if (!$(this).hasClass('open')) {
|
||||
self.on_click(this.id, record);
|
||||
}
|
||||
break;
|
||||
case arrow.up:
|
||||
var elem = this;
|
||||
$(elem).removeClass("ui-selected");
|
||||
while ($(elem).prev().is(":visible") == false) {
|
||||
while (!$(elem).prev().is(":visible")) {
|
||||
elem = $(elem).prev();
|
||||
}
|
||||
if (!$(elem).prev().find('#tree-column').hasClass("oe_export_readonlyfield")) {
|
||||
|
|
@ -284,15 +281,10 @@ openerp.web.DataExport = openerp.web.Dialog.extend({
|
|||
}
|
||||
$(elem).prev().find('a').focus();
|
||||
break;
|
||||
case arrow.right:
|
||||
if ($(this).find('img').attr('src') == '/web/static/src/img/expand.gif') {
|
||||
self.on_click(this.id, result);
|
||||
}
|
||||
break;
|
||||
case arrow.down:
|
||||
var elem = this;
|
||||
$(elem).removeClass("ui-selected");
|
||||
while($(elem).next().is(":visible") == false) {
|
||||
while(!$(elem).next().is(":visible")) {
|
||||
elem = $(elem).next();
|
||||
}
|
||||
if (!$(elem).next().find('#tree-column').hasClass("oe_export_readonlyfield")) {
|
||||
|
|
@ -302,13 +294,10 @@ openerp.web.DataExport = openerp.web.Dialog.extend({
|
|||
break;
|
||||
}
|
||||
});
|
||||
self.$element.find("tr[id='treerow-" + record.id + "']").dblclick(function(e) {
|
||||
self.$element.find("tr[id='treerow-" + record.id + "']").dblclick(function() {
|
||||
var $o2m_selection = self.$element.find("tr[id^='treerow-" + record.id + "']").find('#tree-column');
|
||||
if (!$o2m_selection.hasClass("oe_export_readonlyfield")) {
|
||||
var field_id = $(this).find("a").attr("id");
|
||||
if (field_id) {
|
||||
self.add_field(field_id.split('-')[1], $(this).find("a").attr("string"));
|
||||
}
|
||||
self.add_field(record.id, $(this).find("a").attr("string"));
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
@ -325,33 +314,37 @@ openerp.web.DataExport = openerp.web.Dialog.extend({
|
|||
}
|
||||
});
|
||||
},
|
||||
showcontent: function(id, flag) {
|
||||
showcontent: function(id) {
|
||||
// show & hide the contents
|
||||
var first_child = this.$element.find("tr[id='treerow-" + id + "']").find('img');
|
||||
if (flag) {
|
||||
var $this = this.$element.find("tr[id='treerow-" + id + "']");
|
||||
var is_open = $this.hasClass('open');
|
||||
$this.toggleClass('open');
|
||||
|
||||
var first_child = $this.find('img');
|
||||
if (is_open) {
|
||||
first_child.attr('src', '/web/static/src/img/expand.gif');
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
first_child.attr('src', '/web/static/src/img/collapse.gif');
|
||||
}
|
||||
var child_field = this.$element.find("tr[id^='treerow-" + id +"/']");
|
||||
var child_len = (id.split("/")).length + 1;
|
||||
for (var i = 0; i < child_field.length; i++) {
|
||||
if (flag) {
|
||||
$(child_field[i]).hide();
|
||||
} else {
|
||||
if (child_len == (child_field[i].id.split("/")).length) {
|
||||
if ($(child_field[i]).find('img').attr('src') == '/web/static/src/img/collapse.gif') {
|
||||
$(child_field[i]).find('img').attr('src', '/web/static/src/img/expand.gif');
|
||||
}
|
||||
$(child_field[i]).show();
|
||||
var $child = $(child_field[i]);
|
||||
if (is_open) {
|
||||
$child.hide();
|
||||
} else if (child_len == (child_field[i].id.split("/")).length) {
|
||||
if ($child.hasClass('open')) {
|
||||
$child.removeClass('open');
|
||||
$child.find('img').attr('src', '/web/static/src/img/expand.gif');
|
||||
}
|
||||
$child.show();
|
||||
}
|
||||
}
|
||||
},
|
||||
add_field: function(field_id, string) {
|
||||
var field_list = this.$element.find('#fields_list');
|
||||
if (this.$element.find("#fields_list option[value='" + field_id + "']") && !this.$element.find("#fields_list option[value='" + field_id + "']").length) {
|
||||
if (this.$element.find("#fields_list option[value='" + field_id + "']")
|
||||
&& !this.$element.find("#fields_list option[value='" + field_id + "']").length) {
|
||||
field_list.append(new Option(string, field_id));
|
||||
}
|
||||
},
|
||||
|
|
@ -366,31 +359,30 @@ openerp.web.DataExport = openerp.web.Dialog.extend({
|
|||
return export_field;
|
||||
},
|
||||
on_click_export_data: function() {
|
||||
var self = this;
|
||||
var export_field = {};
|
||||
var flag = true;
|
||||
self.$element.find("#fields_list option").each(function() {
|
||||
export_field[$(this).val()] = $(this).text();
|
||||
flag = false;
|
||||
$.blockUI(this.$element);
|
||||
var exported_fields = [], self = this;
|
||||
this.$element.find("#fields_list option").each(function() {
|
||||
var fieldname = self.records[$(this).val()];
|
||||
exported_fields.push({name: fieldname, label: $(this).text()});
|
||||
});
|
||||
if (flag) {
|
||||
if (_.isEmpty(exported_fields)) {
|
||||
alert('Please select fields to export...');
|
||||
return;
|
||||
}
|
||||
|
||||
var import_comp = self.$element.find("#import_compat option:selected").val(),
|
||||
export_format = self.$element.find("#export_format").val();
|
||||
|
||||
self.rpc("/web/export/export_data", {
|
||||
model: self.dataset.model,
|
||||
fields: export_field,
|
||||
ids: self.dataset.ids,
|
||||
domain: self.dataset.domain,
|
||||
import_compat: parseInt(import_comp),
|
||||
export_format: export_format
|
||||
}, function(data) {
|
||||
window.location = "data:text/csv/excel;charset=utf8," + data;
|
||||
self.close();
|
||||
exported_fields.unshift({name: 'id', label: 'External ID'});
|
||||
var export_format = this.$element.find("#export_format").val();
|
||||
this.session.get_file({
|
||||
url: '/web/export/' + export_format,
|
||||
data: {data: JSON.stringify({
|
||||
model: this.dataset.model,
|
||||
fields: exported_fields,
|
||||
ids: this.dataset.ids,
|
||||
domain: this.dataset.domain,
|
||||
import_compat: Boolean(
|
||||
this.$element.find("#import_compat").val())
|
||||
})},
|
||||
complete: $.unblockUI
|
||||
});
|
||||
},
|
||||
close: function() {
|
||||
|
|
|
|||
|
|
@ -1229,119 +1229,87 @@
|
|||
<t t-name="ExportView">
|
||||
<a id="exportview" href="javascript: void(0)" style="text-decoration: none;color: #3D3D3D;">Export</a>
|
||||
</t>
|
||||
<t t-name="ExportTreeView">
|
||||
<table class="view" style="background-color: #F3F3F3;">
|
||||
<tr>
|
||||
<td align="left">
|
||||
This wizard will export all data that matches the current search criteria to a CSV file.
|
||||
You can export all data or only the fields that can be reimported after modification.
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<table>
|
||||
<tr>
|
||||
<td class="label"><label>Export Type:</label></td>
|
||||
<td>
|
||||
<select id="import_compat" name="import_compat">
|
||||
<option value="1">Import Compatible Export</option>
|
||||
<option value="0">Export all Data</option>
|
||||
</select>
|
||||
</td>
|
||||
<td class="label"><label>Export Format</label></td>
|
||||
<td>
|
||||
<select id="export_format" name="export_format">
|
||||
<option value="csv">CSV</option>
|
||||
<option value="xls">Excel</option>
|
||||
</select>
|
||||
</td>
|
||||
<table t-name="ExportTreeView" class="oe-export"
|
||||
style="background-color: #F3F3F3;">
|
||||
<tr>
|
||||
<td colspan="3">
|
||||
This wizard will export all data that matches the current search criteria to a CSV file.
|
||||
You can export all data or only the fields that can be reimported after modification.
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="3">
|
||||
<label for="import_compat">Export Type:</label>
|
||||
<select id="import_compat" name="import_compat">
|
||||
<option value="yes">Import Compatible Export</option>
|
||||
<option value="">Export all Data</option>
|
||||
</select>
|
||||
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
<label for="export_format">Export Formats</label>
|
||||
<select id="export_format" name="export_format"></select>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td>
|
||||
<table class="oe_export_fields_selector_export">
|
||||
<tr>
|
||||
<th class="oe_view_title" valign="bottom">Available fields</th>
|
||||
<th class="oe_view_title"></th>
|
||||
<th class="oe_view_title">Fields to export
|
||||
<a style="color: blue; text-decoration: none;" href="#" id="export_new_list">Save fields list</a>
|
||||
<div id="savenewlist"></div>
|
||||
<div id="ExistsExportList"></div>
|
||||
</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="oe_export_fields_selector_left">
|
||||
<div id="left_field_panel">
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<table class="oe_export_fields_selector_center">
|
||||
<tr>
|
||||
<td align="center">
|
||||
<button id="add_field" class="oe_export_button_export">Add</button>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center">
|
||||
<button id="remove_field" class="oe_export_button_export">Remove</button>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center">
|
||||
<button id="remove_all_field" class="oe_export_button_export">Remove All</button>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
<td class="oe_export_fields_selector_right">
|
||||
<select name="fields_list" id="fields_list" multiple="multiple"></select>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</t>
|
||||
<tr>
|
||||
<th>Available fields</th>
|
||||
<th/>
|
||||
<th>
|
||||
Fields to export
|
||||
<a style="color: blue; text-decoration: none;" href="#" id="export_new_list">Save fields list</a>
|
||||
<div id="savenewlist"></div>
|
||||
<div id="ExistsExportList"></div>
|
||||
</th>
|
||||
</tr>
|
||||
<tr style="height: 400px;">
|
||||
<td class="oe_export_fields_selector_left">
|
||||
<div id="left_field_panel">
|
||||
</div>
|
||||
</td>
|
||||
<td class="oe_export_fields_selector_center">
|
||||
<button id="add_field">Add</button>
|
||||
<button id="remove_field">Remove</button>
|
||||
<button id="remove_all_field">Remove All</button>
|
||||
</td>
|
||||
<td class="oe_export_fields_selector_right">
|
||||
<select name="fields_list" id="fields_list"
|
||||
multiple="multiple"></select>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<t t-name="ExportTreeView-Secondary">
|
||||
<table id="field-tree-structure" class="oe_export_fields_selector_export" cellspacing="0" cellpadding="0">
|
||||
<tr><th class="oe_export_tree_header"> Name </th></tr>
|
||||
<t t-call="ExportTreeView-Secondary.children"/>
|
||||
</table>
|
||||
</t>
|
||||
<t t-name="ExportTreeView-Secondary.children">
|
||||
<t t-foreach="fields" t-as="field" >
|
||||
<tr t-att-id="'treerow-' + field.id" class="oe_export_row">
|
||||
<td>
|
||||
<table class="tree_grid" border="0">
|
||||
<tr class="oe_export_row">
|
||||
<t t-foreach="(field.id).split('/')" t-as="level" >
|
||||
<t t-if="(field.id).split('/')[0] != level">
|
||||
<td width="18">&nbsp;</td>
|
||||
</t>
|
||||
<table t-name="ExportTreeView-Secondary"
|
||||
id="field-tree-structure" class="oe_export_fields_selector_export"
|
||||
cellspacing="0" cellpadding="0">
|
||||
<tr><th class="oe_export_tree_header"> Name </th></tr>
|
||||
<t t-call="ExportTreeView-Secondary.children"/>
|
||||
</table>
|
||||
<tr t-name="ExportTreeView-Secondary.children"
|
||||
t-foreach="fields" t-as="field"
|
||||
t-att-id="'treerow-' + field.id" class="oe_export_row">
|
||||
<td>
|
||||
<table class="tree_grid" border="0">
|
||||
<tr class="oe_export_row">
|
||||
<t t-foreach="(field.id).split('/')" t-as="level" >
|
||||
<t t-if="(field.id).split('/')[0] != level">
|
||||
<td width="18">&nbsp;</td>
|
||||
</t>
|
||||
</t>
|
||||
<td valign="top" align="left" style="cursor: pointer;" width="18">
|
||||
<t t-if="field.children">
|
||||
<t t-if="(field.id).split('/').length != 3">
|
||||
<img t-att-id="'parentimg-' + field.id" src="/web/static/src/img/expand.gif" width="16" height="16" border="0"/>
|
||||
</t>
|
||||
<td valign="top" align="left" style="cursor: pointer;" width="18">
|
||||
<t t-if="(field.children).length >= 1">
|
||||
<t t-if="(field.id).split('/').length != 3">
|
||||
<img t-att-id="'parentimg-' + field.id" src="/web/static/src/img/expand.gif" width="16" height="16" border="0"/>
|
||||
</t>
|
||||
</t>
|
||||
</td>
|
||||
<td id="tree-column" valign="middle" align="left" style="cursor: pointer;">
|
||||
<a t-att-id="'export-' + field.id" t-att-string="field.string" href="javascript: void(0);" style="text-decoration: none;">
|
||||
<t t-esc="field.string"/>
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
</t>
|
||||
</t>
|
||||
</t>
|
||||
</td>
|
||||
<td id="tree-column" valign="middle" align="left" style="cursor: pointer;">
|
||||
<a t-att-id="'export-' + field.id" t-att-string="field.string" href="javascript: void(0);" style="text-decoration: none;">
|
||||
<t t-esc="field.string"/>
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<t t-name="ExportNewList">
|
||||
<tr>
|
||||
|
|
|
|||
Loading…
Reference in New Issue