Merge branch 'v12-pre-release' into version-12

Author: sahil28297

frappe/__init__.py

@@ -23,7 +23,7 @@
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '12.7.1'
+__version__ = '12.7.2'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/core/doctype/data_import_beta/data_import_beta.js

@@ -91,7 +91,13 @@ frappe.ui.form.on('Data Import Beta', {
 				() => frappe.set_route('List', frm.doc.reference_doctype)
 			);
 		}
+	},
+
+	onload_post_render(frm) {
+		frm.trigger('update_primary_action');
+	},
 
+	update_primary_action(frm) {
 		frm.disable_save();
 		if (frm.doc.status !== 'Success') {
 			if (!frm.is_new() && frm.doc.import_file) {
@@ -177,8 +183,8 @@ frappe.ui.form.on('Data Import Beta', {
 	start_import(frm) {
 		frm
 			.call({
-				doc: frm.doc,
-				method: 'start_import',
+				method: 'form_start_import',
+				args: { data_import: frm.doc.name },
 				btn: frm.page.btn_primary
 			})
 			.then(r => {
@@ -222,6 +228,7 @@ frappe.ui.form.on('Data Import Beta', {
 
 	import_file(frm) {
 		frm.toggle_display('section_import_preview', frm.doc.import_file);
+		frm.trigger('update_primary_action');
 		if (!frm.doc.import_file) {
 			frm.get_field('import_preview').$wrapper.empty();
 			return;
@@ -235,7 +242,6 @@ frappe.ui.form.on('Data Import Beta', {
 
 		frm
 			.call({
-				doc: frm.doc,
 				method: 'get_preview_from_template',
 				args: { data_import: frm.doc.name, import_file: frm.doc.import_file },
 				error_handlers: {

frappe/core/doctype/data_import_beta/data_import_beta.py

@@ -83,7 +83,7 @@ def start_import(data_import):
 		i.import_data()
 	except:
 		frappe.db.rollback()
-		data_import.db_set('status', 'Error')
+		data_import.db_set("status", "Error")
 		frappe.log_error(title=data_import.name)
 	finally:
 		frappe.flags.in_import = False

frappe/core/doctype/data_import_beta/test_exporter.py

@@ -4,6 +4,7 @@
 from __future__ import unicode_literals
 
 import unittest
+import six
 import frappe
 from frappe.core.doctype.data_import_beta.exporter import Exporter
 from frappe.core.doctype.data_import_beta.test_importer import (
@@ -17,6 +18,9 @@ def setUp(self):
 		create_doctype_if_not_exists(doctype_name)
 
 	def test_exports_specified_fields(self):
+		if six.PY2:
+			return
+
 		if not frappe.db.exists(doctype_name, "Test"):
 			doc = frappe.get_doc(
 				doctype=doctype_name,
@@ -91,6 +95,9 @@ def test_exports_specified_fields(self):
 		self.assertEqual(len(csv_array), 3)
 
 	def test_export_csv_response(self):
+		if six.PY2:
+			return
+
 		e = Exporter(
 			doctype_name,
 			export_fields={doctype_name: ["title", "description"]},

frappe/public/js/frappe/data_import/import_preview.js

@@ -81,7 +81,7 @@ frappe.data_import.ImportPreview = class ImportPreview {
 				</span>`;
 				return {
 					id: frappe.utils.get_random(6),
-					name: col.header_title || df.label,
+					name: col.header_title || (df ? df.label : 'Untitled Column'),
 					content: column_title,
 					skip_import: true,
 					editable: false,