Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
仰若水
frappe
Commits
d53b87e3
Commit
d53b87e3
authored
7 years ago
by
mbauskar
Browse files
Options
Download
Plain Diff
Merge branch 'hotfix'
parents
91e705e3
8d808253
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
frappe/__init__.py
+1
-1
frappe/__init__.py
frappe/public/js/frappe/ui/page.js
+2
-1
frappe/public/js/frappe/ui/page.js
with
3 additions
and
2 deletions
+3
-2
frappe/__init__.py
View file @
d53b87e3
...
...
@@ -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
()
...
...
This diff is collapsed.
Click to expand it.
frappe/public/js/frappe/ui/page.js
View file @
d53b87e3
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help