Browse Source

Merge branch 'hotfix'

version-14
mbauskar 8 years ago
parent
commit
d53b87e39d
2 changed files with 3 additions and 2 deletions
  1. +1
    -1
      frappe/__init__.py
  2. +2
    -1
      frappe/public/js/frappe/ui/page.js

+ 1
- 1
frappe/__init__.py View File

@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
from .exceptions import *
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"

local = Local()


+ 2
- 1
frappe/public/js/frappe/ui/page.js View File

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

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


Loading…
Cancel
Save