vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

[minor] fixes to data import tool, docs and lead

Browse source
This commit is contained in:
Rushabh Mehta 2013-08-02 15:16:58 +05:30
parent 785f1d9c3b
commit aa46bb12be
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/page/data_import_tool/data_import_tool.js
View file

@ -111,7 +111,7 @@ wn.pages['data-import-tool'].onload = function(wrapper) {
});
if(r.message.length > 1) {
$('<br><span>All Tables:</span><br>').appendTo('#dit-download');
$('<br><span>All Tables (Main + Child Tables):</span><br>').appendTo('#dit-download');
var link = wrapper
.add_template_download_link(r.message[0])
.data('all_doctypes', "Yes")

14
core/page/data_import_tool/data_import_tool.py
View file

@ -34,7 +34,7 @@ def get_template():
webnotes.check_admin_or_system_manager()
doctype = webnotes.form_dict.doctype
parenttype = webnotes.form_dict.parent_doctype
all_doctypes = webnotes.form_dict.all_doctypes
all_doctypes = webnotes.form_dict.all_doctypes=="Yes"
with_data = webnotes.form_dict.with_data
column_start_end = {}
@ -167,7 +167,7 @@ def get_template():
def add_data():
def add_data_row(row_group, dt, d, rowidx):
if len(row_group) < rowidx + 1:
row_group.append([""] * len(columns))
row_group.append([""] * (len(columns) + 1))
row = row_group[rowidx]
for i, c in enumerate(columns[column_start_end[dt].start:column_start_end[dt].end]):
row[column_start_end[dt].start + i + 1] = d.get(c, "")
@ -177,14 +177,14 @@ def get_template():
% doctype, as_dict=1)
for doc in data:
# add main table
# add extra quote to modified timestamp to preserve formatting
doc.modified = '"'+ doc.modified+'"'
row_group = []
add_data_row(row_group, doctype, doc, 0)
# add child tables
if all_doctypes:
# add extra quote to modified timestamp to preserve formatting
doc.modified = '"'+ doc.modified+'"'
# add child tables
for child_doctype in doctypes[1:]:
for ci, child in enumerate(webnotes.conn.sql("""select * from `tab%s`
where parent=%s""" % (child_doctype, "%s"), doc.name, as_dict=1)):
@ -314,7 +314,7 @@ def upload():
return doclist
else:
d = webnotes._dict(zip(columns, rows[idx][1:]))
d = webnotes._dict(zip(columns, rows[start_idx][1:]))
d['doctype'] = doctype
return [d]