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
c6a97a23
Commit
c6a97a23
authored
6 years ago
by
Saurabh
Browse files
Options
Download
Plain Diff
Merge branch 'hotfix'
parents
aeed4810
e3382f8a
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
No related merge requests found
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
frappe/__init__.py
+1
-1
frappe/__init__.py
frappe/integrations/doctype/dropbox_settings/dropbox_settings.json
+34
-1
...tegrations/doctype/dropbox_settings/dropbox_settings.json
frappe/integrations/doctype/dropbox_settings/dropbox_settings.py
+3
-0
...integrations/doctype/dropbox_settings/dropbox_settings.py
frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.json
+33
-1
...ations/doctype/s3_backup_settings/s3_backup_settings.json
frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.py
+3
-0
...grations/doctype/s3_backup_settings/s3_backup_settings.py
frappe/public/js/frappe/views/reports/reportview.js
+1
-1
frappe/public/js/frappe/views/reports/reportview.js
frappe/www/search.html
+1
-1
frappe/www/search.html
frappe/www/search.py
+2
-1
frappe/www/search.py
with
78 additions
and
6 deletions
+78
-6
frappe/__init__.py
View file @
c6a97a23
...
...
@@ -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__
=
'10.1.4
4
'
__version__
=
'10.1.4
5
'
__title__
=
"Frappe Framework"
local
=
Local
()
...
...
This diff is collapsed.
Click to expand it.
frappe/integrations/doctype/dropbox_settings/dropbox_settings.json
View file @
c6a97a23
...
...
@@ -71,6 +71,39 @@
"set_only_once"
:
0
,
"unique"
:
0
},
{
"allow_bulk_edit"
:
0
,
"allow_on_submit"
:
0
,
"bold"
:
0
,
"collapsible"
:
0
,
"columns"
:
0
,
"default"
:
"1"
,
"description"
:
"Note: By default emails for failed backups are sent."
,
"fieldname"
:
"send_email_for_successful_backup"
,
"fieldtype"
:
"Check"
,
"hidden"
:
0
,
"ignore_user_permissions"
:
0
,
"ignore_xss_filter"
:
0
,
"in_filter"
:
0
,
"in_global_search"
:
0
,
"in_list_view"
:
0
,
"in_standard_filter"
:
0
,
"label"
:
"Send Email for Successful Backup"
,
"length"
:
0
,
"no_copy"
:
0
,
"options"
:
""
,
"permlevel"
:
0
,
"precision"
:
""
,
"print_hide"
:
0
,
"print_hide_if_no_value"
:
0
,
"read_only"
:
0
,
"remember_last_selected_value"
:
0
,
"report_hide"
:
0
,
"reqd"
:
0
,
"search_index"
:
0
,
"set_only_once"
:
0
,
"unique"
:
0
},
{
"allow_bulk_edit"
:
0
,
"allow_on_submit"
:
0
,
...
...
@@ -295,7 +328,7 @@
"issingle"
:
1
,
"istable"
:
0
,
"max_attachments"
:
0
,
"modified"
:
"2018-0
3-22 16:02:00.597029
"
,
"modified"
:
"2018-0
8-07 04:00:40.520943
"
,
"modified_by"
:
"Administrator"
,
"module"
:
"Integrations"
,
"name"
:
"Dropbox Settings"
,
...
...
This diff is collapsed.
Click to expand it.
frappe/integrations/doctype/dropbox_settings/dropbox_settings.py
View file @
c6a97a23
...
...
@@ -56,6 +56,9 @@ def take_backup_to_dropbox():
def
send_email
(
success
,
service_name
,
error_status
=
None
):
if
success
:
if
frappe
.
db
.
get_value
(
"Dropbox Settings"
,
None
,
"send_email_for_successful_backup"
)
==
'0'
:
return
subject
=
"Backup Upload Successful"
message
=
"""<h3>Backup Uploaded Successfully</h3><p>Hi there, this is just to inform you
that your backup was successfully uploaded to your %s account. So relax!</p>
...
...
This diff is collapsed.
Click to expand it.
frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.json
View file @
c6a97a23
...
...
@@ -72,6 +72,38 @@
"set_only_once"
:
0
,
"unique"
:
0
},
{
"allow_bulk_edit"
:
0
,
"allow_on_submit"
:
0
,
"bold"
:
0
,
"collapsible"
:
0
,
"columns"
:
0
,
"default"
:
"1"
,
"description"
:
"Note: By default emails for failed backups are sent."
,
"fieldname"
:
"send_email_for_successful_backup"
,
"fieldtype"
:
"Check"
,
"hidden"
:
0
,
"ignore_user_permissions"
:
0
,
"ignore_xss_filter"
:
0
,
"in_filter"
:
0
,
"in_global_search"
:
0
,
"in_list_view"
:
0
,
"in_standard_filter"
:
0
,
"label"
:
"Send Email for Successful Backup"
,
"length"
:
0
,
"no_copy"
:
0
,
"permlevel"
:
0
,
"precision"
:
""
,
"print_hide"
:
0
,
"print_hide_if_no_value"
:
0
,
"read_only"
:
0
,
"remember_last_selected_value"
:
0
,
"report_hide"
:
0
,
"reqd"
:
0
,
"search_index"
:
0
,
"set_only_once"
:
0
,
"unique"
:
0
},
{
"allow_bulk_edit"
:
0
,
"allow_on_submit"
:
0
,
...
...
@@ -234,7 +266,7 @@
"issingle"
:
1
,
"istable"
:
0
,
"max_attachments"
:
0
,
"modified"
:
"201
7-10-06 18:27:09.022674
"
,
"modified"
:
"201
8-08-07 04:12:43.691760
"
,
"modified_by"
:
"Administrator"
,
"module"
:
"Integrations"
,
"name"
:
"S3 Backup Settings"
,
...
...
This diff is collapsed.
Click to expand it.
frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.py
View file @
c6a97a23
...
...
@@ -74,6 +74,9 @@ def take_backups_s3():
def
send_email
(
success
,
service_name
,
error_status
=
None
):
if
success
:
if
frappe
.
db
.
get_value
(
"S3 Backup Settings"
,
None
,
"send_email_for_successful_backup"
)
==
'0'
:
return
subject
=
"Backup Upload Successful"
message
=
"""<h3>Backup Uploaded Successfully! </h3><p>Hi there, this is just to inform you
that your backup was successfully uploaded to your Amazon S3 bucket. So relax!</p> """
...
...
This diff is collapsed.
Click to expand it.
frappe/public/js/frappe/views/reports/reportview.js
View file @
c6a97a23
...
...
@@ -634,7 +634,7 @@ frappe.views.ReportView = frappe.ui.BaseList.extend({
data
.
forEach
(
function
(
row
,
ri
)
{
$
.
each
(
row
,
function
(
key
,
value
)
{
if
(
key
in
field_map
)
{
totals_row
[
key
]
=
(
totals_row
[
key
]
||
0
)
+
value
;
totals_row
[
key
]
=
(
totals_row
[
key
]
||
0
)
+
(
value
||
0
)
;
}
});
});
...
...
This diff is collapsed.
Click to expand it.
frappe/www/search.html
View file @
c6a97a23
{% extends "templates/web.html" %}
{% block page_content %}
<h1>
{{ title }}
</h1>
<h1>
{{ title }}
: "{{ query }}"
</h1>
<div>
<form
action=
'/search'
>
...
...
This diff is collapsed.
Click to expand it.
frappe/www/search.py
View file @
c6a97a23
...
...
@@ -10,7 +10,8 @@ def get_context(context):
context
.
no_cache
=
1
if
frappe
.
form_dict
.
q
:
query
=
str
(
utils
.
escape
(
sanitize_html
(
frappe
.
form_dict
.
q
)))
context
.
title
=
_
(
'Search Results for "{0}"'
).
format
(
query
)
context
.
title
=
_
(
'Search Results for'
)
context
.
query
=
query
context
.
update
(
get_search_results
(
query
))
else
:
context
.
title
=
_
(
'Search'
)
...
...
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