Quellcode durchsuchen

feat(toolbar.js model.js): Add freeze message when renaming document

(cherry picked from commit 45c9cc4442)

# Conflicts:
#	frappe/public/js/frappe/form/toolbar.js
version-14
coffee-dev-sl vor 3 Jahren
committed by Gavin D'souza
Ursprung
Commit
b1d83fe0db
2 geänderte Dateien mit 7 neuen und 1 gelöschten Zeilen
  1. +4
    -1
      frappe/public/js/frappe/form/toolbar.js
  2. +3
    -0
      frappe/public/js/frappe/model/model.js

+ 4
- 1
frappe/public/js/frappe/form/toolbar.js Datei anzeigen

@@ -103,7 +103,9 @@ frappe.ui.form.Toolbar = class Toolbar {
docname,
name: new_name,
title: new_title,
merge
merge,
freeze: true,
freeze_message: __("Updating related fields...")
}).then(new_docname => {
if (new_name != docname) {
$(document).trigger("rename", [doctype, docname, new_docname || new_name]);
@@ -172,6 +174,7 @@ frappe.ui.form.Toolbar = class Toolbar {
d.show();
d.set_primary_action(__("Rename"), (values) => {
d.disable_primary_action();
d.hide();
this.rename_document_title(values.name, values.title, values.merge)
.then(() => {
d.hide();


+ 3
- 0
frappe/public/js/frappe/model/model.js Datei anzeigen

@@ -615,10 +615,13 @@ $.extend(frappe.model, {
});

d.set_primary_action(__("Rename"), function() {
d.hide();
var args = d.get_values();
if(!args) return;
return frappe.call({
method:"frappe.rename_doc",
freeze: true,
freeze_message: "Updating related fields...",
args: {
doctype: doctype,
old: docname,


Laden…
Abbrechen
Speichern