Sfoglia il codice sorgente

Merge pull request #1753 from anandpdoshi/fix/data-import-nestedset-sorting

[fix] Data Import Template with Data: Sort by  when nested set model
version-14
Rushabh Mehta 9 anni fa
parent
commit
48685821a8
2 ha cambiato i file con 14 aggiunte e 8 eliminazioni
  1. +6
    -7
      frappe/core/page/data_import_tool/data_import_tool.json
  2. +8
    -1
      frappe/core/page/data_import_tool/exporter.py

+ 6
- 7
frappe/core/page/data_import_tool/data_import_tool.json Vedi File

@@ -1,20 +1,19 @@
{
"creation": "2012-06-14 15:07:25.000000",
"content": null,
"creation": "2012-06-14 15:07:25",
"docstatus": 0,
"doctype": "Page",
"icon": "icon-upload",
"idx": 1,
"modified": "2014-02-13 16:09:27.000000",
"modified": "2016-05-11 03:37:53.385693",
"modified_by": "Administrator",
"module": "Core",
"name": "data-import-tool",
"owner": "Administrator",
"page_name": "data-import-tool",
"roles": [
{
"role": "System Manager"
}
],
"roles": [],
"script": null,
"standard": "Yes",
"style": null,
"title": "Data Import Tool"
}

+ 8
- 1
frappe/core/page/data_import_tool/exporter.py Vedi File

@@ -177,8 +177,15 @@ def get_template(doctype=None, parent_doctype=None, all_doctypes="No", with_data
if with_data=='Yes':
frappe.permissions.can_export(parent_doctype, raise_exception=True)

# sort nested set doctypes by `lft asc`
order_by = None
table_columns = frappe.db.get_table_columns(parent_doctype)
if 'lft' in table_columns and 'rgt' in table_columns:
order_by = '`tab{doctype}`.`lft` asc'.format(doctype=parent_doctype)

# get permitted data only
data = frappe.get_list(doctype, fields=["*"], limit_page_length=None)
data = frappe.get_list(doctype, fields=["*"], limit_page_length=None, order_by=order_by)

for doc in data:
op = docs_to_export.get("op")
names = docs_to_export.get("name")


Caricamento…
Annulla
Salva