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

fix: frappe.confirm fixes

Browse source
This commit is contained in:
Gavin D'souza 2020-01-07 12:32:40 +05:30
parent 9bf4221d45
commit ef54a4ec5d
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
frappe/public/js/frappe/form/toolbar.js
View file

@ -80,10 +80,12 @@ frappe.ui.form.Toolbar = Class.extend({
const title_field = this.frm.meta.title_field || '';
const doctype = this.frm.doctype;
let confirm_message=null;
if (new_name) {
const warning = __("This cannot be undone");
const message = __("Are you sure you want to merge {0} with {1}?", [docname.bold(), new_name.bold()]);
const confirm_message = message + "<br><b>" + warning + "<b>";
confirm_message = `${message}<br><b>${warning}<b>`;
}
let rename_document = () => {
@ -109,7 +111,9 @@ frappe.ui.form.Toolbar = Class.extend({
this.show_unchanged_document_alert();
resolve();
} else if (merge) {
frappe.confirm(confirm_message, function() { rename_document().then(resolve).catch(reject) }, reject);
frappe.confirm(confirm_message, () => {
rename_document().then(resolve).catch(reject);
}, reject);
} else {
rename_document().then(resolve).catch(reject);
}

4
frappe/public/js/frappe/model/model.js
View file

@ -557,8 +557,8 @@ $.extend(frappe.model, {
var d = new frappe.ui.Dialog({
title: __("Rename {0}", [__(docname)]),
fields: [
{label:__("New Name"), fieldname: "new_name", fieldtype:"Data", reqd:1, "default": docname},
{label:merge_label, fieldtype:"Check", fieldname:"merge"},
{label: __("New Name"), fieldname: "new_name", fieldtype: "Data", reqd: 1, "default": docname},
{label: merge_label, fieldtype: "Check", fieldname: "merge"},
]
});