vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge branch 'staging' into develop

Browse source
This commit is contained in:
Frappe Bot 2018-12-06 09:31:40 +00:00
commit b2779c617a
21 changed files with 160 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/__init__.py
View file

@ -17,7 +17,7 @@ from faker import Faker
from .exceptions import *
from .utils.jinja import (get_jenv, get_template, render_template, get_email_from_template, get_jloader)
__version__ = '10.1.65'
__version__ = '10.1.67'
__title__ = "Frappe Framework"
local = Local()

16
frappe/desk/doctype/event/event.py
View file

@ -248,3 +248,19 @@ def get_events(start, end, user=None, for_reminder=False, filters=None):
del e[w]
return events
def delete_events(ref_type, ref_name, delete_event=False):
participations = frappe.get_all("Event Participants", filters={"reference_doctype": ref_type, "reference_docname": ref_name,
"parenttype": "Event"}, fields=["parent", "name"])
if participations:
for participation in participations:
if delete_event:
frappe.delete_doc("Event", participation.parent, for_reload=True)
else:
total_participants = frappe.get_all("Event Participants", filters={"parenttype": "Event", "parent": participation.parent})
if len(total_participants) <= 1:
frappe.db.sql("DELETE FROM `tabEvent` WHERE `name` = %(name)s", {'name': participation.parent})
frappe.db.sql("DELETE FROM `tabEvent Participants ` WHERE `name` = %(name)s", {'name': participation.name})

3
frappe/desk/query_report.py
View file

@ -80,9 +80,6 @@ def generate_report_result(report, filters=None, user=None):
if result:
result = get_filtered_data(report.ref_doctype, columns, result, user)
if cint(report.add_total_row) and result:
result = add_total_row(result, columns)
return {
"result": result,
"columns": columns,

2
frappe/hooks.py
View file

@ -12,7 +12,7 @@ source_link = "https://github.com/frappe/frappe"
app_license = "MIT"
develop_version = '12.x.x-develop'
staging_version = '11.0.3-beta.31'
staging_version = '11.0.3-beta.33'
app_email = "info@frappe.io"

6
frappe/integrations/doctype/paypal_settings/paypal_settings.py
View file

@ -203,7 +203,7 @@ def setup_redirect(data, redirect_url, custom_redirect_to=None, redirect=True):
redirect_to = custom_redirect_to
if redirect_to:
redirect_url += '?' + urlencode({'redirect_to': redirect_to})
redirect_url += '&' + urlencode({'redirect_to': redirect_to})
if redirect_message:
redirect_url += '&' + urlencode({'redirect_message': redirect_message})
@ -274,7 +274,7 @@ def confirm_payment(token):
data.get("reference_docname")).run_method("on_payment_authorized", "Completed")
frappe.db.commit()
redirect_url = '/integrations/payment-success'
redirect_url = '/integrations/payment-success?doctype={0}&docname={1}'.format(data.get("reference_doctype"), data.get("reference_docname"))
else:
redirect_url = "/integrations/payment-failed"
@ -332,7 +332,7 @@ def create_recurring_profile(token, payerid):
data.get("reference_docname")).run_method("on_payment_authorized", status_changed_to)
frappe.db.commit()
redirect_url = '/integrations/payment-success'
redirect_url = '/integrations/payment-success?doctype={0}&docname={1}'.format(data.get("reference_doctype"), data.get("reference_docname"))
else:
redirect_url = "/integrations/payment-failed"

4
frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
View file

@ -255,12 +255,12 @@ class RazorpaySettings(Document):
if custom_redirect_to:
redirect_to = custom_redirect_to
redirect_url = 'payment-success'
redirect_url = 'payment-success?doctype={0}&docname={1}'.format(self.data.reference_doctype, self.data.reference_docname)
else:
redirect_url = 'payment-failed'
if redirect_to:
redirect_url += '?' + urlencode({'redirect_to': redirect_to})
redirect_url += '&' + urlencode({'redirect_to': redirect_to})
if redirect_message:
redirect_url += '&' + urlencode({'redirect_message': redirect_message})

10
frappe/public/js/frappe/chat.js
View file

@ -1565,12 +1565,16 @@ class extends Component {
const alert = // TODO: ellipses content
`
<span>
<span data-action="show-message" class="cursor-pointer">
<span class="indicator yellow"/> <b>${frappe.user.first_name(r.user)}</b>: ${r.content}
</span>
`
frappe.show_alert(alert, 3)
frappe.show_alert(alert, 3, {
"show-message": function (r) {
this.room.select(r.room)
this.base.firstChild._component.toggle()
}.bind(this, r)
})
}
if ( r.room === state.room.name ) {

2
frappe/public/js/frappe/form/dashboard.js
View file

@ -301,7 +301,7 @@ frappe.ui.form.Dashboard = Class.extend({
}
}
frappe.set_route("List", doctype);
frappe.set_route("List", doctype, "List");
},
get_document_filter: function(doctype) {
// return the default filter for the given document

4
frappe/public/js/frappe/form/toolbar.js
View file

@ -107,7 +107,7 @@ frappe.ui.form.Toolbar = Class.extend({
var p = this.frm.perm[0];
var docstatus = cint(this.frm.doc.docstatus);
var is_submittable = frappe.model.is_submittable(this.frm.doc.doctype)
var issingle = this.frm.meta.issingle;
var print_settings = frappe.model.get_doc(":Print Settings", "Print Settings")
var allow_print_for_draft = cint(print_settings.allow_print_for_draft);
var allow_print_for_cancelled = cint(print_settings.allow_print_for_cancelled);
@ -116,7 +116,7 @@ frappe.ui.form.Toolbar = Class.extend({
if(!is_submittable || docstatus == 1 ||
(allow_print_for_cancelled && docstatus == 2)||
(allow_print_for_draft && docstatus == 0)) {
if(frappe.model.can_print(null, me.frm)) {
if(frappe.model.can_print(null, me.frm) && !issingle) {
this.page.add_menu_item(__("Print"), function() {
me.frm.print_doc();}, true);
this.print_icon = this.page.add_action_icon("fa fa-print", function() {

5
frappe/public/js/frappe/list/base_list.js
View file

@ -395,6 +395,10 @@ frappe.views.BaseList = class BaseList {
// for child classes
}
on_filter_change() {
// fired when filters are added or removed
}
toggle_result_area() {
this.$result.toggle(this.data.length > 0);
this.$paging_area.toggle(this.data.length > 0);
@ -483,6 +487,7 @@ class FilterArea {
if (this.trigger_refresh) {
this.list_view.start = 0;
this.list_view.refresh();
this.list_view.on_filter_change();
}
}

25
frappe/public/js/frappe/list/list_view.js
View file

@ -52,6 +52,21 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
this.sort_by = this.view_user_settings.sort_by || 'modified';
this.sort_order = this.view_user_settings.sort_order || 'desc';
// set filters from user_settings or list_settings
if (this.view_user_settings.filters && this.view_user_settings.filters.length) {
// Priority 1: user_settings
const saved_filters = this.view_user_settings.filters;
this.filters = this.validate_filters(saved_filters);
} else {
// Priority 2: filters in listview_settings
this.filters = (this.settings.filters || []).map(f => {
if (f.length === 3) {
f = [this.doctype, f[0], f[1], f[2]];
}
return f;
});
}
// build menu items
this.menu_items = this.menu_items.concat(this.get_menu_items());
@ -281,6 +296,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
before_refresh() {
if (frappe.route_options) {
this.filters = this.parse_filters_from_route_options();
return this.filter_area.clear(false)
.then(() => this.filter_area.set(this.filters));
}
@ -288,6 +304,15 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
return Promise.resolve();
}
parse_filters_from_settings() {
return (this.settings.filters || []).map(f => {
if (f.length === 3) {
f = [this.doctype, f[0], f[1], f[2]];
}
return f;
});
}
toggle_result_area() {
super.toggle_result_area();
this.toggle_actions_menu_button(

3
frappe/public/js/frappe/views/gantt/gantt_view.js
View file

@ -125,7 +125,7 @@ frappe.views.GanttView = class GanttView extends frappe.views.ListView {
var html =
`<h5>${task.name}</h5>
<p>${task._start.format('MMM D')} - ${task._end.format('MMM D')}</p>`;
<p>${moment(task._start).format('MMM D')} - ${moment(task._end).format('MMM D')}</p>`;
// custom html in doctype settings
var custom = me.settings.gantt_custom_popup_html;
@ -207,3 +207,4 @@ frappe.views.GanttView = class GanttView extends frappe.views.ListView {
];
}
};

46
frappe/public/js/frappe/views/kanban/kanban_view.js
View file

@ -32,10 +32,14 @@ frappe.views.KanbanView = class KanbanView extends frappe.views.ListView {
this.page_title = this.board_name;
this.card_meta = this.get_card_meta();
return this.get_board()
.then(() => {
this.filters = this.board.filters_array;
});
this.menu_items.push({
label: __('Save filters'),
action: () => {
this.save_kanban_board_filters();
}
});
return this.get_board();
}
get_board() {
@ -43,9 +47,14 @@ frappe.views.KanbanView = class KanbanView extends frappe.views.ListView {
.then(board => {
this.board = board;
this.board.filters_array = JSON.parse(this.board.filters || '[]');
this.filters = this.board.filters_array;
});
}
before_refresh() {
}
setup_view() {
}
@ -60,13 +69,40 @@ frappe.views.KanbanView = class KanbanView extends frappe.views.ListView {
this.save_view_user_settings({
last_kanban_board: this.board_name
});
}
on_filter_change() {
if (JSON.stringify(this.board.filters_array) !== JSON.stringify(this.filter_area.get())) {
this.page.set_indicator(__('Not Saved'), 'orange');
} else {
this.page.clear_indicator();
}
}
save_kanban_board_filters() {
const filters = this.filter_area.get();
frappe.call({
method: 'frappe.desk.doctype.kanban_board.kanban_board.save_filters',
args: {
board_name: this.board_name,
filters: this.filter_area.get()
filters: filters
}
}).then(r => {
if (r.exc) {
frappe.show_alert({
indicator: 'red',
message: __('There was an error saving filters')
});
return;
}
frappe.show_alert({
indicator: 'green',
message: __('Filters saved')
});
this.board.filters_array = filters;
this.on_filter_change();
});
}

30
frappe/public/js/frappe/views/reports/query_report.js
View file

@ -347,23 +347,25 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
if (this.datatable) {
this.datatable.options.treeView = this.tree_report;
this.datatable.refresh(this.data, this.columns);
return;
} else {
let datatable_options = {
columns: this.columns,
data: this.data,
inlineFilters: true,
treeView: this.tree_report,
layout: 'fixed',
cellHeight: 33
};
if (this.report_settings.get_datatable_options) {
datatable_options = this.report_settings.get_datatable_options(datatable_options);
}
this.datatable = new DataTable(this.$report[0], datatable_options);
}
let datatable_options = {
columns: this.columns,
data: this.data,
inlineFilters: true,
treeView: this.tree_report,
layout: 'fixed',
cellHeight: 33
};
if (this.report_settings.get_datatable_options) {
datatable_options = this.report_settings.get_datatable_options(datatable_options);
if (this.report_settings.after_datatable_render) {
this.report_settings.after_datatable_render(this.datatable);
}
this.datatable = new DataTable(this.$report[0], datatable_options);
}
get_chart_options(data) {

14
frappe/public/js/frappe/views/reports/report_view.js
View file

@ -121,6 +121,16 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
}
}
on_filter_change() {
if (this.report_doc) {
if (JSON.stringify(this.filters) !== JSON.stringify(this.filter_area.get())) {
this.page.set_indicator(__('Not Saved'), 'orange');
} else {
this.page.clear_indicator();
}
}
}
update_row(doc, flash_row) {
const to_refresh = [];
@ -899,6 +909,10 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
if(r.message != this.report_name) {
frappe.set_route('List', this.doctype, 'Report', r.message);
}
// reset dirty state
this.filters = this.filter_area.get();
this.on_filter_change();
}
});

15
frappe/templates/pages/integrations/payment-success.html
View file

@ -8,9 +8,16 @@
<span class='indicator green'>
{{ _("Success") }}</span>
</div>
<p>{{ _("Your payment was successfully accepted") }}</p>
<div><a href='{{ frappe.form_dict.redirect_to or "/" }}' class='btn btn-primary btn-sm'>
{{ _("Continue") }}</a></div>
<p>{{ payment_message or _("Your payment was successfully accepted") }}</p>
{% if not payment_message %}
<div>
<a
href='{{ frappe.form_dict.redirect_to or "/" }}'
class='btn btn-primary btn-sm'>
{{ _("Continue") }}
</a>
</div>
{% endif %}
</div>
<style>
{% include "templates/styles/card_style.css" %}
@ -20,7 +27,7 @@
if('{{ frappe.form_dict.redirect_to or "" }}'){
setTimeout(function(){
window.location.href = '{{ frappe.form_dict.redirect_to }}';
}, 6000);
}, 4000);
}
})
</script>

8
frappe/templates/pages/integrations/payment_success.py
View file

@ -7,4 +7,10 @@ import frappe
no_cache = True
def get_context(context):
token = frappe.local.form_dict.token
token = frappe.local.form_dict.token
doc = frappe.get_doc(frappe.local.form_dict.doctype, frappe.local.form_dict.docname)
context.payment_message = ''
if hasattr(doc, 'get_payment_success_message'):
context.payment_message = doc.get_payment_success_message()

2
frappe/utils/data.py
View file

@ -729,7 +729,7 @@ def get_url(uri=None, full_address=False):
port = frappe.conf.http_port or frappe.conf.webserver_port
if frappe.conf.developer_mode and host_name and not url_contains_port(host_name) and port:
if not (frappe.conf.restart_supervisor_on_update or frappe.conf.restart_systemd_on_update) and host_name and not url_contains_port(host_name) and port:
host_name = host_name + ':' + str(port)
url = urljoin(host_name, uri) if uri else host_name

3
frappe/website/render.py
View file

@ -173,9 +173,6 @@ def build_page(path):
frappe.local.path = path
context = get_context(path)
if context.title and "{{" in cstr(context.title):
title_template = context.pop('title')
context.title = frappe.render_template(title_template, context)
if context.source:
html = frappe.render_template(context.source, context)

2
package.json
View file

@ -22,7 +22,7 @@
"awesomplete": "^1.1.2",
"cookie": "^0.3.1",
"express": "^4.16.2",
"frappe-datatable": "^1.5.5",
"frappe-datatable": "^1.6.0",
"frappe-gantt": "^0.1.0",
"fuse.js": "^3.2.0",
"highlight.js": "^9.12.0",

8
yarn.lock
View file

@ -1517,10 +1517,10 @@ forwarded@~0.1.2:
resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
frappe-datatable@^1.5.5:
version "1.5.5"
resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.5.5.tgz#52c4e4263b2598d1685cdfc72dff248365091868"
integrity sha512-0Euo4otAzkpm1S+NrvhYHQ+Bug0aPus/k2W5FvyCXdRyKyDu5aSYAku+Xquj2mhES/EJGhyfhcuTcGLt0Q1h7g==
frappe-datatable@^1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.6.0.tgz#c86c2c7fc054a500c70cdf6c6362b5fed63c6fe6"
integrity sha512-40iwguZr0w+X0MV/yTzsYDoKlH7b/GuOq6o2lEOrbVT3p4dZYpalxQmO8mkM9gKjNjSgGMVL1r6Se8peq80Qqg==
dependencies:
hyperlist "^1.0.0-beta"
lodash "^4.17.5"