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
d54b2188
Commit
d54b2188
authored
7 years ago
by
Saurabh
Browse files
Options
Download
Plain Diff
Merge branch 'hotfix'
parents
e4630bdb
866e0a3b
develop
v11.1.5
v11.1.4
v11.1.3
v11.1.2
v11.1.1
v11.1.0
v11.0.3
v11.0.3-beta.51
v11.0.3-beta.50
v11.0.3-beta.49
v11.0.3-beta.48
v11.0.3-beta.47
v11.0.3-beta.46
v11.0.3-beta.45
v11.0.3-beta.44
v11.0.3-beta.43
v11.0.3-beta.42
v11.0.3-beta.41
v11.0.3-beta.40
v11.0.3-beta.39
v11.0.3-beta.38
v11.0.3-beta.37
v11.0.3-beta.36
v11.0.3-beta.35
v11.0.3-beta.34
v11.0.3-beta.33
v11.0.3-beta.32
v11.0.3-beta.31
v11.0.3-beta.30
v11.0.3-beta.29
v11.0.3-beta.28
v11.0.3-beta.27
v11.0.3-beta.26
v11.0.3-beta.25
v11.0.3-beta.24
v11.0.3-beta.23
v11.0.3-beta.22
v11.0.3-beta.21
v11.0.3-beta.20
v11.0.3-beta.19
v11.0.3-beta.18
v11.0.3-beta.17
v11.0.3-beta.16
v11.0.3-beta.15
v11.0.3-beta.14
v11.0.3-beta.13
v11.0.3-beta.12
v11.0.3-beta.11
v11.0.3-beta.10
v11.0.3-beta.9
v11.0.3-beta.8
v11.0.3-beta.7
v11.0.3-beta.6
v11.0.3-beta.5
v11.0.3-beta.4
v11.0.3-beta.3
v11.0.3-beta.2
v11.0.3-beta.1
v11.0.2
v11.0.1
v11.0.0-beta
v10.1.71
v10.1.70
v10.1.69
v10.1.68
v10.1.67
v10.1.66
v10.1.65
v10.1.64
v10.1.63
v10.1.62
v10.1.61
v10.1.60
v10.1.59
v10.1.58
v10.1.57
v10.1.56
v10.1.55
v10.1.54
v10.1.53
v10.1.52
v10.1.51
v10.1.50
v10.1.49
v10.1.49-beta.1
v10.1.48
v10.1.47
v10.1.46
v10.1.45
v10.1.44
v10.1.43
v10.1.42
v10.1.41
v10.1.40
v10.1.39
v10.1.38
v10.1.37
v10.1.36
v10.1.35
v10.1.34
v10.1.33
v10.1.32
v10.1.31
v10.1.30
v10.1.29
v10.1.28
v10.1.27
v10.1.26
v10.1.25
v10.1.24
v10.1.23
v10.1.22
v10.1.21
v10.1.20
v10.1.19
v10.1.18
v10.1.17
v10.1.16
v10.1.15
v10.1.14
v10.1.13
v10.1.12
v10.1.11
v10.1.10
v10.1.9
v10.1.8
v10.1.7
v10.1.6
v10.1.5
v10.1.4
v10.1.3
v10.1.2
v10.1.1
v10.1.0
v10.0.25
v10.0.24
v10.0.23
v10.0.22
v10.0.21
v10.0.20
v10.0.19
v10.0.18
v10.0.17
v10.0.16
v10.0.15
v10.0.14
v10.0.13
v10.0.12
v10.0.11
v10.0.10
v10.0.9
v10.0.8
v10.0.7
v10.0.6
v10.0.5
v10.0.4
v10.0.3
v10.0.2
v10.0.1
v10.0.0
v9.2.25
v9.2.24
v9.2.23
v9.2.22
v9.2.21
v9.2.20
v9.2.19
v9.2.18
v9.2.17
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
frappe/__init__.py
+1
-1
frappe/__init__.py
frappe/core/page/usage_info/usage_info.html
+6
-4
frappe/core/page/usage_info/usage_info.html
frappe/public/js/frappe/form/controls/dynamic_link.js
+12
-6
frappe/public/js/frappe/form/controls/dynamic_link.js
frappe/public/js/frappe/views/reports/query_report.js
+22
-11
frappe/public/js/frappe/views/reports/query_report.js
with
41 additions
and
22 deletions
+41
-22
frappe/__init__.py
View file @
d54b2188
...
...
@@ -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__
=
'9.2.1
6
'
__version__
=
'9.2.1
7
'
__title__
=
"Frappe Framework"
local
=
Local
()
...
...
This diff is collapsed.
Click to expand it.
frappe/core/page/usage_info/usage_info.html
View file @
d54b2188
<div>
{% if limits.
expiry
%}
{% if limits.
upgrade_url
%}
<div
class=
"upgrade-message padding"
style=
"border-bottom: 1px solid #d0d8dc;"
>
<h4>
{{ __("You have {0} days left in your subscription", [days_to_expiry]) }}
</h4>
{% if limits.expiry %}
<h4>
{{ __("You have {0} days left in your subscription", [days_to_expiry]) }}
</h4>
{%elif%}
<h4>
{{ __("You have subscribed for one user free plan") }}
</h4>
{% endif %}
{% if limits.upgrade_url %}
<p>
Upgrade to a premium plan with more users, storage and priority support.
</p>
<button
class=
"btn btn-primary btn-sm primary-action"
>
Upgrade
</button>
{% endif %}
</div>
{% endif %}
...
...
This diff is collapsed.
Click to expand it.
frappe/public/js/frappe/form/controls/dynamic_link.js
View file @
d54b2188
...
...
@@ -7,13 +7,19 @@ frappe.ui.form.ControlDynamicLink = frappe.ui.form.ControlLink.extend({
//for dialog box
return
cur_dialog
.
get_value
(
this
.
df
.
options
);
}
if
(
cur_frm
==
null
&&
cur_list
){
//for list page
let
list_filter
=
cur_list
.
wrapper
.
find
(
"
input[data-fieldname*=
"
+
this
.
df
.
options
+
"
]
"
);
if
(
list_filter
.
length
>
0
)
{
return
list_filter
.
val
();
if
(
!
cur_frm
)
{
const
selector
=
`input[data-fieldname="
${
this
.
df
.
options
}
"]`
;
let
input
=
null
;
if
(
cur_list
)
{
// for list page
input
=
cur_list
.
wrapper
.
find
(
selector
);
}
if
(
cur_page
)
{
input
=
$
(
cur_page
.
page
).
find
(
selector
);
}
if
(
input
)
{
return
input
.
val
();
}
return
$
(
cur_page
.
page
).
find
(
"
input[data-fieldname*=
"
+
this
.
df
.
options
+
"
]
"
).
val
();
}
var
options
=
frappe
.
model
.
get_value
(
this
.
df
.
parent
,
this
.
docname
,
this
.
df
.
options
);
// if(!options) {
...
...
This diff is collapsed.
Click to expand it.
frappe/public/js/frappe/views/reports/query_report.js
View file @
d54b2188
...
...
@@ -335,34 +335,45 @@ frappe.views.QueryReport = Class.extend({
var
$filters
=
$
(
this
.
parent
).
find
(
'
.page-form .filters
'
);
$
(
this
.
parent
).
find
(
'
.page-form
'
).
toggle
(
$filters
.
length
?
true
:
false
);
// set the field 'query_report_filters_by_name' first as they can be used in
// setting/triggering the filters
this
.
set_filters_by_name
();
this
.
setting_filters
=
true
;
this
.
set_route_filters
();
this
.
setting_filters
=
false
;
this
.
set_filters_by_name
();
this
.
flags
.
filters_set
=
true
;
},
clear_filters
:
function
()
{
this
.
filters
=
[];
$
(
this
.
parent
).
find
(
'
.page-form .filters
'
).
remove
();
},
set_filters_by_name
:
function
()
{
frappe
.
query_report_filters_by_name
=
{};
for
(
var
i
in
this
.
filters
)
{
frappe
.
query_report_filters_by_name
[
this
.
filters
[
i
].
df
.
fieldname
]
=
this
.
filters
[
i
];
}
},
set_route_filters
:
function
()
{
var
me
=
this
;
if
(
frappe
.
route_options
)
{
$
.
each
(
this
.
filters
||
[],
function
(
i
,
f
)
{
if
(
frappe
.
route_options
[
f
.
df
.
fieldname
]
!=
null
)
{
f
.
set_value
(
frappe
.
route_options
[
f
.
df
.
fieldname
]);
const
fields
=
Object
.
keys
(
frappe
.
route_options
);
const
filters_to_set
=
this
.
filters
.
filter
(
f
=>
fields
.
includes
(
f
.
df
.
fieldname
));
const
promises
=
filters_to_set
.
map
(
f
=>
{
return
()
=>
{
const
value
=
frappe
.
route_options
[
f
.
df
.
fieldname
];
return
f
.
set_value
(
value
);
}
});
}
frappe
.
route_options
=
null
;
},
set_filters_by_name
:
function
()
{
frappe
.
query_report_filters_by_name
=
{};
promises
.
push
(()
=>
{
frappe
.
route_options
=
null
;
});
for
(
var
i
in
this
.
filters
)
{
frappe
.
query_report_filters_by_name
[
this
.
filters
[
i
].
df
.
fieldname
]
=
this
.
filters
[
i
];
return
frappe
.
run_serially
(
promises
);
}
},
refresh
:
function
()
{
// throttle
...
...
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