Quellcode durchsuchen

Merge branch 'hotfix'

version-14
mbauskar vor 8 Jahren
Ursprung
Commit
d53b87e39d
2 geänderte Dateien mit 3 neuen und 2 gelöschten Zeilen
  1. +1
    -1
      frappe/__init__.py
  2. +2
    -1
      frappe/public/js/frappe/ui/page.js

+ 1
- 1
frappe/__init__.py Datei anzeigen

@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
from .exceptions import * from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template


__version__ = '8.5.0'
__version__ = '8.5.1'
__title__ = "Frappe Framework" __title__ = "Frappe Framework"


local = Local() local = Local()


+ 2
- 1
frappe/public/js/frappe/ui/page.js Datei anzeigen

@@ -272,10 +272,11 @@ frappe.ui.Page = Class.extend({
}, },


add_inner_button: function(label, action, group) { add_inner_button: function(label, action, group) {
var me = this;
let _action = function() { let _action = function() {
let btn = $(this); let btn = $(this);
let response = action(); let response = action();
this.btn_disable_enable(btn, response);
me.btn_disable_enable(btn, response);
}; };
if(group) { if(group) {
var $group = this.get_inner_group_button(group); var $group = this.get_inner_group_button(group);


Laden…
Abbrechen
Speichern