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

fix: Hide primary action when import in progress

Browse source
This commit is contained in:
Faris Ansari 2019-10-28 23:00:15 +05:30
parent e601e9c4ce
commit 733f2fdee5
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
frappe/core/doctype/data_import_beta/data_import_beta.js
View file

@ -4,6 +4,7 @@
frappe.ui.form.on('Data Import Beta', {
setup(frm) {
frappe.realtime.on('data_import_refresh', ({ data_import }) => {
frm.import_in_progress = false;
if (data_import !== frm.doc.name) return;
frappe.model.clear_doc('Data Import Beta', frm.doc.name);
frappe.model.with_doc('Data Import Beta', frm.doc.name).then(() => {
@ -11,6 +12,7 @@ frappe.ui.form.on('Data Import Beta', {
});
});
frappe.realtime.on('data_import_progress', data => {
frm.import_in_progress = true;
if (data.data_import !== frm.doc.name) {
return;
}
@ -81,7 +83,9 @@ frappe.ui.form.on('Data Import Beta', {
}
if (frm.doc.status !== 'Success') {
if (!frm.is_new() && frm.doc.import_file) {
if (frm.import_in_progress) {
frm.disable_save();
} else if (!frm.is_new() && frm.doc.import_file) {
let label = frm.doc.status === 'Pending' ? __('Start Import') : __('Retry');
frm.page.set_primary_action(label, () => frm.events.start_import(frm));
} else {
@ -131,6 +135,10 @@ frappe.ui.form.on('Data Import Beta', {
doc: frm.doc,
method: 'start_import',
btn: frm.page.btn_primary
}).then(r => {
if (r.message === true) {
frm.disable_save();
}
});
},

3
frappe/core/doctype/data_import_beta/data_import_beta.py
View file

@ -50,6 +50,9 @@ class DataImportBeta(Document):
data_import=self.name,
now=frappe.conf.developer_mode or frappe.flags.in_test,
)
return True
return False
def export_errored_rows(self):
return self.get_importer().export_errored_rows()