From ff8215331ae42e4f89785595100ddd14656ca1fc Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Fri, 8 Sep 2017 17:17:04 +0530 Subject: [PATCH 001/135] [Add] Webhook DocType and Tests --- frappe/config/integrations.py | 6 + .../integrations/doctype/webhook/__init__.py | 0 .../doctype/webhook/test_webhook.js | 23 + .../doctype/webhook/test_webhook.py | 21 + .../integrations/doctype/webhook/webhook.js | 8 + .../integrations/doctype/webhook/webhook.json | 550 ++++++++++++++++++ .../integrations/doctype/webhook/webhook.py | 30 + .../doctype/webhook_header/__init__.py | 0 .../webhook_header/webhook_header.json | 101 ++++ .../doctype/webhook_header/webhook_header.py | 10 + .../doctype/webhook_param/__init__.py | 0 .../doctype/webhook_param/webhook_param.json | 101 ++++ .../doctype/webhook_param/webhook_param.py | 10 + 13 files changed, 860 insertions(+) create mode 100644 frappe/integrations/doctype/webhook/__init__.py create mode 100644 frappe/integrations/doctype/webhook/test_webhook.js create mode 100644 frappe/integrations/doctype/webhook/test_webhook.py create mode 100644 frappe/integrations/doctype/webhook/webhook.js create mode 100644 frappe/integrations/doctype/webhook/webhook.json create mode 100644 frappe/integrations/doctype/webhook/webhook.py create mode 100644 frappe/integrations/doctype/webhook_header/__init__.py create mode 100644 frappe/integrations/doctype/webhook_header/webhook_header.json create mode 100644 frappe/integrations/doctype/webhook_header/webhook_header.py create mode 100644 frappe/integrations/doctype/webhook_param/__init__.py create mode 100644 frappe/integrations/doctype/webhook_param/webhook_param.json create mode 100644 frappe/integrations/doctype/webhook_param/webhook_param.py diff --git a/frappe/config/integrations.py b/frappe/config/integrations.py index 92604b716b..cb69cb2a6d 100644 --- a/frappe/config/integrations.py +++ b/frappe/config/integrations.py @@ -72,6 +72,12 @@ def get_data(): "name": "GSuite Templates", "description": _("Google GSuite Templates to integration with DocTypes"), }, + { + "type": "doctype", + "name": "Webhook", + "description": _("Webhooks calling API requests into web apps"), + } + ] } ] diff --git a/frappe/integrations/doctype/webhook/__init__.py b/frappe/integrations/doctype/webhook/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/integrations/doctype/webhook/test_webhook.js b/frappe/integrations/doctype/webhook/test_webhook.js new file mode 100644 index 0000000000..799b952bed --- /dev/null +++ b/frappe/integrations/doctype/webhook/test_webhook.js @@ -0,0 +1,23 @@ +/* eslint-disable */ +// rename this file from _test_[name] to test_[name] to activate +// and remove above this line + +QUnit.test("test: Webhook", function (assert) { + let done = assert.async(); + + // number of asserts + assert.expect(1); + + frappe.run_serially([ + // insert a new Webhook + () => frappe.tests.make('Webhook', [ + // values to be set + {key: 'value'} + ]), + () => { + assert.equal(cur_frm.doc.key, 'value'); + }, + () => done() + ]); + +}); diff --git a/frappe/integrations/doctype/webhook/test_webhook.py b/frappe/integrations/doctype/webhook/test_webhook.py new file mode 100644 index 0000000000..7f5e071c07 --- /dev/null +++ b/frappe/integrations/doctype/webhook/test_webhook.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies and Contributors +# See license.txt +from __future__ import unicode_literals + +import frappe +import unittest + +class TestWebhook(unittest.TestCase): + def test_mandatory_fields(self): + base_doc = frappe.new_doc("Webhook") + + # Test for scheduler event webhook + scheduler_event_doc = base_doc + scheduler_event_doc.webhook_type = "Scheduler Event" + self.assertRaises(frappe.ValidationError, scheduler_event_doc.save) + + # Test for doc event webhook + doc_event_doc = base_doc + doc_event_doc.webhook_type = "Doc Event" + self.assertRaises(frappe.ValidationError, doc_event_doc.save) diff --git a/frappe/integrations/doctype/webhook/webhook.js b/frappe/integrations/doctype/webhook/webhook.js new file mode 100644 index 0000000000..84538f8ea1 --- /dev/null +++ b/frappe/integrations/doctype/webhook/webhook.js @@ -0,0 +1,8 @@ +// Copyright (c) 2017, Frappe Technologies and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Webhook', { + refresh: function(frm) { + + } +}); diff --git a/frappe/integrations/doctype/webhook/webhook.json b/frappe/integrations/doctype/webhook/webhook.json new file mode 100644 index 0000000000..627abdcaef --- /dev/null +++ b/frappe/integrations/doctype/webhook/webhook.json @@ -0,0 +1,550 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "beta": 0, + "creation": "2017-09-08 16:16:13.060641", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "sb_webhook_type", + "fieldtype": "Section Break", + "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": "Webhook Type", + "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, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "webhook_type", + "fieldtype": "Select", + "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": "Webhook Type", + "length": 0, + "no_copy": 0, + "options": "Scheduler Event\nDoc Event", + "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, + "bold": 0, + "collapsible": 0, + "columns": 0, + "depends_on": "eval:doc.webhook_type==\"Doc Event\"", + "fieldname": "sb_doc_events", + "fieldtype": "Section Break", + "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": "Doc Events", + "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, + "bold": 0, + "collapsible": 0, + "columns": 0, + "description": "", + "fieldname": "webhook_doctype", + "fieldtype": "Link", + "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": "DocType", + "length": 0, + "no_copy": 0, + "options": "DocType", + "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, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "cb_doc_events", + "fieldtype": "Column Break", + "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, + "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, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "webhook_docevent", + "fieldtype": "Select", + "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": "Doc Event", + "length": 0, + "no_copy": 0, + "options": "after_insert\non_update\non_submit\non_cancel\non_trash\non_update_after_submit\non_change", + "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, + "bold": 0, + "collapsible": 0, + "columns": 0, + "depends_on": "eval:doc.webhook_type==\"Scheduler Event\"", + "fieldname": "sb_scheduler_events", + "fieldtype": "Section Break", + "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": "Scheduler Events ", + "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, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "scheduler_event", + "fieldtype": "Select", + "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": "Scheduler Event", + "length": 0, + "no_copy": 0, + "options": "\nall\ndaily\nhourly\nweekly\nmonthly", + "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, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "sb_webhook", + "fieldtype": "Section Break", + "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": "Webhook Request", + "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, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "request_url", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Request URL", + "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": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "cb_webhook", + "fieldtype": "Column Break", + "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, + "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, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "request_verb", + "fieldtype": "Select", + "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": "Request Verb", + "length": 0, + "no_copy": 0, + "options": "GET\nPOST\nPUT", + "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, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "sb_webhook_headers", + "fieldtype": "Section Break", + "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": "Webhook Headers", + "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, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "webhook_headers", + "fieldtype": "Table", + "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": "Headers", + "length": 0, + "no_copy": 0, + "options": "Webhook Header", + "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, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "sb_webhook_params", + "fieldtype": "Section Break", + "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": "Webhook Params", + "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, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "webhook_params", + "fieldtype": "Table", + "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": "Params", + "length": 0, + "no_copy": 0, + "options": "Webhook Param", + "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 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 0, + "max_attachments": 0, + "modified": "2017-09-08 16:44:44.857115", + "modified_by": "Administrator", + "module": "Integrations", + "name": "Webhook", + "name_case": "", + "owner": "Administrator", + "permissions": [ + { + "amend": 0, + "apply_user_permissions": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + } + ], + "quick_entry": 0, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/frappe/integrations/doctype/webhook/webhook.py b/frappe/integrations/doctype/webhook/webhook.py new file mode 100644 index 0000000000..afd437b26e --- /dev/null +++ b/frappe/integrations/doctype/webhook/webhook.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe import _ +from frappe.model.document import Document + +class Webhook(Document): + def autoname(self): + if self.webhook_type == "Scheduler Event" and self.scheduler_event: + self.name = self.webhook_type + "-" + self.scheduler_event + if self.webhook_type == "Doc Event" and self.webhook_doctype: + self.name = self.webhook_type + "-" + self.webhook_doctype + "-" + self.webhook_docevent + def validate(self): + self.validate_mandatory_fields() + self.validate_docevent() + def validate_mandatory_fields(self): + if self.webhook_type == "Scheduler Event": + if not self.scheduler_event: + frappe.throw(_("Select Scheduler Event")) + if self.webhook_type == "Doc Event": + if not self.webhook_doctype: + frappe.throw(_("Select DocType")) + def validate_docevent(self): + if self.doctype: + is_submittable = frappe.get_value("DocType", self.doctype, "is_submittable") + if not is_submittable and self.webhook_docevent in ["on_submit", "on_cancel", "on_update_after_submit"]: + frappe.throw(_("DocType must be Submittable for the selected Doc Event")) diff --git a/frappe/integrations/doctype/webhook_header/__init__.py b/frappe/integrations/doctype/webhook_header/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/integrations/doctype/webhook_header/webhook_header.json b/frappe/integrations/doctype/webhook_header/webhook_header.json new file mode 100644 index 0000000000..315d28335f --- /dev/null +++ b/frappe/integrations/doctype/webhook_header/webhook_header.json @@ -0,0 +1,101 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "beta": 0, + "creation": "2017-09-08 16:27:39.195379", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "key", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Key", + "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, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "value", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Value", + "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 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 1, + "max_attachments": 0, + "modified": "2017-09-08 16:28:20.025612", + "modified_by": "Administrator", + "module": "Integrations", + "name": "Webhook Header", + "name_case": "", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/frappe/integrations/doctype/webhook_header/webhook_header.py b/frappe/integrations/doctype/webhook_header/webhook_header.py new file mode 100644 index 0000000000..535b626148 --- /dev/null +++ b/frappe/integrations/doctype/webhook_header/webhook_header.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class WebhookHeader(Document): + pass diff --git a/frappe/integrations/doctype/webhook_param/__init__.py b/frappe/integrations/doctype/webhook_param/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/integrations/doctype/webhook_param/webhook_param.json b/frappe/integrations/doctype/webhook_param/webhook_param.json new file mode 100644 index 0000000000..93bd7a2dd7 --- /dev/null +++ b/frappe/integrations/doctype/webhook_param/webhook_param.json @@ -0,0 +1,101 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "beta": 0, + "creation": "2017-09-08 16:28:38.852947", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "key", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Key", + "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, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "value", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Value", + "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 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 1, + "max_attachments": 0, + "modified": "2017-09-08 16:28:38.852947", + "modified_by": "Administrator", + "module": "Integrations", + "name": "Webhook Param", + "name_case": "", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/frappe/integrations/doctype/webhook_param/webhook_param.py b/frappe/integrations/doctype/webhook_param/webhook_param.py new file mode 100644 index 0000000000..badb5eafd5 --- /dev/null +++ b/frappe/integrations/doctype/webhook_param/webhook_param.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class WebhookParam(Document): + pass From 69e0d4c930d011c474ea8edf113c81eb98b1fccf Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Sat, 9 Sep 2017 12:26:47 +0530 Subject: [PATCH 002/135] Changes to Webhook DocType and Tests --- frappe/hooks.py | 17 +- .../doctype/webhook/test_webhook.py | 18 +- .../integrations/doctype/webhook/webhook.json | 248 +----------------- .../integrations/doctype/webhook/webhook.py | 17 +- 4 files changed, 25 insertions(+), 275 deletions(-) diff --git a/frappe/hooks.py b/frappe/hooks.py index f5d98f0421..2eec7997d6 100755 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -108,14 +108,25 @@ doc_events = { "*": { "on_update": [ "frappe.desk.notifications.clear_doctype_notifications", - "frappe.core.doctype.communication.feed.update_feed" + "frappe.core.doctype.communication.feed.update_feed", + "frappe.integrations.webhooks.on_update_webhook" ], "after_rename": "frappe.desk.notifications.clear_doctype_notifications", "on_cancel": [ "frappe.desk.notifications.clear_doctype_notifications", + "frappe.integrations.webhooks.on_cancel_webhook" ], - "on_trash": "frappe.desk.notifications.clear_doctype_notifications", - "on_change": "frappe.core.doctype.feedback_trigger.feedback_trigger.trigger_feedback_request" + "on_trash": [ + "frappe.desk.notifications.clear_doctype_notifications", + "frappe.integrations.webhooks.on_trash_webhook" + ], + "on_change": [ + "frappe.core.doctype.feedback_trigger.feedback_trigger.trigger_feedback_request", + "frappe.integrations.webhooks.on_change_webhook" + ], + "after_insert": "frappe.integrations.webhooks.after_insert_webhook", + "on_submit": "frappe.integrations.webhooks.on_submit_webhook", + "on_update_after_submit": "frappe.integrations.webhooks.on_update_after_submit_webhook" }, "Email Group Member": { "validate": "frappe.email.doctype.email_group.email_group.restrict_email_group" diff --git a/frappe/integrations/doctype/webhook/test_webhook.py b/frappe/integrations/doctype/webhook/test_webhook.py index 7f5e071c07..908e9b2d0e 100644 --- a/frappe/integrations/doctype/webhook/test_webhook.py +++ b/frappe/integrations/doctype/webhook/test_webhook.py @@ -7,15 +7,9 @@ import frappe import unittest class TestWebhook(unittest.TestCase): - def test_mandatory_fields(self): - base_doc = frappe.new_doc("Webhook") - - # Test for scheduler event webhook - scheduler_event_doc = base_doc - scheduler_event_doc.webhook_type = "Scheduler Event" - self.assertRaises(frappe.ValidationError, scheduler_event_doc.save) - - # Test for doc event webhook - doc_event_doc = base_doc - doc_event_doc.webhook_type = "Doc Event" - self.assertRaises(frappe.ValidationError, doc_event_doc.save) + def test_validate_docevents(self): + doc = frappe.new_doc("Webhook") + doc.webhook_doctype = "User" + doc.webhook_docevent = "on_submit" + doc.request_url = "https://httpbin.org/post" + self.assertRaises(frappe.ValidationError, doc.save) diff --git a/frappe/integrations/doctype/webhook/webhook.json b/frappe/integrations/doctype/webhook/webhook.json index 627abdcaef..ea4c868816 100644 --- a/frappe/integrations/doctype/webhook/webhook.json +++ b/frappe/integrations/doctype/webhook/webhook.json @@ -18,68 +18,7 @@ "bold": 0, "collapsible": 0, "columns": 0, - "fieldname": "sb_webhook_type", - "fieldtype": "Section Break", - "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": "Webhook Type", - "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, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "webhook_type", - "fieldtype": "Select", - "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": "Webhook Type", - "length": 0, - "no_copy": 0, - "options": "Scheduler Event\nDoc Event", - "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, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "eval:doc.webhook_type==\"Doc Event\"", + "depends_on": "", "fieldname": "sb_doc_events", "fieldtype": "Section Break", "hidden": 0, @@ -196,68 +135,6 @@ "set_only_once": 0, "unique": 0 }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "eval:doc.webhook_type==\"Scheduler Event\"", - "fieldname": "sb_scheduler_events", - "fieldtype": "Section Break", - "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": "Scheduler Events ", - "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, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "scheduler_event", - "fieldtype": "Select", - "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": "Scheduler Event", - "length": 0, - "no_copy": 0, - "options": "\nall\ndaily\nhourly\nweekly\nmonthly", - "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, @@ -318,66 +195,6 @@ "set_only_once": 0, "unique": 0 }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "cb_webhook", - "fieldtype": "Column Break", - "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, - "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, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "request_verb", - "fieldtype": "Select", - "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": "Request Verb", - "length": 0, - "no_copy": 0, - "options": "GET\nPOST\nPUT", - "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, @@ -438,67 +255,6 @@ "search_index": 0, "set_only_once": 0, "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "sb_webhook_params", - "fieldtype": "Section Break", - "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": "Webhook Params", - "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, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "webhook_params", - "fieldtype": "Table", - "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": "Params", - "length": 0, - "no_copy": 0, - "options": "Webhook Param", - "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 } ], "has_web_view": 0, @@ -511,7 +267,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-09-08 16:44:44.857115", + "modified": "2017-09-09 12:10:09.682143", "modified_by": "Administrator", "module": "Integrations", "name": "Webhook", diff --git a/frappe/integrations/doctype/webhook/webhook.py b/frappe/integrations/doctype/webhook/webhook.py index afd437b26e..a8ba59b559 100644 --- a/frappe/integrations/doctype/webhook/webhook.py +++ b/frappe/integrations/doctype/webhook/webhook.py @@ -9,22 +9,11 @@ from frappe.model.document import Document class Webhook(Document): def autoname(self): - if self.webhook_type == "Scheduler Event" and self.scheduler_event: - self.name = self.webhook_type + "-" + self.scheduler_event - if self.webhook_type == "Doc Event" and self.webhook_doctype: - self.name = self.webhook_type + "-" + self.webhook_doctype + "-" + self.webhook_docevent + self.name = self.webhook_doctype + "-" + self.webhook_docevent def validate(self): - self.validate_mandatory_fields() self.validate_docevent() - def validate_mandatory_fields(self): - if self.webhook_type == "Scheduler Event": - if not self.scheduler_event: - frappe.throw(_("Select Scheduler Event")) - if self.webhook_type == "Doc Event": - if not self.webhook_doctype: - frappe.throw(_("Select DocType")) def validate_docevent(self): - if self.doctype: - is_submittable = frappe.get_value("DocType", self.doctype, "is_submittable") + if self.webhook_doctype: + is_submittable = frappe.get_value("DocType", self.webhook_doctype, "is_submittable") if not is_submittable and self.webhook_docevent in ["on_submit", "on_cancel", "on_update_after_submit"]: frappe.throw(_("DocType must be Submittable for the selected Doc Event")) From d6bfa7431bf454c10c7bb32f9f11501d3f535c3e Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Sat, 9 Sep 2017 14:10:09 +0530 Subject: [PATCH 003/135] Webhooks for frappe doc_events --- frappe/hooks.py | 14 ++++++------ .../doctype/webhook/test_webhook.py | 6 +++++ .../integrations/doctype/webhook/webhook.json | 6 ++--- .../integrations/doctype/webhook/webhook.py | 9 ++++++++ frappe/integrations/webhooks.py | 22 +++++++++++++++++++ 5 files changed, 47 insertions(+), 10 deletions(-) create mode 100644 frappe/integrations/webhooks.py diff --git a/frappe/hooks.py b/frappe/hooks.py index 2eec7997d6..9fdca1a87a 100755 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -109,24 +109,24 @@ doc_events = { "on_update": [ "frappe.desk.notifications.clear_doctype_notifications", "frappe.core.doctype.communication.feed.update_feed", - "frappe.integrations.webhooks.on_update_webhook" + "frappe.integrations.webhooks.doc_event_webhook" ], "after_rename": "frappe.desk.notifications.clear_doctype_notifications", "on_cancel": [ "frappe.desk.notifications.clear_doctype_notifications", - "frappe.integrations.webhooks.on_cancel_webhook" + "frappe.integrations.webhooks.doc_event_webhook" ], "on_trash": [ "frappe.desk.notifications.clear_doctype_notifications", - "frappe.integrations.webhooks.on_trash_webhook" + "frappe.integrations.webhooks.doc_event_webhook" ], "on_change": [ "frappe.core.doctype.feedback_trigger.feedback_trigger.trigger_feedback_request", - "frappe.integrations.webhooks.on_change_webhook" + "frappe.integrations.webhooks.doc_event_webhook" ], - "after_insert": "frappe.integrations.webhooks.after_insert_webhook", - "on_submit": "frappe.integrations.webhooks.on_submit_webhook", - "on_update_after_submit": "frappe.integrations.webhooks.on_update_after_submit_webhook" + "after_insert": "frappe.integrations.webhooks.doc_event_webhook", + "on_submit": "frappe.integrations.webhooks.doc_event_webhook", + "on_update_after_submit": "frappe.integrations.webhooks.doc_event_webhook" }, "Email Group Member": { "validate": "frappe.email.doctype.email_group.email_group.restrict_email_group" diff --git a/frappe/integrations/doctype/webhook/test_webhook.py b/frappe/integrations/doctype/webhook/test_webhook.py index 908e9b2d0e..c43d431670 100644 --- a/frappe/integrations/doctype/webhook/test_webhook.py +++ b/frappe/integrations/doctype/webhook/test_webhook.py @@ -13,3 +13,9 @@ class TestWebhook(unittest.TestCase): doc.webhook_docevent = "on_submit" doc.request_url = "https://httpbin.org/post" self.assertRaises(frappe.ValidationError, doc.save) + def test_validate_request_url(self): + doc = frappe.new_doc("Webhook") + doc.webhook_doctype = "User" + doc.webhook_docevent = "after_insert" + doc.request_url = "httpbin.org?post" + self.assertRaises(frappe.ValidationError, doc.save) diff --git a/frappe/integrations/doctype/webhook/webhook.json b/frappe/integrations/doctype/webhook/webhook.json index ea4c868816..4f3ba1c180 100644 --- a/frappe/integrations/doctype/webhook/webhook.json +++ b/frappe/integrations/doctype/webhook/webhook.json @@ -72,7 +72,7 @@ "report_hide": 0, "reqd": 0, "search_index": 0, - "set_only_once": 0, + "set_only_once": 1, "unique": 0 }, { @@ -132,7 +132,7 @@ "report_hide": 0, "reqd": 0, "search_index": 0, - "set_only_once": 0, + "set_only_once": 1, "unique": 0 }, { @@ -267,7 +267,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-09-09 12:10:09.682143", + "modified": "2017-09-09 13:07:14.169116", "modified_by": "Administrator", "module": "Integrations", "name": "Webhook", diff --git a/frappe/integrations/doctype/webhook/webhook.py b/frappe/integrations/doctype/webhook/webhook.py index a8ba59b559..f5c85c387b 100644 --- a/frappe/integrations/doctype/webhook/webhook.py +++ b/frappe/integrations/doctype/webhook/webhook.py @@ -6,14 +6,23 @@ from __future__ import unicode_literals import frappe from frappe import _ from frappe.model.document import Document +from six.moves.urllib.parse import urlparse class Webhook(Document): def autoname(self): self.name = self.webhook_doctype + "-" + self.webhook_docevent def validate(self): self.validate_docevent() + self.validate_request_url() def validate_docevent(self): if self.webhook_doctype: is_submittable = frappe.get_value("DocType", self.webhook_doctype, "is_submittable") if not is_submittable and self.webhook_docevent in ["on_submit", "on_cancel", "on_update_after_submit"]: frappe.throw(_("DocType must be Submittable for the selected Doc Event")) + def validate_request_url(self): + try: + request_url = urlparse(self.request_url).netloc + if not request_url: + raise + except: + frappe.throw(_("Check Request URL")) diff --git a/frappe/integrations/webhooks.py b/frappe/integrations/webhooks.py new file mode 100644 index 0000000000..4c0e97664c --- /dev/null +++ b/frappe/integrations/webhooks.py @@ -0,0 +1,22 @@ +# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors +# MIT License. See license.txt + +from __future__ import unicode_literals +import frappe, requests +from frappe import _ + +# Doc Events Webhook +def doc_event_webhook(doc, method=None, *args, **kwargs): + headers = {} + webhook = frappe.get_doc("Webhook", doc.get("doctype") + "-" + method) + if webhook: + if webhook.webhook_headers: + for h in webhook.webhook_headers: + if h.get("key") and h.get("value"): + headers[h.get("key")] = h.get("value") + try: + r = requests.post(webhook.request_url, data=doc.as_json(), headers=headers, timeout=5) + frappe.logger().debug({"webhook_success":r.text, "webhook": webhook.as_json()}) + except: + frappe.logger().debug({"webhook_error":r.text, "webhook": webhook.as_json()}) + frappe.throw(_("Unable to make request")) From 0b1a655da1210aac4bd34676ad7bd160499eef6e Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Sat, 9 Sep 2017 19:26:50 +0530 Subject: [PATCH 004/135] [Fix] filter only existing webhooks --- frappe/integrations/webhooks.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frappe/integrations/webhooks.py b/frappe/integrations/webhooks.py index 4c0e97664c..1312d63712 100644 --- a/frappe/integrations/webhooks.py +++ b/frappe/integrations/webhooks.py @@ -8,7 +8,12 @@ from frappe import _ # Doc Events Webhook def doc_event_webhook(doc, method=None, *args, **kwargs): headers = {} - webhook = frappe.get_doc("Webhook", doc.get("doctype") + "-" + method) + filters = { + "webhook_doctype": doc.get("doctype"), + "webhook_docevent": method + } + webhooks = frappe.get_all("Webhook", filters=filters) + webhook = frappe.get_doc("Webhook", webhooks[0].get("name")) if webhooks and len(webhooks) > 0 else None if webhook: if webhook.webhook_headers: for h in webhook.webhook_headers: From f8a1d55689f317fccb612e6dfdea85ee220ac603 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Sun, 10 Sep 2017 10:58:33 +0530 Subject: [PATCH 005/135] Fix and Documentation webhook_doctype field made Mandatory in Webhook Documentation and screenshot added --- frappe/docs/assets/img/webhook.png | Bin 0 -> 34615 bytes .../user/en/guides/integration/webhooks.md | 18 ++++++++++++++++++ .../integrations/doctype/webhook/webhook.json | 4 ++-- 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 frappe/docs/assets/img/webhook.png create mode 100644 frappe/docs/user/en/guides/integration/webhooks.md diff --git a/frappe/docs/assets/img/webhook.png b/frappe/docs/assets/img/webhook.png new file mode 100644 index 0000000000000000000000000000000000000000..cbc16c1d76469689b62c77cee8db22175f5b0ca1 GIT binary patch literal 34615 zcmdqJWmH_v_BV(G37+5%A-KD{1&81s+}#~Qf(CbYcXyY@t#S9p-K80F-}~JEedp86 ze3&(B&gymQRMjrqyLO$utA3|L73C$75%3ToARv&XzKMN@fPhhifPl(@hkZ|J#QyF1 z9(-^Tky3$wzr5j%L*C=K&f*%*%66vCZU&Af5N5V^HYW5=Mvf*Xwoc}D&galw0uT@+ z5K>~oD(>kgYhK>*w;A_u>ih9y)T}84!=b-^eTadFO@I#>=*_*YR<*ENtE_iB25YUg zSrWH3v}t>}mHC`3w_2?{&!6e8c&Q(I3e=MzV1_%gU_?y)U?LS7GH^^6WdT{CJiao= zp~a?r_?nC+I0=A8cG6wAf6`m{)l%u9zag5+n2kjC3rz%`^xro_s5x16q5nkRGfZhe zD*pa2iZ3w#=lJ+PCA@i%Jll~x`KY#rWYxvtN#*l^metAQ8e@eim0@TiA(~Wj6fvLw z)fi|c8xWpLwF@$isRT|qyZl1iW+Nq+J@-e{ZAA%}5>a{YP*EIK@xO?-+wpJQsc31U zFI3=}X$y|)--}Jp&#}@%&3^kj53(45i$prSG}2tN`o`YmdILA3miGHgF4Hu}9#h0K5V?tP5?bX&KNLu|N( z9jmf&kX0Lkr+Wy@3(Y|j8-YQP3!5Ia+UfeAvl0Gjv`)->D9*{wgGaAbo|86+3eB+b z`Z*9(aiXZmZD$gGEd%wJfB)j$`)#7`5bv{)_tjS+Oje4M>+PrsXL>Oj=7C8?MS<0S zM4SJaJbwt=i}_y4pT;z(Dk&<`ZN|AgiS)5N!^co>S!>0@)~0CXo*GptPnZw#(Dc3j zEQA^=>0M>twKm0pFTa%6l?UM!fX{g0zb>+>vPtlSZNrO1(Skc7@&GFb&KX^{&4zTG z#OA6QL}`eDEGZX^~dukB4c}a z<^>DWR;X>G?~yf+EvVIIYIT>_?7I+DHr768{5&kQOAn7GmkXw}9SPn$Xp|icT9Lx4 z;sPm0DV4KGID8}f3uzbXmBu@JEp;H`{1G8NHP|ySNd_fPPJ6P)V2bbh_GaM1{e@ok zuQb~Va=+E@Uazi=4W-RD*T*fhY;tV`*1H26oIBKQvApvb>|`exXAG9MA?(Cw)5Iw2!(OH%YRBYbBZ4f_pgD7?I0pgWuk z_iCy9u3{(jK1eoY2=DM=8Cw*!oG65o*myNwy+ooOhUFVgOrc#oP3@~y9|d*o79Jh8 z3a88EHn;K|D&1ft?#Jvdyb(M;Tp!z2+X;!Uo8UK_)G(Xy^94*T2||QCIiLn9&7QeW z_Dda|yLrI(zcj-I3WZ%7z(v)%fF#`!j+!eN?yap@eN1!|gC2g25-*{U297kW?!q@&#b(z5zO}~!fTx-M0NB;$UW0gHVkJ{0|1bn#`}b1wqJj-S zdD7CZ!zjMnOmy7=OE94HXMdT}mtu4P{$BsYMqP)f+<=)amy0b$$kts@D1|P;0P#gm z|CpI>my~!+B8dn*Gg+>C#_OW4u!xdkNkek2Q;J;%SV~nus-}l166r`&!&2(@R^MBv zuLO(g2K9qf6DCD3kSXw0{wWCRLtbBgNdpdR9rd_e-n|&{bi1MS#I@*-`49N#ZW7TR zcxDxI=R;%AevA?8)W)gdRBW&~%U#`W!QsHh#jz=E)?=^k%Vf9{6U47Iw$qIX#IDz_ zoAno$GacKE!!Y@(DYOYiywZ9Id4&(*E~#B|H^c=F5F`@%qe`$?3QlB%x*v}P?79OI zUZ^|a_Gk6R2V+V0SI1^)sfkuaNx#69sHe<0$CC?i5h*p2lE$T8iK}ar+VE98_#(3CkElS_S9EG-lCc1JkhT z*a!8c(0WGjkw%VGDnv_ZjPG@6Z5rRPBH3XZ_hvH(!l^!(Q-86KIqY#2`gfD!7lD?%0N
`|Y>FGiHC3u8>X)CS6tHA23Bm>secq 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 v_8R Integrations > External Documents > Webhook + +Webhook + + + +1. Select the DocType for which hook needs to be triggered e.g. Note +2. Select the DocEvent for which hook needs to be triggered e.g. on_trash +3. Enter a valid request URL. On occurence of DocEvent, POST request with doc's json as data is made to the URL. +4. Optionally you can add headers to the request to be made. Useful for sending api key if required. diff --git a/frappe/integrations/doctype/webhook/webhook.json b/frappe/integrations/doctype/webhook/webhook.json index 4f3ba1c180..1823987534 100644 --- a/frappe/integrations/doctype/webhook/webhook.json +++ b/frappe/integrations/doctype/webhook/webhook.json @@ -70,7 +70,7 @@ "read_only": 0, "remember_last_selected_value": 0, "report_hide": 0, - "reqd": 0, + "reqd": 1, "search_index": 0, "set_only_once": 1, "unique": 0 @@ -267,7 +267,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-09-09 13:07:14.169116", + "modified": "2017-09-09 20:05:43.406391", "modified_by": "Administrator", "module": "Integrations", "name": "Webhook", From 3d15e6a43151c1a0c7ae22265dd577871a5bed8f Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Sun, 10 Sep 2017 11:09:50 +0530 Subject: [PATCH 006/135] Cleanup --- .../doctype/webhook_param/__init__.py | 0 .../doctype/webhook_param/webhook_param.json | 101 ------------------ .../doctype/webhook_param/webhook_param.py | 10 -- 3 files changed, 111 deletions(-) delete mode 100644 frappe/integrations/doctype/webhook_param/__init__.py delete mode 100644 frappe/integrations/doctype/webhook_param/webhook_param.json delete mode 100644 frappe/integrations/doctype/webhook_param/webhook_param.py diff --git a/frappe/integrations/doctype/webhook_param/__init__.py b/frappe/integrations/doctype/webhook_param/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/frappe/integrations/doctype/webhook_param/webhook_param.json b/frappe/integrations/doctype/webhook_param/webhook_param.json deleted file mode 100644 index 93bd7a2dd7..0000000000 --- a/frappe/integrations/doctype/webhook_param/webhook_param.json +++ /dev/null @@ -1,101 +0,0 @@ -{ - "allow_copy": 0, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 0, - "beta": 0, - "creation": "2017-09-08 16:28:38.852947", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "", - "editable_grid": 1, - "engine": "InnoDB", - "fields": [ - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "key", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Key", - "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, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "value", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Value", - "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 - } - ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_view": 0, - "in_create": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 1, - "max_attachments": 0, - "modified": "2017-09-08 16:28:38.852947", - "modified_by": "Administrator", - "module": "Integrations", - "name": "Webhook Param", - "name_case": "", - "owner": "Administrator", - "permissions": [], - "quick_entry": 1, - "read_only": 0, - "read_only_onload": 0, - "show_name_in_global_search": 0, - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 1, - "track_seen": 0 -} \ No newline at end of file diff --git a/frappe/integrations/doctype/webhook_param/webhook_param.py b/frappe/integrations/doctype/webhook_param/webhook_param.py deleted file mode 100644 index badb5eafd5..0000000000 --- a/frappe/integrations/doctype/webhook_param/webhook_param.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2017, Frappe Technologies and contributors -# For license information, please see license.txt - -from __future__ import unicode_literals -import frappe -from frappe.model.document import Document - -class WebhookParam(Document): - pass From 8c71042c6765860c29e446394c34fd7dcc6f7f82 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Sun, 10 Sep 2017 11:49:53 +0530 Subject: [PATCH 007/135] [fix] Codacy errors --- frappe/integrations/doctype/webhook/webhook.py | 2 +- frappe/integrations/webhooks.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/integrations/doctype/webhook/webhook.py b/frappe/integrations/doctype/webhook/webhook.py index f5c85c387b..de62c9e833 100644 --- a/frappe/integrations/doctype/webhook/webhook.py +++ b/frappe/integrations/doctype/webhook/webhook.py @@ -24,5 +24,5 @@ class Webhook(Document): request_url = urlparse(self.request_url).netloc if not request_url: raise - except: + except Exception as e: frappe.throw(_("Check Request URL")) diff --git a/frappe/integrations/webhooks.py b/frappe/integrations/webhooks.py index 1312d63712..af4cba11cf 100644 --- a/frappe/integrations/webhooks.py +++ b/frappe/integrations/webhooks.py @@ -22,6 +22,6 @@ def doc_event_webhook(doc, method=None, *args, **kwargs): try: r = requests.post(webhook.request_url, data=doc.as_json(), headers=headers, timeout=5) frappe.logger().debug({"webhook_success":r.text, "webhook": webhook.as_json()}) - except: + except Exception as e: frappe.logger().debug({"webhook_error":r.text, "webhook": webhook.as_json()}) frappe.throw(_("Unable to make request")) From a928d7ac01fdea804fbabf91e07d9b52b43250e4 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Sun, 10 Sep 2017 12:03:50 +0530 Subject: [PATCH 008/135] [Fix] Codacy --- frappe/integrations/doctype/webhook/webhook.py | 4 ++-- frappe/integrations/webhooks.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/integrations/doctype/webhook/webhook.py b/frappe/integrations/doctype/webhook/webhook.py index de62c9e833..ff86c67c7f 100644 --- a/frappe/integrations/doctype/webhook/webhook.py +++ b/frappe/integrations/doctype/webhook/webhook.py @@ -23,6 +23,6 @@ class Webhook(Document): try: request_url = urlparse(self.request_url).netloc if not request_url: - raise + raise frappe.ValidationError except Exception as e: - frappe.throw(_("Check Request URL")) + frappe.throw(_("Check Request URL"), exc=e) diff --git a/frappe/integrations/webhooks.py b/frappe/integrations/webhooks.py index af4cba11cf..219dceaa8e 100644 --- a/frappe/integrations/webhooks.py +++ b/frappe/integrations/webhooks.py @@ -24,4 +24,4 @@ def doc_event_webhook(doc, method=None, *args, **kwargs): frappe.logger().debug({"webhook_success":r.text, "webhook": webhook.as_json()}) except Exception as e: frappe.logger().debug({"webhook_error":r.text, "webhook": webhook.as_json()}) - frappe.throw(_("Unable to make request")) + frappe.throw(_("Unable to make request"), exc=e) From 4b75ec13b32ddec9995815ba3effdedcc9d7ffb3 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Sun, 10 Sep 2017 18:30:50 +0530 Subject: [PATCH 009/135] [Fix] Codacy Errors --- frappe/integrations/doctype/webhook/webhook.js | 2 +- frappe/integrations/doctype/webhook_header/webhook_header.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/integrations/doctype/webhook/webhook.js b/frappe/integrations/doctype/webhook/webhook.js index 84538f8ea1..91ec3b3e99 100644 --- a/frappe/integrations/doctype/webhook/webhook.js +++ b/frappe/integrations/doctype/webhook/webhook.js @@ -2,7 +2,7 @@ // For license information, please see license.txt frappe.ui.form.on('Webhook', { - refresh: function(frm) { + refresh: function(/*frm*/) { } }); diff --git a/frappe/integrations/doctype/webhook_header/webhook_header.py b/frappe/integrations/doctype/webhook_header/webhook_header.py index 535b626148..11d3ee4085 100644 --- a/frappe/integrations/doctype/webhook_header/webhook_header.py +++ b/frappe/integrations/doctype/webhook_header/webhook_header.py @@ -3,7 +3,7 @@ # For license information, please see license.txt from __future__ import unicode_literals -import frappe +# import frappe from frappe.model.document import Document class WebhookHeader(Document): From beb6318d88b8081aca73e4d9103e426cb58dc7a6 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Thu, 14 Sep 2017 13:24:02 +0530 Subject: [PATCH 010/135] Webhook Data DocType added --- .../integrations/doctype/webhook/webhook.js | 40 +++++- .../integrations/doctype/webhook/webhook.json | 63 ++++++++- .../integrations/doctype/webhook/webhook.py | 9 ++ .../doctype/webhook_data/__init__.py | 0 .../doctype/webhook_data/webhook_data.json | 130 ++++++++++++++++++ .../doctype/webhook_data/webhook_data.py | 10 ++ 6 files changed, 250 insertions(+), 2 deletions(-) create mode 100644 frappe/integrations/doctype/webhook_data/__init__.py create mode 100644 frappe/integrations/doctype/webhook_data/webhook_data.json create mode 100644 frappe/integrations/doctype/webhook_data/webhook_data.py diff --git a/frappe/integrations/doctype/webhook/webhook.js b/frappe/integrations/doctype/webhook/webhook.js index 91ec3b3e99..b31d7e9661 100644 --- a/frappe/integrations/doctype/webhook/webhook.js +++ b/frappe/integrations/doctype/webhook/webhook.js @@ -1,8 +1,46 @@ // Copyright (c) 2017, Frappe Technologies and contributors // For license information, please see license.txt +frappe.webhook = { + set_fieldname_select: function(frm) { + var me = this, + doc = frm.doc; + if (doc.webhook_doctype) { + frappe.model.with_doctype(doc.webhook_doctype, function() { + var fields = $.map(frappe.get_doc("DocType", frm.doc.webhook_doctype).fields, function(d) { + if (frappe.model.no_value_type.indexOf(d.fieldtype) === -1 || + d.fieldtype === 'Table') { + return { label: d.label + ' (' + d.fieldtype + ')', value: d.fieldname } + } + else if (d.fieldtype === 'Currency' || d.fieldtype === 'Float') { + return { label: d.label, value: d.fieldname } + } + else { + return null; + } + }) + frappe.meta.get_docfield("Webhook Data", "fieldname", frm.doc.name).options = [""].concat(fields); + }); + } + } +} + frappe.ui.form.on('Webhook', { - refresh: function(/*frm*/) { + refresh: function(frm) { + frappe.webhook.set_fieldname_select(frm); + }, + webhook_doctype: function(frm) { + frappe.webhook.set_fieldname_select(frm); + } +}); +frappe.ui.form.on("Webhook Data", { + fieldname: function(frm, doctype, name) { + var doc = frappe.get_doc(doctype, name); + var df = $.map(frappe.get_doc("DocType", frm.doc.webhook_doctype).fields, function(d) { + return doc.fieldname == d.fieldname ? d : null; + })[0]; + doc.key = df.fieldname + frm.refresh_field("webhook_data"); } }); diff --git a/frappe/integrations/doctype/webhook/webhook.json b/frappe/integrations/doctype/webhook/webhook.json index 1823987534..1a3866085a 100644 --- a/frappe/integrations/doctype/webhook/webhook.json +++ b/frappe/integrations/doctype/webhook/webhook.json @@ -255,6 +255,67 @@ "search_index": 0, "set_only_once": 0, "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "sb_webhook_data", + "fieldtype": "Section Break", + "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": "Webhook Data", + "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, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "webhook_data", + "fieldtype": "Table", + "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": "Data", + "length": 0, + "no_copy": 0, + "options": "Webhook Data", + "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 } ], "has_web_view": 0, @@ -267,7 +328,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-09-09 20:05:43.406391", + "modified": "2017-09-14 13:16:53.974340", "modified_by": "Administrator", "module": "Integrations", "name": "Webhook", diff --git a/frappe/integrations/doctype/webhook/webhook.py b/frappe/integrations/doctype/webhook/webhook.py index ff86c67c7f..b65fbfa486 100644 --- a/frappe/integrations/doctype/webhook/webhook.py +++ b/frappe/integrations/doctype/webhook/webhook.py @@ -14,6 +14,7 @@ class Webhook(Document): def validate(self): self.validate_docevent() self.validate_request_url() + self.validate_repeating_companies() def validate_docevent(self): if self.webhook_doctype: is_submittable = frappe.get_value("DocType", self.webhook_doctype, "is_submittable") @@ -26,3 +27,11 @@ class Webhook(Document): raise frappe.ValidationError except Exception as e: frappe.throw(_("Check Request URL"), exc=e) + def validate_repeating_companies(self): + """Error when Same Field is entered multiple times in webhook_data""" + webhook_data = [] + for entry in self.webhook_data: + webhook_data.append(entry.fieldname) + + if len(webhook_data)!= len(set(webhook_data)): + frappe.throw(_("Same Field is entered more than once")) diff --git a/frappe/integrations/doctype/webhook_data/__init__.py b/frappe/integrations/doctype/webhook_data/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/integrations/doctype/webhook_data/webhook_data.json b/frappe/integrations/doctype/webhook_data/webhook_data.json new file mode 100644 index 0000000000..96ae7f786a --- /dev/null +++ b/frappe/integrations/doctype/webhook_data/webhook_data.json @@ -0,0 +1,130 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "beta": 0, + "creation": "2017-09-14 12:08:50.302810", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "fieldname", + "fieldtype": "Select", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Fieldname", + "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": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "cb_doc_data", + "fieldtype": "Column Break", + "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, + "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, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "key", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Key", + "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": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 1, + "max_attachments": 0, + "modified": "2017-09-14 13:16:58.252176", + "modified_by": "Administrator", + "module": "Integrations", + "name": "Webhook Data", + "name_case": "", + "owner": "Administrator", + "permissions": [], + "quick_entry": 0, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 0, + "track_seen": 0 +} \ No newline at end of file diff --git a/frappe/integrations/doctype/webhook_data/webhook_data.py b/frappe/integrations/doctype/webhook_data/webhook_data.py new file mode 100644 index 0000000000..f968a6424e --- /dev/null +++ b/frappe/integrations/doctype/webhook_data/webhook_data.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class WebhookData(Document): + pass From aca5c147c9e3c99bd12c14320087a08da34ca789 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Thu, 14 Sep 2017 13:46:19 +0530 Subject: [PATCH 011/135] [minor] assingnment should not be allowed in the depends_on and collapsible_depends_on properties --- frappe/core/doctype/doctype/doctype.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index b0fff5b941..cf5e5c3fe0 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -595,6 +595,15 @@ def validate_fields(meta): frappe.throw(_("Sort field {0} must be a valid fieldname").format(fieldname), InvalidFieldNameError) + def check_illegal_depends_on_conditions(docfield): + ''' assignment operation should not be allowed in the depends on condition.''' + depends_on_fields = ["depends_on", "collapsible_depends_on"] + for field in depends_on_fields: + depends_on = docfield.get(field, None) + if depends_on and ("=" in depends_on) and \ + re.match("""[\w\.:_]+\s*={1}\s*[\w\.@'"]+""", depends_on): + frappe.throw(_("Invalid {0} condition").format(frappe.unscrub(field)), frappe.ValidationError) + fields = meta.get("fields") fieldname_list = [d.fieldname for d in fields] @@ -620,6 +629,7 @@ def validate_fields(meta): check_in_global_search(d) check_illegal_default(d) check_unique_and_text(d) + check_illegal_depends_on_conditions(d) check_fold(fields) check_search_fields(meta, fields) From 618ceb8982cdb83e7242182ff18ad9fd258b1607 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Thu, 14 Sep 2017 13:46:30 +0530 Subject: [PATCH 012/135] [test-cases] minor fixes and checked all the depends on fields are valid of not --- frappe/core/doctype/doctype/test_doctype.py | 41 +++++++++++++++++++-- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/frappe/core/doctype/doctype/test_doctype.py b/frappe/core/doctype/doctype/test_doctype.py index 81320c2f38..41a4267c97 100644 --- a/frappe/core/doctype/doctype/test_doctype.py +++ b/frappe/core/doctype/doctype/test_doctype.py @@ -10,13 +10,22 @@ import unittest class TestDocType(unittest.TestCase): - def new_doctype(self, name, unique=0): + def new_doctype(self, name, unique=0, depends_on=''): return frappe.get_doc({ "doctype": "DocType", "module": "Core", "custom": 1, - "fields": [{"label": "Some Field", "fieldname": "some_fieldname", "fieldtype": "Data", "unique": unique}], - "permissions": [{"role": "System Manager", "read": 1}], + "fields": [{ + "label": "Some Field", + "fieldname": "some_fieldname", + "fieldtype": "Data", + "unique": unique, + "depends_on": depends_on, + }], + "permissions": [{ + "role": "System Manager", + "read": 1 + }], "name": name }) @@ -71,4 +80,28 @@ class TestDocType(unittest.TestCase): field.fieldtype = "HTML" field.label = "Some HTML Field" doc.search_fields = "some_fieldname,some_html_field" - self.assertRaises(frappe.ValidationError, doc.save) \ No newline at end of file + self.assertRaises(frappe.ValidationError, doc.save) + + def test_depends_on_fields(self): + doc = self.new_doctype("Test Depends On", depends_on="eval:doc.__islocal == 0") + doc.insert() + + # check if the assignment operation is allowed in depends_on + field = doc.fields[0] + field.depends_on = "eval:doc.__islocal = 0" + self.assertRaises(frappe.ValidationError, doc.save) + + def test_all_depends_on_fields_conditions(self): + import re + + docfields = frappe.get_all("DocField", or_filters={ + "ifnull(depends_on, '')": ("!=", ''), + "ifnull(collapsible_depends_on, '')": ("!=", '') + }, fields=["parent", "depends_on", "collapsible_depends_on", "fieldname", "fieldtype"]) + + pattern = """[\w\.:_]+\s*={1}\s*[\w\.@'"]+""" + for field in docfields: + for depends_on in ["depends_on", "collapsible_depends_on"]: + condition = field.get(depends_on) + if condition: + self.assertFalse(re.match(pattern, condition)) \ No newline at end of file From 24a2656746cd997e2bc2fa5854523993130ca460 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Thu, 14 Sep 2017 14:16:44 +0530 Subject: [PATCH 013/135] Only allow specified fields of doc --- frappe/integrations/doctype/webhook/webhook.py | 4 ++-- frappe/integrations/webhooks.py | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/frappe/integrations/doctype/webhook/webhook.py b/frappe/integrations/doctype/webhook/webhook.py index b65fbfa486..5f74b22ac4 100644 --- a/frappe/integrations/doctype/webhook/webhook.py +++ b/frappe/integrations/doctype/webhook/webhook.py @@ -14,7 +14,7 @@ class Webhook(Document): def validate(self): self.validate_docevent() self.validate_request_url() - self.validate_repeating_companies() + self.validate_repeating_fields() def validate_docevent(self): if self.webhook_doctype: is_submittable = frappe.get_value("DocType", self.webhook_doctype, "is_submittable") @@ -27,7 +27,7 @@ class Webhook(Document): raise frappe.ValidationError except Exception as e: frappe.throw(_("Check Request URL"), exc=e) - def validate_repeating_companies(self): + def validate_repeating_fields(self): """Error when Same Field is entered multiple times in webhook_data""" webhook_data = [] for entry in self.webhook_data: diff --git a/frappe/integrations/webhooks.py b/frappe/integrations/webhooks.py index 219dceaa8e..466a0f0470 100644 --- a/frappe/integrations/webhooks.py +++ b/frappe/integrations/webhooks.py @@ -2,12 +2,13 @@ # MIT License. See license.txt from __future__ import unicode_literals -import frappe, requests +import frappe, requests, json from frappe import _ # Doc Events Webhook def doc_event_webhook(doc, method=None, *args, **kwargs): headers = {} + data = {} filters = { "webhook_doctype": doc.get("doctype"), "webhook_docevent": method @@ -19,8 +20,13 @@ def doc_event_webhook(doc, method=None, *args, **kwargs): for h in webhook.webhook_headers: if h.get("key") and h.get("value"): headers[h.get("key")] = h.get("value") + if webhook.webhook_data: + for k, v in doc.as_dict().items(): + for w in webhook.webhook_data: + if k == w.fieldname: + data[w.key] = v try: - r = requests.post(webhook.request_url, data=doc.as_json(), headers=headers, timeout=5) + r = requests.post(webhook.request_url, data=json.dumps(data), headers=headers, timeout=5) frappe.logger().debug({"webhook_success":r.text, "webhook": webhook.as_json()}) except Exception as e: frappe.logger().debug({"webhook_error":r.text, "webhook": webhook.as_json()}) From cedb309446651867a6bbea739b1db0c2ca7649fb Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Thu, 14 Sep 2017 17:26:34 +0530 Subject: [PATCH 014/135] Cleanup and Docs for Webhooks --- .../user/en/guides/integration/webhooks.md | 87 ++++++++++++++++++- .../integrations/doctype/webhook/webhook.js | 14 +-- .../doctype/webhook_data/webhook_data.py | 2 +- 3 files changed, 94 insertions(+), 9 deletions(-) diff --git a/frappe/docs/user/en/guides/integration/webhooks.md b/frappe/docs/user/en/guides/integration/webhooks.md index bad812ed6e..30d90fdd37 100644 --- a/frappe/docs/user/en/guides/integration/webhooks.md +++ b/frappe/docs/user/en/guides/integration/webhooks.md @@ -1,6 +1,6 @@ # Webhooks -Webhooks are "user-defined HTTP callbacks". You can create webhook which triggers on Doc Event of the selected DocType. When the `doc_events` occurs, the source site makes an HTTP request to the URI configured for the webhook. Users can configure them to cause events on one site to invoke behaviour on another. +Webhooks are "user-defined HTTP callbacks". You can create webhook which triggers on Doc Event of the selected DocType. When the `doc_events` occurs, the source site makes an HTTP request to the URI configured for the webhook. Users can configure them to cause events on one site to invoke behaviour on another. #### Configure Webhook @@ -16,3 +16,88 @@ Webhook 2. Select the DocEvent for which hook needs to be triggered e.g. on_trash 3. Enter a valid request URL. On occurence of DocEvent, POST request with doc's json as data is made to the URL. 4. Optionally you can add headers to the request to be made. Useful for sending api key if required. +5. Optionally you can select fields and set its `key` to be sent as data json + +e.g. Webhook + +- **DocType** : `Quotation` +- **Doc Event** : `on_update` +- **Request URL** : `https://httpbin.org/post` +- **Webhook Data** : + 1. **Fieldname** : `name` and **Key** : `id` + 2. **Fieldname** : `items` and **Key** : `lineItems` + +Note: if no headers or data is present, request will be made without any header or body + +Example request sent by frappe server on `Quotation` - `on_update` to https://httpbin.org/post: + +``` +{ + "args": {}, + "data": "{\"lineItems\": [{\"stock_qty\": 1.0, \"base_price_list_rate\": 1.0, \"image\": \"\", \"creation\": \"2017-09-14 13:41:58.373023\", \"base_amount\": 1.0, \"qty\": 1.0, \"margin_rate_or_amount\": 0.0, \"rate\": 1.0, \"owner\": \"Administrator\", \"stock_uom\": \"Unit\", \"base_net_amount\": 1.0, \"page_break\": 0, \"modified_by\": \"Administrator\", \"base_net_rate\": 1.0, \"discount_percentage\": 0.0, \"item_name\": \"I1\", \"amount\": 1.0, \"actual_qty\": 0.0, \"net_rate\": 1.0, \"conversion_factor\": 1.0, \"warehouse\": \"Finished Goods - R\", \"docstatus\": 0, \"prevdoc_docname\": null, \"uom\": \"Unit\", \"description\": \"I1\", \"parent\": \"QTN-00001\", \"brand\": null, \"gst_hsn_code\": null, \"base_rate\": 1.0, \"item_code\": \"I1\", \"projected_qty\": 0.0, \"margin_type\": \"\", \"doctype\": \"Quotation Item\", \"rate_with_margin\": 0.0, \"pricing_rule\": null, \"price_list_rate\": 1.0, \"name\": \"QUOD/00001\", \"idx\": 1, \"item_tax_rate\": \"{}\", \"item_group\": \"Products\", \"modified\": \"2017-09-14 17:09:51.239271\", \"parenttype\": \"Quotation\", \"customer_item_code\": null, \"net_amount\": 1.0, \"prevdoc_doctype\": null, \"parentfield\": \"items\"}], \"id\": \"QTN-00001\"}", + "files": {}, + "form": {}, + "headers": { + "Accept": "*/*", + "Accept-Encoding": "gzip, deflate", + "Connection": "close", + "Content-Length": "1075", + "Host": "httpbin.org", + "User-Agent": "python-requests/2.18.1" + }, + "json": { + "id": "QTN-00001", + "lineItems": [ + { + "actual_qty": 0.0, + "amount": 1.0, + "base_amount": 1.0, + "base_net_amount": 1.0, + "base_net_rate": 1.0, + "base_price_list_rate": 1.0, + "base_rate": 1.0, + "brand": null, + "conversion_factor": 1.0, + "creation": "2017-09-14 13:41:58.373023", + "customer_item_code": null, + "description": "I1", + "discount_percentage": 0.0, + "docstatus": 0, + "doctype": "Quotation Item", + "gst_hsn_code": null, + "idx": 1, + "image": "", + "item_code": "I1", + "item_group": "Products", + "item_name": "I1", + "item_tax_rate": "{}", + "margin_rate_or_amount": 0.0, + "margin_type": "", + "modified": "2017-09-14 17:09:51.239271", + "modified_by": "Administrator", + "name": "QUOD/00001", + "net_amount": 1.0, + "net_rate": 1.0, + "owner": "Administrator", + "page_break": 0, + "parent": "QTN-00001", + "parentfield": "items", + "parenttype": "Quotation", + "prevdoc_docname": null, + "prevdoc_doctype": null, + "price_list_rate": 1.0, + "pricing_rule": null, + "projected_qty": 0.0, + "qty": 1.0, + "rate": 1.0, + "rate_with_margin": 0.0, + "stock_qty": 1.0, + "stock_uom": "Unit", + "uom": "Unit", + "warehouse": "Finished Goods - R" + } + ] + }, + "url": "https://httpbin.org/post" +} +``` \ No newline at end of file diff --git a/frappe/integrations/doctype/webhook/webhook.js b/frappe/integrations/doctype/webhook/webhook.js index b31d7e9661..bff8591592 100644 --- a/frappe/integrations/doctype/webhook/webhook.js +++ b/frappe/integrations/doctype/webhook/webhook.js @@ -3,27 +3,27 @@ frappe.webhook = { set_fieldname_select: function(frm) { - var me = this, - doc = frm.doc; + doc = frm.doc; if (doc.webhook_doctype) { frappe.model.with_doctype(doc.webhook_doctype, function() { var fields = $.map(frappe.get_doc("DocType", frm.doc.webhook_doctype).fields, function(d) { if (frappe.model.no_value_type.indexOf(d.fieldtype) === -1 || d.fieldtype === 'Table') { - return { label: d.label + ' (' + d.fieldtype + ')', value: d.fieldname } + return { label: d.label + ' (' + d.fieldtype + ')', value: d.fieldname }; } else if (d.fieldtype === 'Currency' || d.fieldtype === 'Float') { - return { label: d.label, value: d.fieldname } + return { label: d.label, value: d.fieldname }; } else { return null; } - }) + }); + fields.unshift({"label":"Name (Doc Name)","value":"name"}) frappe.meta.get_docfield("Webhook Data", "fieldname", frm.doc.name).options = [""].concat(fields); }); } } -} +}; frappe.ui.form.on('Webhook', { refresh: function(frm) { @@ -40,7 +40,7 @@ frappe.ui.form.on("Webhook Data", { var df = $.map(frappe.get_doc("DocType", frm.doc.webhook_doctype).fields, function(d) { return doc.fieldname == d.fieldname ? d : null; })[0]; - doc.key = df.fieldname + doc.key = df != undefined ? df.fieldname : "name"; frm.refresh_field("webhook_data"); } }); diff --git a/frappe/integrations/doctype/webhook_data/webhook_data.py b/frappe/integrations/doctype/webhook_data/webhook_data.py index f968a6424e..b7d989410f 100644 --- a/frappe/integrations/doctype/webhook_data/webhook_data.py +++ b/frappe/integrations/doctype/webhook_data/webhook_data.py @@ -3,7 +3,7 @@ # For license information, please see license.txt from __future__ import unicode_literals -import frappe +# import frappe from frappe.model.document import Document class WebhookData(Document): From 369ce0af6695a332f89a8eb5cbbf5612da6941cd Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Thu, 14 Sep 2017 17:30:08 +0530 Subject: [PATCH 015/135] [Docs] Webhook screenshot updated --- frappe/docs/assets/img/webhook.png | Bin 34615 -> 52412 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/frappe/docs/assets/img/webhook.png b/frappe/docs/assets/img/webhook.png index cbc16c1d76469689b62c77cee8db22175f5b0ca1..859b5f57bdbc5c2a99fb4494b19e21087ed693ec 100644 GIT binary patch literal 52412 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 z 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 literal 34615 zcmdqJWmH_v_BV(G37+5%A-KD{1&81s+}#~Qf(CbYcXyY@t#S9p-K80F-}~JEedp86 ze3&(B&gymQRMjrqyLO$utA3|L73C$75%3ToARv&XzKMN@fPhhifPl(@hkZ|J#QyF1 z9(-^Tky3$wzr5j%L*C=K&f*%*%66vCZU&Af5N5V^HYW5=Mvf*Xwoc}D&galw0uT@+ z5K>~oD(>kgYhK>*w;A_u>ih9y)T}84!=b-^eTadFO@I#>=*_*YR<*ENtE_iB25YUg zSrWH3v}t>}mHC`3w_2?{&!6e8c&Q(I3e=MzV1_%gU_?y)U?LS7GH^^6WdT{CJiao= zp~a?r_?nC+I0=A8cG6wAf6`m{)l%u9zag5+n2kjC3rz%`^xro_s5x16q5nkRGfZhe zD*pa2iZ3w#=lJ+PCA@i%Jll~x`KY#rWYxvtN#*l^metAQ8e@eim0@TiA(~Wj6fvLw z)fi|c8xWpLwF@$isRT|qyZl1iW+Nq+J@-e{ZAA%}5>a{YP*EIK@xO?-+wpJQsc31U zFI3=}X$y|)--}Jp&#}@%&3^kj53(45i$prSG}2tN`o`YmdILA3miGHgF4Hu}9#h0K5V?tP5?bX&KNLu|N( z9jmf&kX0Lkr+Wy@3(Y|j8-YQP3!5Ia+UfeAvl0Gjv`)->D9*{wgGaAbo|86+3eB+b z`Z*9(aiXZmZD$gGEd%wJfB)j$`)#7`5bv{)_tjS+Oje4M>+PrsXL>Oj=7C8?MS<0S zM4SJaJbwt=i}_y4pT;z(Dk&<`ZN|AgiS)5N!^co>S!>0@)~0CXo*GptPnZw#(Dc3j zEQA^=>0M>twKm0pFTa%6l?UM!fX{g0zb>+>vPtlSZNrO1(Skc7@&GFb&KX^{&4zTG z#OA6QL}`eDEGZX^~dukB4c}a z<^>DWR;X>G?~yf+EvVIIYIT>_?7I+DHr768{5&kQOAn7GmkXw}9SPn$Xp|icT9Lx4 z;sPm0DV4KGID8}f3uzbXmBu@JEp;H`{1G8NHP|ySNd_fPPJ6P)V2bbh_GaM1{e@ok zuQb~Va=+E@Uazi=4W-RD*T*fhY;tV`*1H26oIBKQvApvb>|`exXAG9MA?(Cw)5Iw2!(OH%YRBYbBZ4f_pgD7?I0pgWuk z_iCy9u3{(jK1eoY2=DM=8Cw*!oG65o*myNwy+ooOhUFVgOrc#oP3@~y9|d*o79Jh8 z3a88EHn;K|D&1ft?#Jvdyb(M;Tp!z2+X;!Uo8UK_)G(Xy^94*T2||QCIiLn9&7QeW z_Dda|yLrI(zcj-I3WZ%7z(v)%fF#`!j+!eN?yap@eN1!|gC2g25-*{U297kW?!q@&#b(z5zO}~!fTx-M0NB;$UW0gHVkJ{0|1bn#`}b1wqJj-S zdD7CZ!zjMnOmy7=OE94HXMdT}mtu4P{$BsYMqP)f+<=)amy0b$$kts@D1|P;0P#gm z|CpI>my~!+B8dn*Gg+>C#_OW4u!xdkNkek2Q;J;%SV~nus-}l166r`&!&2(@R^MBv zuLO(g2K9qf6DCD3kSXw0{wWCRLtbBgNdpdR9rd_e-n|&{bi1MS#I@*-`49N#ZW7TR zcxDxI=R;%AevA?8)W)gdRBW&~%U#`W!QsHh#jz=E)?=^k%Vf9{6U47Iw$qIX#IDz_ zoAno$GacKE!!Y@(DYOYiywZ9Id4&(*E~#B|H^c=F5F`@%qe`$?3QlB%x*v}P?79OI zUZ^|a_Gk6R2V+V0SI1^)sfkuaNx#69sHe<0$CC?i5h*p2lE$T8iK}ar+VE98_#(3CkElS_S9EG-lCc1JkhT z*a!8c(0WGjkw%VGDnv_ZjPG@6Z5rRPBH3XZ_hvH(!l^!(Q-86KIqY#2`gfD!7lD?%0N
`|Y>FGiHC3u8>X)CS6tHA23Bm>secq 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 v_8R Date: Thu, 14 Sep 2017 17:39:44 +0530 Subject: [PATCH 016/135] Webhook doc correction --- frappe/docs/user/en/guides/integration/webhooks.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/docs/user/en/guides/integration/webhooks.md b/frappe/docs/user/en/guides/integration/webhooks.md index 30d90fdd37..ff7df4015f 100644 --- a/frappe/docs/user/en/guides/integration/webhooks.md +++ b/frappe/docs/user/en/guides/integration/webhooks.md @@ -29,7 +29,7 @@ e.g. Webhook Note: if no headers or data is present, request will be made without any header or body -Example request sent by frappe server on `Quotation` - `on_update` to https://httpbin.org/post: +Example response of request sent by frappe server on `Quotation` - `on_update` to https://httpbin.org/post: ``` { From cbfbaed73e4717bc1668f4877e9602c5b5bee52b Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Thu, 14 Sep 2017 19:25:38 +0530 Subject: [PATCH 017/135] [Fix] Codacy https://www.codacy.com/app/frappe/frappe/pullRequest?prid=900990 --- frappe/integrations/doctype/webhook/webhook.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/integrations/doctype/webhook/webhook.js b/frappe/integrations/doctype/webhook/webhook.js index bff8591592..3fc78e0d2c 100644 --- a/frappe/integrations/doctype/webhook/webhook.js +++ b/frappe/integrations/doctype/webhook/webhook.js @@ -3,7 +3,7 @@ frappe.webhook = { set_fieldname_select: function(frm) { - doc = frm.doc; + var doc = frm.doc; if (doc.webhook_doctype) { frappe.model.with_doctype(doc.webhook_doctype, function() { var fields = $.map(frappe.get_doc("DocType", frm.doc.webhook_doctype).fields, function(d) { @@ -18,7 +18,7 @@ frappe.webhook = { return null; } }); - fields.unshift({"label":"Name (Doc Name)","value":"name"}) + fields.unshift({"label":"Name (Doc Name)","value":"name"}); frappe.meta.get_docfield("Webhook Data", "fieldname", frm.doc.name).options = [""].concat(fields); }); } From 94e216ba8a324983b1d5fc30d1e0453cb6c187fa Mon Sep 17 00:00:00 2001 From: shridhar Date: Fri, 15 Sep 2017 16:35:55 +0530 Subject: [PATCH 018/135] Email notification on docshare Send an email notification when a doc is shared New notify_by_email colum added in docshare Checkbox added in set_sharing.html --- frappe/core/doctype/docshare/docshare.json | 52 +++++++++++++++++-- frappe/public/js/frappe/form/share.js | 3 +- .../js/frappe/form/templates/set_sharing.html | 2 + frappe/share.py | 21 +++++++- 4 files changed, 73 insertions(+), 5 deletions(-) diff --git a/frappe/core/doctype/docshare/docshare.json b/frappe/core/doctype/docshare/docshare.json index 83d837b7f8..7c5d56c4af 100644 --- a/frappe/core/doctype/docshare/docshare.json +++ b/frappe/core/doctype/docshare/docshare.json @@ -1,5 +1,6 @@ { "allow_copy": 0, + "allow_guest_to_view": 0, "allow_import": 1, "allow_rename": 0, "autoname": "hash", @@ -13,6 +14,7 @@ "editable_grid": 0, "fields": [ { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -23,6 +25,7 @@ "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, + "in_global_search": 0, "in_list_view": 1, "in_standard_filter": 0, "label": "User", @@ -42,6 +45,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -52,6 +56,7 @@ "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, + "in_global_search": 0, "in_list_view": 1, "in_standard_filter": 0, "label": "Document Type", @@ -71,6 +76,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -81,6 +87,7 @@ "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, + "in_global_search": 0, "in_list_view": 1, "in_standard_filter": 0, "label": "Document Name", @@ -100,6 +107,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -111,6 +119,7 @@ "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, + "in_global_search": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "Read", @@ -129,6 +138,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -140,6 +150,7 @@ "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, + "in_global_search": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "Write", @@ -158,6 +169,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -169,6 +181,7 @@ "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, + "in_global_search": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "Share", @@ -187,6 +200,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -197,6 +211,7 @@ "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, + "in_global_search": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "Everyone", @@ -213,19 +228,50 @@ "search_index": 0, "set_only_once": 0, "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "1", + "fieldname": "notify_by_email", + "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": "Notify by email", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 1, + "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 } ], + "has_web_view": 0, "hide_heading": 0, "hide_toolbar": 0, "idx": 0, "image_view": 0, "in_create": 1, - "in_dialog": 0, "is_submittable": 0, "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-12-29 14:40:40.284335", + "modified": "2017-09-15 15:58:34.126438", "modified_by": "Administrator", "module": "Core", "name": "DocShare", @@ -242,7 +288,6 @@ "export": 1, "if_owner": 0, "import": 1, - "is_custom": 0, "permlevel": 0, "print": 0, "read": 1, @@ -257,6 +302,7 @@ "quick_entry": 0, "read_only": 1, "read_only_onload": 0, + "show_name_in_global_search": 0, "sort_field": "modified", "sort_order": "DESC", "track_changes": 1, diff --git a/frappe/public/js/frappe/form/share.js b/frappe/public/js/frappe/form/share.js index 828ea69ede..a44a61eeb4 100644 --- a/frappe/public/js/frappe/form/share.js +++ b/frappe/public/js/frappe/form/share.js @@ -140,7 +140,8 @@ frappe.ui.form.Share = Class.extend({ user: user, read: $(d.body).find(".add-share-read").prop("checked") ? 1 : 0, write: $(d.body).find(".add-share-write").prop("checked") ? 1 : 0, - share: $(d.body).find(".add-share-share").prop("checked") ? 1 : 0 + share: $(d.body).find(".add-share-share").prop("checked") ? 1 : 0, + notify: $(d.body).find(".add-share-notify").prop("checked") ? 1 : 0 }, btn: this, callback: function(r) { diff --git a/frappe/public/js/frappe/form/templates/set_sharing.html b/frappe/public/js/frappe/form/templates/set_sharing.html index 0452dc7fd6..33e19c0139 100644 --- a/frappe/public/js/frappe/form/templates/set_sharing.html +++ b/frappe/public/js/frappe/form/templates/set_sharing.html @@ -51,5 +51,7 @@

+ {%= __("Notify via email")%} + {% } %} diff --git a/frappe/share.py b/frappe/share.py index e277570504..3ca0d13f12 100644 --- a/frappe/share.py +++ b/frappe/share.py @@ -7,8 +7,9 @@ from frappe import _ from frappe.utils import cint @frappe.whitelist() -def add(doctype, name, user=None, read=1, write=0, share=0, everyone=0, flags=None): +def add(doctype, name, user=None, read=1, write=0, share=0, everyone=0, flags=None, notify=0): """Share the given document with a user.""" + print notify, share if not user: user = frappe.session.user @@ -39,6 +40,7 @@ def add(doctype, name, user=None, read=1, write=0, share=0, everyone=0, flags=No }) doc.save(ignore_permissions=True) + notify_assignment(user, doctype, name, description=None, notify=notify) return doc @@ -134,3 +136,20 @@ def check_share_permission(doctype, name): """Check if the user can share with other users""" if not frappe.has_permission(doctype, ptype="share", doc=name): frappe.throw(_("No permission to {0} {1} {2}".format("share", doctype, name)), frappe.PermissionError) + +def notify_assignment(shared_by, doc_type, doc_name, description=None, notify=0): + + if not (shared_by and doc_type and doc_name): return + + from frappe.utils import get_link_to_form + document = get_link_to_form(doc_type, doc_name, label="%s: %s" % (doc_type, doc_name)) + + arg = { + 'contact': shared_by, + 'txt': _("A new document {0} has been shared by with you {1}.").format(document, + shared_by), + 'notify': notify + } + + from frappe.desk.page.chat import chat + chat.post(**arg) From 144f5e23bdd07c380ac20d759a05b475de04cb10 Mon Sep 17 00:00:00 2001 From: shridhar Date: Fri, 15 Sep 2017 16:35:55 +0530 Subject: [PATCH 019/135] Email notification on docshare Send an email notification when a doc is shared New notify_by_email colum added in docshare Checkbox added in set_sharing.html --- frappe/core/doctype/docshare/docshare.json | 513 +++++++++--------- frappe/public/js/frappe/form/share.js | 3 +- .../js/frappe/form/templates/set_sharing.html | 2 + frappe/share.py | 21 +- 4 files changed, 295 insertions(+), 244 deletions(-) diff --git a/frappe/core/doctype/docshare/docshare.json b/frappe/core/doctype/docshare/docshare.json index 83d837b7f8..a4efb6bd4d 100644 --- a/frappe/core/doctype/docshare/docshare.json +++ b/frappe/core/doctype/docshare/docshare.json @@ -1,264 +1,293 @@ { - "allow_copy": 0, - "allow_import": 1, - "allow_rename": 0, - "autoname": "hash", - "beta": 0, - "creation": "2015-02-04 04:33:36.330477", - "custom": 0, - "description": "Internal record of document shares", - "docstatus": 0, - "doctype": "DocType", - "document_type": "System", - "editable_grid": 0, + "allow_copy": 0, + "allow_import": 1, + "allow_rename": 0, + "autoname": "hash", + "beta": 0, + "creation": "2015-02-04 04:33:36.330477", + "custom": 0, + "description": "Internal record of document shares", + "docstatus": 0, + "doctype": "DocType", + "document_type": "System", + "editable_grid": 0, "fields": [ { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "user", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "User", - "length": 0, - "no_copy": 0, - "options": "User", - "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": 1, - "set_only_once": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "user", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "User", + "length": 0, + "no_copy": 0, + "options": "User", + "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": 1, + "set_only_once": 0, "unique": 0 - }, + }, { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "share_doctype", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Document Type", - "length": 0, - "no_copy": 0, - "options": "DocType", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 1, - "set_only_once": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "share_doctype", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Document Type", + "length": 0, + "no_copy": 0, + "options": "DocType", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 1, + "set_only_once": 0, "unique": 0 - }, + }, { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "share_name", - "fieldtype": "Dynamic Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Document Name", - "length": 0, - "no_copy": 0, - "options": "share_doctype", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 1, - "set_only_once": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "share_name", + "fieldtype": "Dynamic Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Document Name", + "length": 0, + "no_copy": 0, + "options": "share_doctype", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 1, + "set_only_once": 0, "unique": 0 - }, + }, { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "0", - "fieldname": "read", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Read", - "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, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "0", + "fieldname": "read", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Read", + "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_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "0", - "fieldname": "write", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Write", - "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, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "0", + "fieldname": "write", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Write", + "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_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "0", - "fieldname": "share", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Share", - "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, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "0", + "fieldname": "share", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Share", + "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_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "everyone", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Everyone", - "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, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "everyone", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Everyone", + "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_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "1", + "fieldname": "notify_by_email", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Notify by email", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 1, + "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 } - ], - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_view": 0, - "in_create": 1, - "in_dialog": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 0, - "max_attachments": 0, - "modified": "2016-12-29 14:40:40.284335", - "modified_by": "Administrator", - "module": "Core", - "name": "DocShare", - "name_case": "", - "owner": "Administrator", + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 1, + "is_submittable": 0, + "issingle": 0, + "istable": 0, + "max_attachments": 0, + "modified": "2017-09-15 15:58:34.126438", + "modified_by": "Administrator", + "module": "Core", + "name": "DocShare", + "name_case": "", + "owner": "Administrator", "permissions": [ { - "amend": 0, - "apply_user_permissions": 0, - "cancel": 0, - "create": 1, - "delete": 1, - "email": 0, - "export": 1, - "if_owner": 0, - "import": 1, - "is_custom": 0, - "permlevel": 0, - "print": 0, - "read": 1, - "report": 1, - "role": "System Manager", - "set_user_permissions": 0, - "share": 1, - "submit": 0, + "amend": 0, + "apply_user_permissions": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 0, + "export": 1, + "if_owner": 0, + "import": 1, + "permlevel": 0, + "print": 0, + "read": 1, + "report": 1, + "role": "System Manager", + "set_user_permissions": 0, + "share": 1, + "submit": 0, "write": 1 } - ], - "quick_entry": 0, - "read_only": 1, - "read_only_onload": 0, - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 1, + ], + "quick_entry": 0, + "read_only": 1, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, "track_seen": 0 -} \ No newline at end of file +} diff --git a/frappe/public/js/frappe/form/share.js b/frappe/public/js/frappe/form/share.js index 828ea69ede..a44a61eeb4 100644 --- a/frappe/public/js/frappe/form/share.js +++ b/frappe/public/js/frappe/form/share.js @@ -140,7 +140,8 @@ frappe.ui.form.Share = Class.extend({ user: user, read: $(d.body).find(".add-share-read").prop("checked") ? 1 : 0, write: $(d.body).find(".add-share-write").prop("checked") ? 1 : 0, - share: $(d.body).find(".add-share-share").prop("checked") ? 1 : 0 + share: $(d.body).find(".add-share-share").prop("checked") ? 1 : 0, + notify: $(d.body).find(".add-share-notify").prop("checked") ? 1 : 0 }, btn: this, callback: function(r) { diff --git a/frappe/public/js/frappe/form/templates/set_sharing.html b/frappe/public/js/frappe/form/templates/set_sharing.html index 0452dc7fd6..33e19c0139 100644 --- a/frappe/public/js/frappe/form/templates/set_sharing.html +++ b/frappe/public/js/frappe/form/templates/set_sharing.html @@ -51,5 +51,7 @@

+ {%= __("Notify via email")%} + {% } %} diff --git a/frappe/share.py b/frappe/share.py index e277570504..3ca0d13f12 100644 --- a/frappe/share.py +++ b/frappe/share.py @@ -7,8 +7,9 @@ from frappe import _ from frappe.utils import cint @frappe.whitelist() -def add(doctype, name, user=None, read=1, write=0, share=0, everyone=0, flags=None): +def add(doctype, name, user=None, read=1, write=0, share=0, everyone=0, flags=None, notify=0): """Share the given document with a user.""" + print notify, share if not user: user = frappe.session.user @@ -39,6 +40,7 @@ def add(doctype, name, user=None, read=1, write=0, share=0, everyone=0, flags=No }) doc.save(ignore_permissions=True) + notify_assignment(user, doctype, name, description=None, notify=notify) return doc @@ -134,3 +136,20 @@ def check_share_permission(doctype, name): """Check if the user can share with other users""" if not frappe.has_permission(doctype, ptype="share", doc=name): frappe.throw(_("No permission to {0} {1} {2}".format("share", doctype, name)), frappe.PermissionError) + +def notify_assignment(shared_by, doc_type, doc_name, description=None, notify=0): + + if not (shared_by and doc_type and doc_name): return + + from frappe.utils import get_link_to_form + document = get_link_to_form(doc_type, doc_name, label="%s: %s" % (doc_type, doc_name)) + + arg = { + 'contact': shared_by, + 'txt': _("A new document {0} has been shared by with you {1}.").format(document, + shared_by), + 'notify': notify + } + + from frappe.desk.page.chat import chat + chat.post(**arg) From 421b43680311ba004443839f7707001361f510dd Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Mon, 18 Sep 2017 16:32:33 +0530 Subject: [PATCH 020/135] move run webhook to Document from hooks --- frappe/hooks.py | 17 ++----- .../integrations/doctype/webhook/webhook.py | 23 +++++++++ frappe/model/document.py | 47 +++++++++++++++++++ 3 files changed, 73 insertions(+), 14 deletions(-) diff --git a/frappe/hooks.py b/frappe/hooks.py index 9fdca1a87a..f5d98f0421 100755 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -108,25 +108,14 @@ doc_events = { "*": { "on_update": [ "frappe.desk.notifications.clear_doctype_notifications", - "frappe.core.doctype.communication.feed.update_feed", - "frappe.integrations.webhooks.doc_event_webhook" + "frappe.core.doctype.communication.feed.update_feed" ], "after_rename": "frappe.desk.notifications.clear_doctype_notifications", "on_cancel": [ "frappe.desk.notifications.clear_doctype_notifications", - "frappe.integrations.webhooks.doc_event_webhook" ], - "on_trash": [ - "frappe.desk.notifications.clear_doctype_notifications", - "frappe.integrations.webhooks.doc_event_webhook" - ], - "on_change": [ - "frappe.core.doctype.feedback_trigger.feedback_trigger.trigger_feedback_request", - "frappe.integrations.webhooks.doc_event_webhook" - ], - "after_insert": "frappe.integrations.webhooks.doc_event_webhook", - "on_submit": "frappe.integrations.webhooks.doc_event_webhook", - "on_update_after_submit": "frappe.integrations.webhooks.doc_event_webhook" + "on_trash": "frappe.desk.notifications.clear_doctype_notifications", + "on_change": "frappe.core.doctype.feedback_trigger.feedback_trigger.trigger_feedback_request" }, "Email Group Member": { "validate": "frappe.email.doctype.email_group.email_group.restrict_email_group" diff --git a/frappe/integrations/doctype/webhook/webhook.py b/frappe/integrations/doctype/webhook/webhook.py index 5f74b22ac4..10b07adcba 100644 --- a/frappe/integrations/doctype/webhook/webhook.py +++ b/frappe/integrations/doctype/webhook/webhook.py @@ -4,6 +4,7 @@ from __future__ import unicode_literals import frappe +import json, requests from frappe import _ from frappe.model.document import Document from six.moves.urllib.parse import urlparse @@ -35,3 +36,25 @@ class Webhook(Document): if len(webhook_data)!= len(set(webhook_data)): frappe.throw(_("Same Field is entered more than once")) + def request(self, doc): + headers = {} + data = {} + if self.webhook_headers: + for h in self.webhook_headers: + if h.get("key") and h.get("value"): + headers[h.get("key")] = h.get("value") + if self.webhook_data: + for k, v in doc.as_dict().items(): + for w in self.webhook_data: + if k == w.fieldname: + data[w.key] = v + r = requests.post(self.request_url, data=json.dumps(data), headers=headers, timeout=5) + frappe.logger().debug({"webhook_success":r.text}) + +def evaluate_webhook(doc, webhook): + webhook = frappe.get_doc("Webhook", webhook.get("name")) + try: + webhook.request(doc) + except Exception as e: + frappe.log_error(message=frappe.get_traceback(), title=e) + frappe.throw(_("Error in Webhook")) diff --git a/frappe/model/document.py b/frappe/model/document.py index 033c807418..d43f487e8f 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -169,6 +169,7 @@ class Document(BaseDocument): return self.flags.email_alerts_executed = [] + self.flags.webhooks_executed = [] if ignore_permissions!=None: self.flags.ignore_permissions = ignore_permissions @@ -242,6 +243,7 @@ class Document(BaseDocument): return self.flags.email_alerts_executed = [] + self.flags.webhooks_executed = [] if ignore_permissions!=None: self.flags.ignore_permissions = ignore_permissions @@ -671,6 +673,7 @@ class Document(BaseDocument): out = Document.hook(fn)(self, *args, **kwargs) self.run_email_alerts(method) + self.run_webhooks(method) return out @@ -723,6 +726,50 @@ class Document(BaseDocument): elif alert.event=='Method' and method == alert.method: _evaluate_alert(alert) + def run_webhooks(self, method): + '''Run webhooks for this method''' + if frappe.flags.in_import or frappe.flags.in_patch or frappe.flags.in_install: + return + + if self.flags.webhooks_executed==None: + self.flags.webhooks_executed = [] + + from frappe.integrations.doctype.webhook.webhook import evaluate_webhook + + if self.flags.webhooks == None: + webhooks = frappe.cache().hget('webhooks', self.doctype) + if webhooks==None: + webhooks = frappe.get_all('Webhook', + fields=["name", "webhook_docevent", "webhook_doctype"]) + frappe.cache().hset('webhooks', self.doctype, webhooks) + self.flags.webhooks = webhooks + + if not self.flags.webhooks: + return + + def _evaluate_webhook(webhook): + if not webhook.name in self.flags.webhooks_executed: + evaluate_webhook(self, webhook) + self.flags.webhooks_executed.append(webhook.name) + + event_map = { + "on_update": "on_update", + "after_insert": "after_insert", + "on_submit": "on_submit", + "on_cancel": "on_cancel", + "on_trash": "on_trash" + } + + if not self.flags.in_insert: + # value change is not applicable in insert + event_map['on_change'] = 'on_change' + event_map['before_update_after_submit'] = 'before_update_after_submit' + + for webhook in self.flags.webhooks: + event = event_map.get(method, None) + if event and webhook.webhook_docevent == event: + _evaluate_webhook(webhook) + @staticmethod def whitelist(f): f.whitelisted = True From fadb45e369dcdb9697fb63fdd8a6c7d77a8272bc Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Mon, 18 Sep 2017 17:10:53 +0530 Subject: [PATCH 021/135] enqueue webhook request --- .../integrations/doctype/webhook/webhook.py | 8 +++-- frappe/integrations/webhooks.py | 33 ------------------- 2 files changed, 5 insertions(+), 36 deletions(-) delete mode 100644 frappe/integrations/webhooks.py diff --git a/frappe/integrations/doctype/webhook/webhook.py b/frappe/integrations/doctype/webhook/webhook.py index 10b07adcba..1fe9161f51 100644 --- a/frappe/integrations/doctype/webhook/webhook.py +++ b/frappe/integrations/doctype/webhook/webhook.py @@ -51,10 +51,12 @@ class Webhook(Document): r = requests.post(self.request_url, data=json.dumps(data), headers=headers, timeout=5) frappe.logger().debug({"webhook_success":r.text}) -def evaluate_webhook(doc, webhook): +def enqueue_webhook(doc, webhook): webhook = frappe.get_doc("Webhook", webhook.get("name")) try: webhook.request(doc) except Exception as e: - frappe.log_error(message=frappe.get_traceback(), title=e) - frappe.throw(_("Error in Webhook")) + frappe.throw(_("Error in Webhook"), exc=e) + +def evaluate_webhook(doc, webhook): + frappe.enqueue('frappe.integrations.doctype.webhook.webhook.enqueue_webhook', doc=doc, webhook=webhook) diff --git a/frappe/integrations/webhooks.py b/frappe/integrations/webhooks.py deleted file mode 100644 index 466a0f0470..0000000000 --- a/frappe/integrations/webhooks.py +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# MIT License. See license.txt - -from __future__ import unicode_literals -import frappe, requests, json -from frappe import _ - -# Doc Events Webhook -def doc_event_webhook(doc, method=None, *args, **kwargs): - headers = {} - data = {} - filters = { - "webhook_doctype": doc.get("doctype"), - "webhook_docevent": method - } - webhooks = frappe.get_all("Webhook", filters=filters) - webhook = frappe.get_doc("Webhook", webhooks[0].get("name")) if webhooks and len(webhooks) > 0 else None - if webhook: - if webhook.webhook_headers: - for h in webhook.webhook_headers: - if h.get("key") and h.get("value"): - headers[h.get("key")] = h.get("value") - if webhook.webhook_data: - for k, v in doc.as_dict().items(): - for w in webhook.webhook_data: - if k == w.fieldname: - data[w.key] = v - try: - r = requests.post(webhook.request_url, data=json.dumps(data), headers=headers, timeout=5) - frappe.logger().debug({"webhook_success":r.text, "webhook": webhook.as_json()}) - except Exception as e: - frappe.logger().debug({"webhook_error":r.text, "webhook": webhook.as_json()}) - frappe.throw(_("Unable to make request"), exc=e) From 92973a1cf9f5967fdc723f5a3aaace66f4a3e9b3 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Fri, 15 Sep 2017 12:47:40 +0530 Subject: [PATCH 022/135] [minor] don't setup checkbox if the childtable is read_only --- frappe/public/js/frappe/form/grid.js | 3 ++- frappe/public/js/frappe/form/grid_row.js | 10 +++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index f1a5ab10fe..0a3b2db48c 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -142,6 +142,8 @@ frappe.ui.form.Grid = Class.extend({ grid: this }); } + // to hide checkbox if grid is not editable + this.header_row.toggle_check(); }, refresh: function(force) { !this.wrapper && this.make(); @@ -170,7 +172,6 @@ frappe.ui.form.Grid = Class.extend({ } else { // redraw var _scroll_y = $(document).scrollTop(); - this.make_head(); if(!this.grid_rows) { diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js index aee170b35c..cea9c04551 100644 --- a/frappe/public/js/frappe/form/grid_row.js +++ b/frappe/public/js/frappe/form/grid_row.js @@ -2,10 +2,10 @@ frappe.ui.form.GridRow = Class.extend({ init: function(opts) { this.on_grid_fields_dict = {}; this.on_grid_fields = []; - this.row_check_html = ''; this.columns = {}; this.columns_list = []; $.extend(this, opts); + this.row_check_html = ''; this.make(); }, make: function() { @@ -121,6 +121,8 @@ frappe.ui.form.GridRow = Class.extend({ if(this.grid_form) { this.grid_form.layout && this.grid_form.layout.refresh(this.doc); } + + this.toggle_check(); }, render_template: function() { this.set_row_index(); @@ -592,4 +594,10 @@ frappe.ui.form.GridRow = Class.extend({ toggle_editable: function(fieldname, editable) { this.set_field_property(fieldname, 'read_only', editable ? 0 : 1); }, + toggle_check: function() { + // to hide checkbox if grid is not editable + this.wrapper + .find('.grid-row-check') + .css("display", this.grid.is_editable()? 'block':'none'); + } }); \ No newline at end of file From 7ddc6ce933124f89be8d87f4ebbe33aaea5c82f6 Mon Sep 17 00:00:00 2001 From: Manas Solanki Date: Tue, 19 Sep 2017 14:07:01 +0530 Subject: [PATCH 023/135] try catch expression in eval for depends_on --- frappe/public/js/frappe/form/layout.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js index 9ec3ee38a3..fc5e70a345 100644 --- a/frappe/public/js/frappe/form/layout.js +++ b/frappe/public/js/frappe/form/layout.js @@ -441,7 +441,12 @@ frappe.ui.form.Layout = Class.extend({ var parent = this.frm ? this.frm.doc : null; if(expression.substr(0,5)=='eval:') { - out = eval(expression.substr(5)); + try { + out = eval(expression.substr(5)); + } catch(e) { + frappe.throw(_('Invalid "depends_on" expression')) + } + } else if(expression.substr(0,3)=='fn:' && this.frm) { out = this.frm.script_manager.trigger(expression.substr(3), this.doctype, this.docname); } else { From e7459c7e83ad5c5c68b2c458bcac4474194f217f Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Tue, 19 Sep 2017 16:40:17 +0530 Subject: [PATCH 024/135] Clean up --- .../integrations/doctype/webhook/webhook.py | 2 +- frappe/model/document.py | 24 +++++++------------ 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/frappe/integrations/doctype/webhook/webhook.py b/frappe/integrations/doctype/webhook/webhook.py index 1fe9161f51..8bbcbdc5ad 100644 --- a/frappe/integrations/doctype/webhook/webhook.py +++ b/frappe/integrations/doctype/webhook/webhook.py @@ -58,5 +58,5 @@ def enqueue_webhook(doc, webhook): except Exception as e: frappe.throw(_("Error in Webhook"), exc=e) -def evaluate_webhook(doc, webhook): +def webhook_request(doc, webhook): frappe.enqueue('frappe.integrations.doctype.webhook.webhook.enqueue_webhook', doc=doc, webhook=webhook) diff --git a/frappe/model/document.py b/frappe/model/document.py index d43f487e8f..2e83f085f3 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -734,41 +734,35 @@ class Document(BaseDocument): if self.flags.webhooks_executed==None: self.flags.webhooks_executed = [] - from frappe.integrations.doctype.webhook.webhook import evaluate_webhook + from frappe.integrations.doctype.webhook.webhook import webhook_request if self.flags.webhooks == None: webhooks = frappe.cache().hget('webhooks', self.doctype) if webhooks==None: webhooks = frappe.get_all('Webhook', - fields=["name", "webhook_docevent", "webhook_doctype"]) + fields=["name", "webhook_docevent"]) frappe.cache().hset('webhooks', self.doctype, webhooks) self.flags.webhooks = webhooks if not self.flags.webhooks: return - def _evaluate_webhook(webhook): + def _webhook_request(webhook): if not webhook.name in self.flags.webhooks_executed: - evaluate_webhook(self, webhook) + webhook_request(self, webhook) self.flags.webhooks_executed.append(webhook.name) - event_map = { - "on_update": "on_update", - "after_insert": "after_insert", - "on_submit": "on_submit", - "on_cancel": "on_cancel", - "on_trash": "on_trash" - } + event_list = ["on_update", "after_insert", "on_submit", "on_cancel", "on_trash"] if not self.flags.in_insert: # value change is not applicable in insert - event_map['on_change'] = 'on_change' - event_map['before_update_after_submit'] = 'before_update_after_submit' + event_list.append('on_change') + event_list.append('before_update_after_submit') for webhook in self.flags.webhooks: - event = event_map.get(method, None) + event = method if method in event_list else None if event and webhook.webhook_docevent == event: - _evaluate_webhook(webhook) + _webhook_request(webhook) @staticmethod def whitelist(f): From 9b1f46d2c86ea952dbde6062f8828d713080bce0 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Wed, 20 Sep 2017 12:02:22 +0530 Subject: [PATCH 025/135] [minor] move the toggle_check funcation call to refresh --- frappe/public/js/frappe/form/grid.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index 0a3b2db48c..ad018a1c79 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -142,8 +142,6 @@ frappe.ui.form.Grid = Class.extend({ grid: this }); } - // to hide checkbox if grid is not editable - this.header_row.toggle_check(); }, refresh: function(force) { !this.wrapper && this.make(); @@ -173,6 +171,8 @@ frappe.ui.form.Grid = Class.extend({ // redraw var _scroll_y = $(document).scrollTop(); this.make_head(); + // to hide checkbox if grid is not editable + this.header_row && this.header_row.toggle_check(); if(!this.grid_rows) { this.grid_rows = []; From 1f9b1e40e36134210acb71213d220eb0dfad38c7 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Wed, 20 Sep 2017 16:33:28 +0530 Subject: [PATCH 026/135] Moved run_webhooks to webhook.py --- .../integrations/doctype/webhook/webhook.py | 38 +++++++++++++++- frappe/model/document.py | 45 ++----------------- 2 files changed, 40 insertions(+), 43 deletions(-) diff --git a/frappe/integrations/doctype/webhook/webhook.py b/frappe/integrations/doctype/webhook/webhook.py index 8bbcbdc5ad..6a95085c24 100644 --- a/frappe/integrations/doctype/webhook/webhook.py +++ b/frappe/integrations/doctype/webhook/webhook.py @@ -49,6 +49,7 @@ class Webhook(Document): if k == w.fieldname: data[w.key] = v r = requests.post(self.request_url, data=json.dumps(data), headers=headers, timeout=5) + r.raise_for_status() frappe.logger().debug({"webhook_success":r.text}) def enqueue_webhook(doc, webhook): @@ -58,5 +59,38 @@ def enqueue_webhook(doc, webhook): except Exception as e: frappe.throw(_("Error in Webhook"), exc=e) -def webhook_request(doc, webhook): - frappe.enqueue('frappe.integrations.doctype.webhook.webhook.enqueue_webhook', doc=doc, webhook=webhook) +def run_webhooks(doc, method): + '''Run webhooks for this method''' + if frappe.flags.in_import or frappe.flags.in_patch or frappe.flags.in_install: + return + + if not getattr(frappe.local, 'webhooks_executed', None): + frappe.local.webhooks_executed = [] + + if doc.flags.webhooks == None: + webhooks = frappe.cache().hget('webhooks', doc.doctype) + if webhooks==None: + webhooks = frappe.get_all('Webhook', + fields=["name", "webhook_docevent"]) + frappe.cache().hset('webhooks', doc.doctype, webhooks) + doc.flags.webhooks = webhooks + + if not doc.flags.webhooks: + return + + def _webhook_request(webhook): + if not webhook.name in frappe.local.webhooks_executed: + frappe.enqueue("frappe.integrations.doctype.webhook.webhook.enqueue_webhook", doc=doc, webhook=webhook) + frappe.local.webhooks_executed.append(webhook.name) + + event_list = ["on_update", "after_insert", "on_submit", "on_cancel", "on_trash"] + + if not doc.flags.in_insert: + # value change is not applicable in insert + event_list.append('on_change') + event_list.append('before_update_after_submit') + + for webhook in doc.flags.webhooks: + event = method if method in event_list else None + if event and webhook.webhook_docevent == event: + _webhook_request(webhook) diff --git a/frappe/model/document.py b/frappe/model/document.py index 2e83f085f3..5e4bfc01c4 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -169,7 +169,7 @@ class Document(BaseDocument): return self.flags.email_alerts_executed = [] - self.flags.webhooks_executed = [] + setattr(frappe.local, 'webhooks_executed', []) if ignore_permissions!=None: self.flags.ignore_permissions = ignore_permissions @@ -243,7 +243,7 @@ class Document(BaseDocument): return self.flags.email_alerts_executed = [] - self.flags.webhooks_executed = [] + setattr(frappe.local, 'webhooks_executed', []) if ignore_permissions!=None: self.flags.ignore_permissions = ignore_permissions @@ -673,7 +673,8 @@ class Document(BaseDocument): out = Document.hook(fn)(self, *args, **kwargs) self.run_email_alerts(method) - self.run_webhooks(method) + from frappe.integrations.doctype.webhook.webhook import run_webhooks + run_webhooks(self, method) return out @@ -726,44 +727,6 @@ class Document(BaseDocument): elif alert.event=='Method' and method == alert.method: _evaluate_alert(alert) - def run_webhooks(self, method): - '''Run webhooks for this method''' - if frappe.flags.in_import or frappe.flags.in_patch or frappe.flags.in_install: - return - - if self.flags.webhooks_executed==None: - self.flags.webhooks_executed = [] - - from frappe.integrations.doctype.webhook.webhook import webhook_request - - if self.flags.webhooks == None: - webhooks = frappe.cache().hget('webhooks', self.doctype) - if webhooks==None: - webhooks = frappe.get_all('Webhook', - fields=["name", "webhook_docevent"]) - frappe.cache().hset('webhooks', self.doctype, webhooks) - self.flags.webhooks = webhooks - - if not self.flags.webhooks: - return - - def _webhook_request(webhook): - if not webhook.name in self.flags.webhooks_executed: - webhook_request(self, webhook) - self.flags.webhooks_executed.append(webhook.name) - - event_list = ["on_update", "after_insert", "on_submit", "on_cancel", "on_trash"] - - if not self.flags.in_insert: - # value change is not applicable in insert - event_list.append('on_change') - event_list.append('before_update_after_submit') - - for webhook in self.flags.webhooks: - event = method if method in event_list else None - if event and webhook.webhook_docevent == event: - _webhook_request(webhook) - @staticmethod def whitelist(f): f.whitelisted = True From 2d148c804e65d4e5405dde1666801c83023cb227 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Wed, 20 Sep 2017 18:34:28 +0530 Subject: [PATCH 027/135] Webhook retry 3 times --- .../integrations/doctype/webhook/webhook.py | 49 +++++++++++-------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/frappe/integrations/doctype/webhook/webhook.py b/frappe/integrations/doctype/webhook/webhook.py index 6a95085c24..29b6bde639 100644 --- a/frappe/integrations/doctype/webhook/webhook.py +++ b/frappe/integrations/doctype/webhook/webhook.py @@ -8,6 +8,7 @@ import json, requests from frappe import _ from frappe.model.document import Document from six.moves.urllib.parse import urlparse +from time import sleep class Webhook(Document): def autoname(self): @@ -36,28 +37,34 @@ class Webhook(Document): if len(webhook_data)!= len(set(webhook_data)): frappe.throw(_("Same Field is entered more than once")) - def request(self, doc): - headers = {} - data = {} - if self.webhook_headers: - for h in self.webhook_headers: - if h.get("key") and h.get("value"): - headers[h.get("key")] = h.get("value") - if self.webhook_data: - for k, v in doc.as_dict().items(): - for w in self.webhook_data: - if k == w.fieldname: - data[w.key] = v - r = requests.post(self.request_url, data=json.dumps(data), headers=headers, timeout=5) - r.raise_for_status() - frappe.logger().debug({"webhook_success":r.text}) def enqueue_webhook(doc, webhook): webhook = frappe.get_doc("Webhook", webhook.get("name")) - try: - webhook.request(doc) - except Exception as e: - frappe.throw(_("Error in Webhook"), exc=e) + headers = {} + data = {} + if webhook.webhook_headers: + for h in webhook.webhook_headers: + if h.get("key") and h.get("value"): + headers[h.get("key")] = h.get("value") + if webhook.webhook_data: + for w in webhook.webhook_data: + for k, v in doc.as_dict().items(): + if k == w.fieldname: + data[w.key] = v + error_status = [] + for i in range(3): + try: + r = requests.post(webhook.request_url, data=json.dumps(data), headers=headers, timeout=5) + r.raise_for_status() + frappe.logger().debug({"webhook_success":r.text}) + break + except Exception as e: + frappe.logger().debug({"webhook_error":e, "try": i+1}) + sleep(3*i + 1) + if i !=2: + continue + else: + raise e def run_webhooks(doc, method): '''Run webhooks for this method''' @@ -71,7 +78,7 @@ def run_webhooks(doc, method): webhooks = frappe.cache().hget('webhooks', doc.doctype) if webhooks==None: webhooks = frappe.get_all('Webhook', - fields=["name", "webhook_docevent"]) + fields=["name", "webhook_docevent", "webhook_doctype"]) frappe.cache().hset('webhooks', doc.doctype, webhooks) doc.flags.webhooks = webhooks @@ -92,5 +99,5 @@ def run_webhooks(doc, method): for webhook in doc.flags.webhooks: event = method if method in event_list else None - if event and webhook.webhook_docevent == event: + if event and webhook.webhook_docevent == event and webhook.webhook_doctype == doc.doctype: _webhook_request(webhook) From 45f2ff43addfc374034f2b911ba29f998b37a122 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Wed, 20 Sep 2017 18:52:50 +0530 Subject: [PATCH 028/135] [Fix] Codacy https://www.codacy.com/app/frappe/frappe/pullRequest?prid=900990 --- frappe/integrations/doctype/webhook/webhook.py | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/integrations/doctype/webhook/webhook.py b/frappe/integrations/doctype/webhook/webhook.py index 29b6bde639..26ecc36413 100644 --- a/frappe/integrations/doctype/webhook/webhook.py +++ b/frappe/integrations/doctype/webhook/webhook.py @@ -51,7 +51,6 @@ def enqueue_webhook(doc, webhook): for k, v in doc.as_dict().items(): if k == w.fieldname: data[w.key] = v - error_status = [] for i in range(3): try: r = requests.post(webhook.request_url, data=json.dumps(data), headers=headers, timeout=5) From 486ea5bb05b1281f16d7c8c42d4f905b2ac1b37a Mon Sep 17 00:00:00 2001 From: Manas Solanki Date: Thu, 21 Sep 2017 12:24:18 +0530 Subject: [PATCH 029/135] fix codacy --- frappe/public/js/frappe/form/layout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js index fc5e70a345..2334ab9876 100644 --- a/frappe/public/js/frappe/form/layout.js +++ b/frappe/public/js/frappe/form/layout.js @@ -444,7 +444,7 @@ frappe.ui.form.Layout = Class.extend({ try { out = eval(expression.substr(5)); } catch(e) { - frappe.throw(_('Invalid "depends_on" expression')) + frappe.throw(__('Invalid "depends_on" expression')); } } else if(expression.substr(0,3)=='fn:' && this.frm) { From 82c9357b50165752759c6297ef4eaacb9fd4f48c Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 21 Sep 2017 14:54:58 +0530 Subject: [PATCH 030/135] [fix] item selector --- frappe/public/css/list.css | 16 +++++++++++++++ frappe/public/js/frappe/assets.js | 2 +- frappe/public/js/frappe/form/grid.js | 2 +- .../js/frappe/form/templates/grid_body.html | 4 +++- .../js/frappe/ui/toolbar/search_utils.js | 2 +- frappe/public/less/list.less | 20 +++++++++++++++++++ 6 files changed, 42 insertions(+), 4 deletions(-) diff --git a/frappe/public/css/list.css b/frappe/public/css/list.css index 49ecce16de..abed4bc105 100644 --- a/frappe/public/css/list.css +++ b/frappe/public/css/list.css @@ -288,6 +288,10 @@ display: flex; flex-wrap: wrap; } +.image-view-container .image-view-row { + display: flex; + border-bottom: 1px solid #ebeff2; +} .image-view-container .image-view-item { flex: 0 0 25%; padding: 15px; @@ -360,6 +364,18 @@ border-bottom: 1px solid #EBEFF2; } } +.item-selector { + border: 1px solid #d1d8dd; +} +.item-selector .image-view-row { + width: 100%; +} +.item-selector .image-field { + height: 120px; +} +.item-selector .placeholder-text { + font-size: 48px; +} .image-view-container.three-column .image-view-item { flex: 0 0 33.33333333%; } diff --git a/frappe/public/js/frappe/assets.js b/frappe/public/js/frappe/assets.js index 8cdbfeafe0..71c576e291 100644 --- a/frappe/public/js/frappe/assets.js +++ b/frappe/public/js/frappe/assets.js @@ -85,7 +85,7 @@ frappe.assets = { frappe.assets.executed_.push(path) } } - callback(); + callback && callback(); }, // check if the asset exists in diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index ad018a1c79..93fdabdb27 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -653,7 +653,7 @@ frappe.ui.form.Grid = Class.extend({ var btn = this.custom_buttons[label]; if(!btn) { btn = $('') - .css('margin-right', '10px') + .css('margin-right', '4px') .prependTo(this.grid_buttons) .on('click', click); this.custom_buttons[label] = btn; diff --git a/frappe/public/js/frappe/form/templates/grid_body.html b/frappe/public/js/frappe/form/templates/grid_body.html index 8b3a1b6082..5fef1379b9 100644 --- a/frappe/public/js/frappe/form/templates/grid_body.html +++ b/frappe/public/js/frappe/form/templates/grid_body.html @@ -7,7 +7,9 @@
- +

- {%= __("Notify via email")%} - - {% } %} -
+
+
+
+
+ +
+
+
+ {% endif %} +
\ No newline at end of file diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less index 786c05461b..0275a7695a 100644 --- a/frappe/public/less/desk.less +++ b/frappe/public/less/desk.less @@ -195,9 +195,9 @@ textarea.form-control { width: 100%; &> ul { - z-index: 1041; + z-index: 1041 !important; transition: none; - background: #fff; + background-color: #fff; max-height: 200px; overflow-y: auto; overflow-x: hidden; From 16c6d64eacf9f558eb745010f27d48255650b942 Mon Sep 17 00:00:00 2001 From: Omar Jaber Date: Thu, 21 Sep 2017 14:02:36 +0300 Subject: [PATCH 032/135] RTL direction reports chart problem This will edit the style of charts in the system --- frappe/public/css/report-rtl.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/frappe/public/css/report-rtl.css b/frappe/public/css/report-rtl.css index cc87b52bbf..26709a55e3 100644 --- a/frappe/public/css/report-rtl.css +++ b/frappe/public/css/report-rtl.css @@ -1,3 +1,11 @@ .grid-report { direction: ltr; } + +.chart_area{ + direction: ltr; +} + +.grid-report .show-zero{ + direction: rtl ; +} From dcaf5f98af8244d380c5652abc0dd7db7149f845 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 21 Sep 2017 16:45:13 +0530 Subject: [PATCH 033/135] [fix] remove prints --- frappe/core/doctype/user/test_user.py | 5 -- .../test_exporter_fixtures.py | 66 +++++++++---------- .../integrations/doctype/webhook/__init__.py | 41 ++++++++++++ .../integrations/doctype/webhook/webhook.py | 40 ++--------- frappe/model/document.py | 2 +- frappe/share.py | 1 - 6 files changed, 79 insertions(+), 76 deletions(-) diff --git a/frappe/core/doctype/user/test_user.py b/frappe/core/doctype/user/test_user.py index c9ed243841..7d25254e4b 100644 --- a/frappe/core/doctype/user/test_user.py +++ b/frappe/core/doctype/user/test_user.py @@ -162,18 +162,13 @@ class TestUser(unittest.TestCase): # from frappe.frappeclient import FrappeClient # update_site_config('deny_multiple_sessions', 0) # - # print 'conn1' # conn1 = FrappeClient(get_url(), "test@example.com", "Eastern_43A1W", verify=False) # test_request(conn1) # - # print 'conn2' # conn2 = FrappeClient(get_url(), "test@example.com", "Eastern_43A1W", verify=False) # test_request(conn2) # # update_site_config('deny_multiple_sessions', 1) - # - # print 'conn3' - # # conn3 = FrappeClient(get_url(), "test@example.com", "Eastern_43A1W", verify=False) # test_request(conn3) # diff --git a/frappe/core/page/data_import_tool/test_exporter_fixtures.py b/frappe/core/page/data_import_tool/test_exporter_fixtures.py index f99664fb8f..4447fbc365 100644 --- a/frappe/core/page/data_import_tool/test_exporter_fixtures.py +++ b/frappe/core/page/data_import_tool/test_exporter_fixtures.py @@ -16,7 +16,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Script_fixture_simple(self): fixture = "Custom Script" path = frappe.scrub(fixture) + "_original_style.csv" - # print "teste done {}".format(path) + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -24,7 +24,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Script_fixture_simple_name_equal_default(self): fixture = ["Custom Script", {"name":["Item-Client"]}] path = frappe.scrub(fixture[0]) + "_simple_name_equal_default.csv" - # print "teste done {}".format(path) + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -32,7 +32,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Script_fixture_simple_name_equal(self): fixture = ["Custom Script", {"name":["Item-Client"],"op":"="}] path = frappe.scrub(fixture[0]) + "_simple_name_equal.csv" - # print "teste done {}".format(path) + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -40,7 +40,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Script_fixture_simple_name_not_equal(self): fixture = ["Custom Script", {"name":["Item-Client"],"op":"!="}] path = frappe.scrub(fixture[0]) + "_simple_name_not_equal.csv" - # print "teste done {}".format(path) + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -49,7 +49,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Script_fixture_simple_name_at_least_equal(self): fixture = ["Custom Script", {"name":"Item-Cli"}] path = frappe.scrub(fixture[0]) + "_simple_name_at_least_equal.csv" - # print "teste done {}".format(path) + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -57,7 +57,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Script_fixture_multi_name_equal(self): fixture = ["Custom Script", {"name":["Item-Client", "Customer-Client"],"op":"="}] path = frappe.scrub(fixture[0]) + "_multi_name_equal.csv" - # print "teste done {}".format(path) + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -65,7 +65,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Script_fixture_multi_name_not_equal(self): fixture = ["Custom Script", {"name":["Item-Client", "Customer-Client"],"op":"!="}] path = frappe.scrub(fixture[0]) + "_multi_name_not_equal.csv" - # print "teste done {}".format(path) + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -73,7 +73,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Script_fixture_empty_object(self): fixture = ["Custom Script", {}] path = frappe.scrub(fixture[0]) + "_empty_object_should_be_all.csv" - # print "teste done {}".format(path) + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -81,7 +81,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Script_fixture_just_list(self): fixture = ["Custom Script"] path = frappe.scrub(fixture[0]) + "_just_list_should_be_all.csv" - # print "teste done {}".format(path) + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -90,7 +90,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Script_fixture_rex_no_flags(self): fixture = ["Custom Script", {"name":r"^[i|A]"}] path = frappe.scrub(fixture[0]) + "_rex_no_flags.csv" - # print "teste done {}".format(path) + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -98,7 +98,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Script_fixture_rex_with_flags(self): fixture = ["Custom Script", {"name":r"^[i|A]", "flags":"L,M"}] path = frappe.scrub(fixture[0]) + "_rex_with_flags.csv" - # print "teste done {}".format(path) + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -107,7 +107,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Field_fixture_simple(self): fixture = "Custom Field" path = frappe.scrub(fixture) + "_original_style.csv" - # print "teste done {}".format(path) + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -115,7 +115,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Field_fixture_simple_name_equal_default(self): fixture = ["Custom Field", {"name":["Item-vat"]}] path = frappe.scrub(fixture[0]) + "_simple_name_equal_default.csv" - # print "teste done {}".format(path) + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -123,7 +123,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Field_fixture_simple_name_equal(self): fixture = ["Custom Field", {"name":["Item-vat"],"op":"="}] path = frappe.scrub(fixture[0]) + "_simple_name_equal.csv" - # print "teste done {}".format(path) + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -131,7 +131,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Field_fixture_simple_name_not_equal(self): fixture = ["Custom Field", {"name":["Item-vat"],"op":"!="}] path = frappe.scrub(fixture[0]) + "_simple_name_not_equal.csv" - # print "teste done {}".format(path) + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -140,7 +140,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Field_fixture_simple_name_at_least_equal(self): fixture = ["Custom Field", {"name":"Item-va"}] path = frappe.scrub(fixture[0]) + "_simple_name_at_least_equal.csv" - # print "teste done {}".format(path) + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -148,7 +148,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Field_fixture_multi_name_equal(self): fixture = ["Custom Field", {"name":["Item-vat", "Bin-vat"],"op":"="}] path = frappe.scrub(fixture[0]) + "_multi_name_equal.csv" - # print "teste done {}".format(path) + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -156,7 +156,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Field_fixture_multi_name_not_equal(self): fixture = ["Custom Field", {"name":["Item-vat", "Bin-vat"],"op":"!="}] path = frappe.scrub(fixture[0]) + "_multi_name_not_equal.csv" - # print "teste done {}".format(path) + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -164,7 +164,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Field_fixture_empty_object(self): fixture = ["Custom Field", {}] path = frappe.scrub(fixture[0]) + "_empty_object_should_be_all.csv" - # print "teste done {}".format(path) + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -172,7 +172,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Field_fixture_just_list(self): fixture = ["Custom Field"] path = frappe.scrub(fixture[0]) + "_just_list_should_be_all.csv" - # print "teste done {}".format(path) + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -181,7 +181,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Field_fixture_rex_no_flags(self): fixture = ["Custom Field", {"name":r"^[r|L]"}] path = frappe.scrub(fixture[0]) + "_rex_no_flags.csv" - # print "teste done {}".format(path) + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -189,7 +189,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Field_fixture_rex_with_flags(self): fixture = ["Custom Field", {"name":r"^[i|A]", "flags":"L,M"}] path = frappe.scrub(fixture[0]) + "_rex_with_flags.csv" - # print "teste done {}".format(path) + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -199,7 +199,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Doctype_fixture_simple(self): fixture = "ToDo" path = "Doctype_" + frappe.scrub(fixture) + "_original_style_should_be_all.csv" - # print "teste done {}".format(path) + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -207,7 +207,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Doctype_fixture_simple_name_equal_default(self): fixture = ["ToDo", {"name":["TDI00000008"]}] path = "Doctype_" + frappe.scrub(fixture[0]) + "_simple_name_equal_default.csv" - # print "teste done {}".format(path) + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -215,7 +215,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Doctype_fixture_simple_name_equal(self): fixture = ["ToDo", {"name":["TDI00000002"],"op":"="}] path = "Doctype_" + frappe.scrub(fixture[0]) + "_simple_name_equal.csv" - # print "teste done {}".format(path) + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -223,7 +223,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Doctype_simple_name_not_equal(self): fixture = ["ToDo", {"name":["TDI00000002"],"op":"!="}] path = "Doctype_" + frappe.scrub(fixture[0]) + "_simple_name_not_equal.csv" - # print "teste done {}".format(path) + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -232,7 +232,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Doctype_fixture_simple_name_at_least_equal(self): fixture = ["ToDo", {"name":"TDI"}] path = "Doctype_" + frappe.scrub(fixture[0]) + "_simple_name_at_least_equal.csv" - # print "teste done {}".format(path) + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -240,7 +240,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Doctype_multi_name_equal(self): fixture = ["ToDo", {"name":["TDI00000002", "TDI00000008"],"op":"="}] path = "Doctype_" + frappe.scrub(fixture[0]) + "_multi_name_equal.csv" - # print "teste done {}".format(path) + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -248,7 +248,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Doctype_multi_name_not_equal(self): fixture = ["ToDo", {"name":["TDI00000002", "TDI00000008"],"op":"!="}] path = "Doctype_" + frappe.scrub(fixture[0]) + "_multi_name_not_equal.csv" - # print "teste done {}".format(path) + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -256,7 +256,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Doctype_fixture_empty_object(self): fixture = ["ToDo", {}] path = "Doctype_" + frappe.scrub(fixture[0]) + "_empty_object_should_be_all.csv" - # print "teste done {}".format(path) + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -264,7 +264,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Doctype_fixture_just_list(self): fixture = ["ToDo"] path = "Doctype_" + frappe.scrub(fixture[0]) + "_just_list_should_be_all.csv" - # print "teste done {}".format(path) + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -273,7 +273,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Doctype_fixture_rex_no_flags(self): fixture = ["ToDo", {"name":r"^TDi"}] path = "Doctype_" + frappe.scrub(fixture[0]) + "_rex_no_flags_should_be_all.csv" - # print "teste done {}".format(path) + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -281,7 +281,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Doctype_fixture_rex_with_flags(self): fixture = ["ToDo", {"name":r"^TDi", "flags":"L,M"}] path = "Doctype_" + frappe.scrub(fixture[0]) + "_rex_with_flags_should_be_none.csv" - # print "teste done {}".format(path) + export_csv(fixture, path) self.assertTrue(True) os.remove(path) diff --git a/frappe/integrations/doctype/webhook/__init__.py b/frappe/integrations/doctype/webhook/__init__.py index e69de29bb2..2f8d245024 100644 --- a/frappe/integrations/doctype/webhook/__init__.py +++ b/frappe/integrations/doctype/webhook/__init__.py @@ -0,0 +1,41 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies and contributors +# For license information, please see license.txt + +import frappe + +def run_webhooks(doc, method): + '''Run webhooks for this method''' + if frappe.flags.in_import or frappe.flags.in_patch or frappe.flags.in_install: + return + + if not getattr(frappe.local, 'webhooks_executed', None): + frappe.local.webhooks_executed = [] + + if doc.flags.webhooks == None: + webhooks = frappe.cache().hget('webhooks', doc.doctype) + if webhooks==None: + webhooks = frappe.get_all('Webhook', + fields=["name", "webhook_docevent", "webhook_doctype"]) + frappe.cache().hset('webhooks', doc.doctype, webhooks) + doc.flags.webhooks = webhooks + + if not doc.flags.webhooks: + return + + def _webhook_request(webhook): + if not webhook.name in frappe.local.webhooks_executed: + frappe.enqueue("frappe.integrations.doctype.webhook.webhook.enqueue_webhook", doc=doc, webhook=webhook) + frappe.local.webhooks_executed.append(webhook.name) + + event_list = ["on_update", "after_insert", "on_submit", "on_cancel", "on_trash"] + + if not doc.flags.in_insert: + # value change is not applicable in insert + event_list.append('on_change') + event_list.append('before_update_after_submit') + + for webhook in doc.flags.webhooks: + event = method if method in event_list else None + if event and webhook.webhook_docevent == event and webhook.webhook_doctype == doc.doctype: + _webhook_request(webhook) diff --git a/frappe/integrations/doctype/webhook/webhook.py b/frappe/integrations/doctype/webhook/webhook.py index 26ecc36413..80962490e3 100644 --- a/frappe/integrations/doctype/webhook/webhook.py +++ b/frappe/integrations/doctype/webhook/webhook.py @@ -13,15 +13,18 @@ from time import sleep class Webhook(Document): def autoname(self): self.name = self.webhook_doctype + "-" + self.webhook_docevent + def validate(self): self.validate_docevent() self.validate_request_url() self.validate_repeating_fields() + def validate_docevent(self): if self.webhook_doctype: is_submittable = frappe.get_value("DocType", self.webhook_doctype, "is_submittable") if not is_submittable and self.webhook_docevent in ["on_submit", "on_cancel", "on_update_after_submit"]: frappe.throw(_("DocType must be Submittable for the selected Doc Event")) + def validate_request_url(self): try: request_url = urlparse(self.request_url).netloc @@ -29,6 +32,7 @@ class Webhook(Document): raise frappe.ValidationError except Exception as e: frappe.throw(_("Check Request URL"), exc=e) + def validate_repeating_fields(self): """Error when Same Field is entered multiple times in webhook_data""" webhook_data = [] @@ -64,39 +68,3 @@ def enqueue_webhook(doc, webhook): continue else: raise e - -def run_webhooks(doc, method): - '''Run webhooks for this method''' - if frappe.flags.in_import or frappe.flags.in_patch or frappe.flags.in_install: - return - - if not getattr(frappe.local, 'webhooks_executed', None): - frappe.local.webhooks_executed = [] - - if doc.flags.webhooks == None: - webhooks = frappe.cache().hget('webhooks', doc.doctype) - if webhooks==None: - webhooks = frappe.get_all('Webhook', - fields=["name", "webhook_docevent", "webhook_doctype"]) - frappe.cache().hset('webhooks', doc.doctype, webhooks) - doc.flags.webhooks = webhooks - - if not doc.flags.webhooks: - return - - def _webhook_request(webhook): - if not webhook.name in frappe.local.webhooks_executed: - frappe.enqueue("frappe.integrations.doctype.webhook.webhook.enqueue_webhook", doc=doc, webhook=webhook) - frappe.local.webhooks_executed.append(webhook.name) - - event_list = ["on_update", "after_insert", "on_submit", "on_cancel", "on_trash"] - - if not doc.flags.in_insert: - # value change is not applicable in insert - event_list.append('on_change') - event_list.append('before_update_after_submit') - - for webhook in doc.flags.webhooks: - event = method if method in event_list else None - if event and webhook.webhook_docevent == event and webhook.webhook_doctype == doc.doctype: - _webhook_request(webhook) diff --git a/frappe/model/document.py b/frappe/model/document.py index 5e4bfc01c4..f7a4b46c73 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -15,6 +15,7 @@ import hashlib, json from frappe.model import optional_fields from frappe.utils.file_manager import save_url from frappe.utils.global_search import update_global_search +from frappe.integrations.doctype.webhook import run_webhooks # once_only validation # methods @@ -673,7 +674,6 @@ class Document(BaseDocument): out = Document.hook(fn)(self, *args, **kwargs) self.run_email_alerts(method) - from frappe.integrations.doctype.webhook.webhook import run_webhooks run_webhooks(self, method) return out diff --git a/frappe/share.py b/frappe/share.py index 3ca0d13f12..8786d10823 100644 --- a/frappe/share.py +++ b/frappe/share.py @@ -9,7 +9,6 @@ from frappe.utils import cint @frappe.whitelist() def add(doctype, name, user=None, read=1, write=0, share=0, everyone=0, flags=None, notify=0): """Share the given document with a user.""" - print notify, share if not user: user = frappe.session.user From a52d39398091e05de1b2debf195f1b58074964bf Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 21 Sep 2017 17:22:11 +0530 Subject: [PATCH 034/135] [fix] test --- .../test_exporter_fixtures.py | 66 +++++++++---------- frappe/test_runner.py | 6 +- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/frappe/core/page/data_import_tool/test_exporter_fixtures.py b/frappe/core/page/data_import_tool/test_exporter_fixtures.py index 4447fbc365..bfc9c80ae1 100644 --- a/frappe/core/page/data_import_tool/test_exporter_fixtures.py +++ b/frappe/core/page/data_import_tool/test_exporter_fixtures.py @@ -16,7 +16,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Script_fixture_simple(self): fixture = "Custom Script" path = frappe.scrub(fixture) + "_original_style.csv" - + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -24,7 +24,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Script_fixture_simple_name_equal_default(self): fixture = ["Custom Script", {"name":["Item-Client"]}] path = frappe.scrub(fixture[0]) + "_simple_name_equal_default.csv" - + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -32,7 +32,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Script_fixture_simple_name_equal(self): fixture = ["Custom Script", {"name":["Item-Client"],"op":"="}] path = frappe.scrub(fixture[0]) + "_simple_name_equal.csv" - + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -40,7 +40,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Script_fixture_simple_name_not_equal(self): fixture = ["Custom Script", {"name":["Item-Client"],"op":"!="}] path = frappe.scrub(fixture[0]) + "_simple_name_not_equal.csv" - + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -49,7 +49,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Script_fixture_simple_name_at_least_equal(self): fixture = ["Custom Script", {"name":"Item-Cli"}] path = frappe.scrub(fixture[0]) + "_simple_name_at_least_equal.csv" - + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -57,7 +57,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Script_fixture_multi_name_equal(self): fixture = ["Custom Script", {"name":["Item-Client", "Customer-Client"],"op":"="}] path = frappe.scrub(fixture[0]) + "_multi_name_equal.csv" - + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -65,7 +65,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Script_fixture_multi_name_not_equal(self): fixture = ["Custom Script", {"name":["Item-Client", "Customer-Client"],"op":"!="}] path = frappe.scrub(fixture[0]) + "_multi_name_not_equal.csv" - + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -73,7 +73,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Script_fixture_empty_object(self): fixture = ["Custom Script", {}] path = frappe.scrub(fixture[0]) + "_empty_object_should_be_all.csv" - + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -81,7 +81,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Script_fixture_just_list(self): fixture = ["Custom Script"] path = frappe.scrub(fixture[0]) + "_just_list_should_be_all.csv" - + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -90,7 +90,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Script_fixture_rex_no_flags(self): fixture = ["Custom Script", {"name":r"^[i|A]"}] path = frappe.scrub(fixture[0]) + "_rex_no_flags.csv" - + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -98,7 +98,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Script_fixture_rex_with_flags(self): fixture = ["Custom Script", {"name":r"^[i|A]", "flags":"L,M"}] path = frappe.scrub(fixture[0]) + "_rex_with_flags.csv" - + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -107,7 +107,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Field_fixture_simple(self): fixture = "Custom Field" path = frappe.scrub(fixture) + "_original_style.csv" - + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -115,7 +115,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Field_fixture_simple_name_equal_default(self): fixture = ["Custom Field", {"name":["Item-vat"]}] path = frappe.scrub(fixture[0]) + "_simple_name_equal_default.csv" - + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -123,7 +123,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Field_fixture_simple_name_equal(self): fixture = ["Custom Field", {"name":["Item-vat"],"op":"="}] path = frappe.scrub(fixture[0]) + "_simple_name_equal.csv" - + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -131,7 +131,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Field_fixture_simple_name_not_equal(self): fixture = ["Custom Field", {"name":["Item-vat"],"op":"!="}] path = frappe.scrub(fixture[0]) + "_simple_name_not_equal.csv" - + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -140,7 +140,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Field_fixture_simple_name_at_least_equal(self): fixture = ["Custom Field", {"name":"Item-va"}] path = frappe.scrub(fixture[0]) + "_simple_name_at_least_equal.csv" - + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -148,7 +148,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Field_fixture_multi_name_equal(self): fixture = ["Custom Field", {"name":["Item-vat", "Bin-vat"],"op":"="}] path = frappe.scrub(fixture[0]) + "_multi_name_equal.csv" - + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -156,7 +156,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Field_fixture_multi_name_not_equal(self): fixture = ["Custom Field", {"name":["Item-vat", "Bin-vat"],"op":"!="}] path = frappe.scrub(fixture[0]) + "_multi_name_not_equal.csv" - + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -164,7 +164,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Field_fixture_empty_object(self): fixture = ["Custom Field", {}] path = frappe.scrub(fixture[0]) + "_empty_object_should_be_all.csv" - + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -172,7 +172,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Field_fixture_just_list(self): fixture = ["Custom Field"] path = frappe.scrub(fixture[0]) + "_just_list_should_be_all.csv" - + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -181,7 +181,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Field_fixture_rex_no_flags(self): fixture = ["Custom Field", {"name":r"^[r|L]"}] path = frappe.scrub(fixture[0]) + "_rex_no_flags.csv" - + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -189,7 +189,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Custom_Field_fixture_rex_with_flags(self): fixture = ["Custom Field", {"name":r"^[i|A]", "flags":"L,M"}] path = frappe.scrub(fixture[0]) + "_rex_with_flags.csv" - + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -199,7 +199,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Doctype_fixture_simple(self): fixture = "ToDo" path = "Doctype_" + frappe.scrub(fixture) + "_original_style_should_be_all.csv" - + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -207,7 +207,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Doctype_fixture_simple_name_equal_default(self): fixture = ["ToDo", {"name":["TDI00000008"]}] path = "Doctype_" + frappe.scrub(fixture[0]) + "_simple_name_equal_default.csv" - + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -215,7 +215,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Doctype_fixture_simple_name_equal(self): fixture = ["ToDo", {"name":["TDI00000002"],"op":"="}] path = "Doctype_" + frappe.scrub(fixture[0]) + "_simple_name_equal.csv" - + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -223,7 +223,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Doctype_simple_name_not_equal(self): fixture = ["ToDo", {"name":["TDI00000002"],"op":"!="}] path = "Doctype_" + frappe.scrub(fixture[0]) + "_simple_name_not_equal.csv" - + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -232,7 +232,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Doctype_fixture_simple_name_at_least_equal(self): fixture = ["ToDo", {"name":"TDI"}] path = "Doctype_" + frappe.scrub(fixture[0]) + "_simple_name_at_least_equal.csv" - + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -240,7 +240,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Doctype_multi_name_equal(self): fixture = ["ToDo", {"name":["TDI00000002", "TDI00000008"],"op":"="}] path = "Doctype_" + frappe.scrub(fixture[0]) + "_multi_name_equal.csv" - + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -248,7 +248,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Doctype_multi_name_not_equal(self): fixture = ["ToDo", {"name":["TDI00000002", "TDI00000008"],"op":"!="}] path = "Doctype_" + frappe.scrub(fixture[0]) + "_multi_name_not_equal.csv" - + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -256,7 +256,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Doctype_fixture_empty_object(self): fixture = ["ToDo", {}] path = "Doctype_" + frappe.scrub(fixture[0]) + "_empty_object_should_be_all.csv" - + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -264,7 +264,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Doctype_fixture_just_list(self): fixture = ["ToDo"] path = "Doctype_" + frappe.scrub(fixture[0]) + "_just_list_should_be_all.csv" - + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -273,7 +273,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Doctype_fixture_rex_no_flags(self): fixture = ["ToDo", {"name":r"^TDi"}] path = "Doctype_" + frappe.scrub(fixture[0]) + "_rex_no_flags_should_be_all.csv" - + export_csv(fixture, path) self.assertTrue(True) os.remove(path) @@ -281,7 +281,7 @@ class TestDataImportFixtures(unittest.TestCase): def test_Doctype_fixture_rex_with_flags(self): fixture = ["ToDo", {"name":r"^TDi", "flags":"L,M"}] path = "Doctype_" + frappe.scrub(fixture[0]) + "_rex_with_flags_should_be_none.csv" - + export_csv(fixture, path) self.assertTrue(True) os.remove(path) diff --git a/frappe/test_runner.py b/frappe/test_runner.py index c0374acec3..87d1e1febd 100644 --- a/frappe/test_runner.py +++ b/frappe/test_runner.py @@ -223,8 +223,6 @@ def make_test_records(doctype, verbose=0, force=False): continue if not options in frappe.local.test_objects: - if options in frappe.local.test_objects: - print("No test records or circular reference for {0}".format(options)) frappe.local.test_objects[options] = [] make_test_records(options, verbose, force) make_test_records_for_doctype(options, verbose, force) @@ -298,8 +296,10 @@ def make_test_objects(doctype, test_records=None, verbose=None, reset=False): if doc.get('name'): d.name = doc.get('name') + else: + d.set_new_name() - if frappe.local.test_objects.get(d.doctype) and not reset: + if d.name in (frappe.local.test_objects.get(d.doctype) or []) and not reset: # do not create test records, if already exists return [] From 70e1158c459e3781d8fafe8e3f78ba04c177f236 Mon Sep 17 00:00:00 2001 From: pratu16x7 Date: Fri, 22 Sep 2017 03:07:44 +0530 Subject: [PATCH 035/135] [fix] don't make toolbar while in setup --- frappe/desk/page/setup_wizard/setup_wizard.js | 12 ++++-------- frappe/public/js/frappe/desk.js | 2 +- frappe/sessions.py | 1 + 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/frappe/desk/page/setup_wizard/setup_wizard.js b/frappe/desk/page/setup_wizard/setup_wizard.js index cca625297e..cec24485e7 100644 --- a/frappe/desk/page/setup_wizard/setup_wizard.js +++ b/frappe/desk/page/setup_wizard/setup_wizard.js @@ -26,11 +26,7 @@ frappe.setup = { } frappe.pages['setup-wizard'].on_page_load = function(wrapper) { - // setup page ui - $(".navbar:first").toggle(false); - - var requires = ["/assets/frappe/css/animate.min.css"].concat( - frappe.boot.setup_wizard_requires || []); + var requires = (frappe.boot.setup_wizard_requires || []); frappe.require(requires, function() { frappe.call({ @@ -38,7 +34,7 @@ frappe.pages['setup-wizard'].on_page_load = function(wrapper) { freeze: true, callback: function(r) { frappe.setup.data.lang = r.message; - + frappe.setup.run_event("before_load"); var wizard_settings = { parent: wrapper, @@ -181,8 +177,8 @@ frappe.setup.SetupWizard = class SetupWizard extends frappe.ui.Slides { localStorage.setItem("session_last_route", frappe.setup.welcome_page); } setTimeout(function() { - // frappe.ui.toolbar.clear_cache(); - window.location = "/desk"; + // Reload + window.location.href = ''; }, 2000); setTimeout(()=> { $('body').removeClass('setup-state'); diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index 0610e6b551..02ec07eebf 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -355,7 +355,7 @@ frappe.Application = Class.extend({ }, make_nav_bar: function() { // toolbar - if(frappe.boot) { + if(frappe.boot && !frappe.boot.in_setup_wizard) { frappe.frappe_toolbar = new frappe.ui.toolbar.Toolbar(); } diff --git a/frappe/sessions.py b/frappe/sessions.py index bbb547f3c1..4be9349f88 100644 --- a/frappe/sessions.py +++ b/frappe/sessions.py @@ -163,6 +163,7 @@ def get(): # check only when clear cache is done, and don't cache this if frappe.local.request: bootinfo["change_log"] = get_change_log() + bootinfo["in_setup_wizard"] = not cint(frappe.db.get_single_value('System Settings', 'setup_complete')) bootinfo["is_first_startup"] = cint(frappe.db.get_single_value('System Settings', 'is_first_startup')) bootinfo["metadata_version"] = frappe.cache().get_value("metadata_version") From ea42530112538d5a4bd1eeb614cd9d3433bb43f0 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 22 Sep 2017 12:38:12 +0530 Subject: [PATCH 036/135] [minor] automatically add restrict to domain if not added --- frappe/core/doctype/doctype/doctype.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index b0fff5b941..2648148b89 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -753,6 +753,9 @@ def validate_permissions(doctype, for_remove=False): def make_module_and_roles(doc, perm_fieldname="permissions"): """Make `Module Def` and `Role` records if already not made. Called while installing.""" try: + if doc.restrict_to_domain and not frappe.db.exists('Domain', doc.restrict_to_domain): + frappe.get_doc(doctype='Domain', domain=doc.restrict_to_domain).insert() + if not frappe.db.exists("Module Def", doc.module): m = frappe.get_doc({"doctype": "Module Def", "module_name": doc.module}) m.app_name = frappe.local.module_app[frappe.scrub(doc.module)] From 45e1649340d82ccfea3c010ae589fa5de647de24 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 22 Sep 2017 12:56:21 +0530 Subject: [PATCH 037/135] [fix] add restrict_to_domain in Framework.sql --- frappe/data/Framework.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/data/Framework.sql b/frappe/data/Framework.sql index 6aed34520c..4d4fd0f2c0 100644 --- a/frappe/data/Framework.sql +++ b/frappe/data/Framework.sql @@ -117,6 +117,7 @@ CREATE TABLE `tabDocType` ( `editable_grid` int(1) NOT NULL DEFAULT 1, `track_changes` int(1) NOT NULL DEFAULT 0, `module` varchar(255) DEFAULT NULL, + `restrict_to_domain` varchar(255) DEFAULT NULL, `app` varchar(255) DEFAULT NULL, `autoname` varchar(255) DEFAULT NULL, `name_case` varchar(255) DEFAULT NULL, From d233f65db06ed06c25d48a2b8959b33f7802ab69 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 22 Sep 2017 14:54:29 +0530 Subject: [PATCH 038/135] [fix] make domain document --- frappe/core/doctype/doctype/doctype.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index 2648148b89..7db7e7ca04 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -754,7 +754,7 @@ def make_module_and_roles(doc, perm_fieldname="permissions"): """Make `Module Def` and `Role` records if already not made. Called while installing.""" try: if doc.restrict_to_domain and not frappe.db.exists('Domain', doc.restrict_to_domain): - frappe.get_doc(doctype='Domain', domain=doc.restrict_to_domain).insert() + frappe.get_doc(dict(doctype='Domain', domain=doc.restrict_to_domain)).insert() if not frappe.db.exists("Module Def", doc.module): m = frappe.get_doc({"doctype": "Module Def", "module_name": doc.module}) From 867e9997d2f354d6b4bd6e9ee6c25aeae2ab2afa Mon Sep 17 00:00:00 2001 From: Achilles Rasquinha Date: Fri, 22 Sep 2017 15:05:48 +0530 Subject: [PATCH 039/135] [MINOR] added --make-copy-force to force copy assets --- .vscode/settings.json | 3 +++ frappe/build.py | 25 +++++++++++++++++-------- frappe/commands/utils.py | 5 +++-- 3 files changed, 23 insertions(+), 10 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000000..fe7159848b --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "python.linting.pylintEnabled": false +} \ No newline at end of file diff --git a/frappe/build.py b/frappe/build.py index 2a201fee6f..77f42fc59d 100644 --- a/frappe/build.py +++ b/frappe/build.py @@ -4,6 +4,7 @@ from __future__ import unicode_literals, print_function from frappe.utils.minify import JavascriptMinify import subprocess +import warnings from six import iteritems, text_type @@ -25,12 +26,12 @@ def setup(): except ImportError: pass app_paths = [os.path.dirname(pymodule.__file__) for pymodule in pymodules] -def bundle(no_compress, make_copy=False, verbose=False): +def bundle(no_compress, make_copy=False, make_copy_force=False, verbose=False): """concat / minify js files""" # build js files setup() - make_asset_dirs(make_copy=make_copy) + make_asset_dirs(make_copy=make_copy, make_copy_force = make_copy_force) # new nodejs build system command = 'node --use_strict ../apps/frappe/frappe/build.js --build' @@ -60,7 +61,7 @@ def watch(no_compress): # time.sleep(3) -def make_asset_dirs(make_copy=False): +def make_asset_dirs(make_copy=False, make_copy_force=False): assets_path = os.path.join(frappe.local.sites_path, "assets") for dir_path in [ os.path.join(assets_path, 'js'), @@ -80,11 +81,19 @@ def make_asset_dirs(make_copy=False): for source, target in symlinks: source = os.path.abspath(source) - if not os.path.exists(target) and os.path.exists(source): - if make_copy: - shutil.copytree(source, target) - else: - os.symlink(source, target) + if os.path.exists(source): + if os.path.exists(target): + if make_copy_force: + if not make_copy: + os.unlink(target) + shutil.copytree(source, target) + else: + warnings.warn('Target {target} already exists.'.format(target = target)) + pass # if exists, don't make copy. + else: + os.symlink(source, target) + else: + warnings.warn('Source {source} does not exists.'.format(source = source)) def build(no_compress=False, verbose=False): assets_path = os.path.join(frappe.local.sites_path, "assets") diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py index 7c18bdbc78..9fa1ff3dbe 100644 --- a/frappe/commands/utils.py +++ b/frappe/commands/utils.py @@ -7,13 +7,14 @@ from frappe.commands import pass_context, get_site @click.command('build') @click.option('--make-copy', is_flag=True, default=False, help='Copy the files instead of symlinking') +@click.option('--make-copy-force', is_flag=True, default=False, help='Copy the files instead of symlinking with force') @click.option('--verbose', is_flag=True, default=False, help='Verbose') -def build(make_copy=False, verbose=False): +def build(make_copy=False, make_copy_force = False, verbose=False): "Minify + concatenate JS and CSS files, build translations" import frappe.build import frappe frappe.init('') - frappe.build.bundle(False, make_copy=make_copy, verbose=verbose) + frappe.build.bundle(False, make_copy=make_copy, make_copy_force = make_copy_force, verbose=verbose) @click.command('watch') def watch(): From 21b822424b01cc78fdd6dd10ec701b87889589bd Mon Sep 17 00:00:00 2001 From: Achilles Rasquinha Date: Fri, 22 Sep 2017 15:34:32 +0530 Subject: [PATCH 040/135] [FIX] build - for symlinks, --make-coppy - for copy (if symlinks doesn't exists, else no copy), --make-copy-force (force copy, cleans symlinks or dirs) --- frappe/build.py | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/frappe/build.py b/frappe/build.py index 77f42fc59d..9421ca7e47 100644 --- a/frappe/build.py +++ b/frappe/build.py @@ -62,6 +62,7 @@ def watch(no_compress): # time.sleep(3) def make_asset_dirs(make_copy=False, make_copy_force=False): + # don't even think of making assets_path absolute - rm -rf ahead. assets_path = os.path.join(frappe.local.sites_path, "assets") for dir_path in [ os.path.join(assets_path, 'js'), @@ -82,16 +83,25 @@ def make_asset_dirs(make_copy=False, make_copy_force=False): for source, target in symlinks: source = os.path.abspath(source) if os.path.exists(source): - if os.path.exists(target): - if make_copy_force: - if not make_copy: + if make_copy_force: + if os.path.exists(target): + if os.path.islink(target): os.unlink(target) - shutil.copytree(source, target) else: - warnings.warn('Target {target} already exists.'.format(target = target)) - pass # if exists, don't make copy. + shutil.rmtree(target) + shutil.copytree(source, target) + elif make_copy: + if os.path.exists(target): + warnings.warn('Target {target} already exists.'.format(target = target)) else: - os.symlink(source, target) + shutil.copytree(source, target) + else: + if os.path.exists(target): + if os.path.islink(target): + os.unlink(target) + else: + shutil.rmtree(target) + os.symlink(source, target) else: warnings.warn('Source {source} does not exists.'.format(source = source)) From 1f151ee8258f66d020208e82474a73c23b6624e9 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Fri, 22 Sep 2017 17:23:35 +0530 Subject: [PATCH 041/135] [fix] webhooks cache --- frappe/integrations/doctype/webhook/__init__.py | 14 +++++++++----- frappe/integrations/doctype/webhook/webhook.py | 3 +++ frappe/sessions.py | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/frappe/integrations/doctype/webhook/__init__.py b/frappe/integrations/doctype/webhook/__init__.py index 2f8d245024..b1af34b26c 100644 --- a/frappe/integrations/doctype/webhook/__init__.py +++ b/frappe/integrations/doctype/webhook/__init__.py @@ -13,12 +13,16 @@ def run_webhooks(doc, method): frappe.local.webhooks_executed = [] if doc.flags.webhooks == None: - webhooks = frappe.cache().hget('webhooks', doc.doctype) + webhooks = frappe.cache().get_value('webhooks') if webhooks==None: - webhooks = frappe.get_all('Webhook', + webhooks_list = frappe.get_all('Webhook', fields=["name", "webhook_docevent", "webhook_doctype"]) - frappe.cache().hset('webhooks', doc.doctype, webhooks) - doc.flags.webhooks = webhooks + + webhooks = {} + for w in webhooks_list: + webhooks.setdefault(w.webhook_doctype, []).append(w) + frappe.cache().set_value('webhooks', webhooks) + doc.flags.webhooks = webhooks.get(doc.doctype, None) if not doc.flags.webhooks: return @@ -37,5 +41,5 @@ def run_webhooks(doc, method): for webhook in doc.flags.webhooks: event = method if method in event_list else None - if event and webhook.webhook_docevent == event and webhook.webhook_doctype == doc.doctype: + if event and webhook.webhook_docevent == event: _webhook_request(webhook) diff --git a/frappe/integrations/doctype/webhook/webhook.py b/frappe/integrations/doctype/webhook/webhook.py index 80962490e3..6ded0d0ac8 100644 --- a/frappe/integrations/doctype/webhook/webhook.py +++ b/frappe/integrations/doctype/webhook/webhook.py @@ -19,6 +19,9 @@ class Webhook(Document): self.validate_request_url() self.validate_repeating_fields() + def on_update(self): + frappe.cache().delete_value('webhooks') + def validate_docevent(self): if self.webhook_doctype: is_submittable = frappe.get_value("DocType", self.webhook_doctype, "is_submittable") diff --git a/frappe/sessions.py b/frappe/sessions.py index 4be9349f88..c25ccadced 100644 --- a/frappe/sessions.py +++ b/frappe/sessions.py @@ -53,7 +53,7 @@ def clear_global_cache(): frappe.model.meta.clear_cache() frappe.cache().delete_value(["app_hooks", "installed_apps", "app_modules", "module_app", "notification_config", 'system_settings' - 'scheduler_events', 'time_zone']) + 'scheduler_events', 'time_zone', 'webhooks']) frappe.setup_module_map() From 0bcb4ee13176b750fe40136f3104710fe66258d7 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Fri, 22 Sep 2017 17:34:42 +0530 Subject: [PATCH 042/135] [minor] webhooks cleanups --- .../integrations/doctype/webhook/__init__.py | 28 +++++++++++++------ frappe/model/document.py | 2 -- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/frappe/integrations/doctype/webhook/__init__.py b/frappe/integrations/doctype/webhook/__init__.py index b1af34b26c..3c8bf1e2af 100644 --- a/frappe/integrations/doctype/webhook/__init__.py +++ b/frappe/integrations/doctype/webhook/__init__.py @@ -9,28 +9,40 @@ def run_webhooks(doc, method): if frappe.flags.in_import or frappe.flags.in_patch or frappe.flags.in_install: return - if not getattr(frappe.local, 'webhooks_executed', None): - frappe.local.webhooks_executed = [] + if frappe.flags.webhooks_executed is None: + frappe.flags.webhooks_executed = {} - if doc.flags.webhooks == None: + if frappe.flags.webhooks == None: + # load webhooks from cache webhooks = frappe.cache().get_value('webhooks') if webhooks==None: + # query webhooks webhooks_list = frappe.get_all('Webhook', fields=["name", "webhook_docevent", "webhook_doctype"]) + # make webhooks map for cache webhooks = {} for w in webhooks_list: webhooks.setdefault(w.webhook_doctype, []).append(w) frappe.cache().set_value('webhooks', webhooks) - doc.flags.webhooks = webhooks.get(doc.doctype, None) - if not doc.flags.webhooks: + frappe.flags.webhooks = webhooks + + # get webhooks for this doctype + webhooks_for_doc = frappe.flags.webhooks.get(doc.doctype, None) + + if not webhooks_for_doc: + # no webhooks, quit return def _webhook_request(webhook): - if not webhook.name in frappe.local.webhooks_executed: + if not webhook.name in frappe.flags.webhooks_executed.get(doc.name, []): frappe.enqueue("frappe.integrations.doctype.webhook.webhook.enqueue_webhook", doc=doc, webhook=webhook) - frappe.local.webhooks_executed.append(webhook.name) + + # keep list of webhooks executed for this doc in this request + # so that we don't run the same webhook for the same document multiple times + # in one request + frappe.flags.webhooks_executed.setdefault(doc.name, []).append(webhook.name) event_list = ["on_update", "after_insert", "on_submit", "on_cancel", "on_trash"] @@ -39,7 +51,7 @@ def run_webhooks(doc, method): event_list.append('on_change') event_list.append('before_update_after_submit') - for webhook in doc.flags.webhooks: + for webhook in webhooks_for_doc: event = method if method in event_list else None if event and webhook.webhook_docevent == event: _webhook_request(webhook) diff --git a/frappe/model/document.py b/frappe/model/document.py index f7a4b46c73..48e1d18e7d 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -170,7 +170,6 @@ class Document(BaseDocument): return self.flags.email_alerts_executed = [] - setattr(frappe.local, 'webhooks_executed', []) if ignore_permissions!=None: self.flags.ignore_permissions = ignore_permissions @@ -244,7 +243,6 @@ class Document(BaseDocument): return self.flags.email_alerts_executed = [] - setattr(frappe.local, 'webhooks_executed', []) if ignore_permissions!=None: self.flags.ignore_permissions = ignore_permissions From 5f86884031fd925a6c055ff5c19d0b13f786130d Mon Sep 17 00:00:00 2001 From: maxtorete Date: Sat, 23 Sep 2017 01:46:12 +0200 Subject: [PATCH 043/135] Fixed rounding problem in stripe integration (#10645) --- .../integrations/doctype/stripe_settings/stripe_settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/integrations/doctype/stripe_settings/stripe_settings.py b/frappe/integrations/doctype/stripe_settings/stripe_settings.py index d72b435667..c96b508743 100644 --- a/frappe/integrations/doctype/stripe_settings/stripe_settings.py +++ b/frappe/integrations/doctype/stripe_settings/stripe_settings.py @@ -7,7 +7,7 @@ import frappe from frappe.model.document import Document from frappe import _ from six.moves.urllib.parse import urlencode -from frappe.utils import get_url, call_hook_method, cint +from frappe.utils import get_url, call_hook_method, cint, flt from frappe.integrations.utils import make_get_request, make_post_request, create_request_log, create_payment_gateway class StripeSettings(Document): @@ -62,7 +62,7 @@ class StripeSettings(Document): "Bearer {0}".format(self.get_password(fieldname="secret_key", raise_exception=False))} data = { - "amount": cint(self.data.amount)*100, + "amount": cint(flt(self.data.amount)*100), "currency": self.data.currency, "source": self.data.stripe_token_id, "description": self.data.description From 398f56e4cb25c9e481f68d6be87d457361ae191f Mon Sep 17 00:00:00 2001 From: maxtorete Date: Sat, 23 Sep 2017 03:23:59 +0200 Subject: [PATCH 044/135] Fixed problem with margin top and bottom overwritten in print format (#3451) --- frappe/utils/pdf.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/frappe/utils/pdf.py b/frappe/utils/pdf.py index 332eaa738d..aa2478ad1b 100644 --- a/frappe/utils/pdf.py +++ b/frappe/utils/pdf.py @@ -65,6 +65,8 @@ def prepare_options(html, options): # defaults 'margin-right': '15mm', 'margin-left': '15mm', + 'margin-top': '15mm', + 'margin-bottom': '15mm', }) html, html_options = read_options_from_html(html) @@ -134,13 +136,6 @@ def prepare_header_footer(soup): # {"header-html": "/tmp/frappe-pdf-random.html"} options[html_id] = fname - else: - if html_id == "header-html": - options["margin-top"] = "15mm" - - elif html_id == "footer-html": - options["margin-bottom"] = "15mm" - return options def cleanup(fname, options): From 689f71d9e4432389bfe269b10dfaadb2b4b3d93a Mon Sep 17 00:00:00 2001 From: maxtorete Date: Sat, 23 Sep 2017 03:34:21 +0200 Subject: [PATCH 045/135] Revert "Fixed problem with margin top and bottom overwritten in print format (#3451)" This reverts commit 398f56e4cb25c9e481f68d6be87d457361ae191f. --- frappe/utils/pdf.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/frappe/utils/pdf.py b/frappe/utils/pdf.py index aa2478ad1b..332eaa738d 100644 --- a/frappe/utils/pdf.py +++ b/frappe/utils/pdf.py @@ -65,8 +65,6 @@ def prepare_options(html, options): # defaults 'margin-right': '15mm', 'margin-left': '15mm', - 'margin-top': '15mm', - 'margin-bottom': '15mm', }) html, html_options = read_options_from_html(html) @@ -136,6 +134,13 @@ def prepare_header_footer(soup): # {"header-html": "/tmp/frappe-pdf-random.html"} options[html_id] = fname + else: + if html_id == "header-html": + options["margin-top"] = "15mm" + + elif html_id == "footer-html": + options["margin-bottom"] = "15mm" + return options def cleanup(fname, options): From c4ab2de7fda907b7accf1604adf9a441c7966424 Mon Sep 17 00:00:00 2001 From: maxtorete Date: Sat, 23 Sep 2017 03:23:59 +0200 Subject: [PATCH 046/135] Fixed problem with margin top and bottom overwritten in print format (#3451) --- frappe/utils/pdf.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/frappe/utils/pdf.py b/frappe/utils/pdf.py index 332eaa738d..6fa7cd7231 100644 --- a/frappe/utils/pdf.py +++ b/frappe/utils/pdf.py @@ -65,6 +65,8 @@ def prepare_options(html, options): # defaults 'margin-right': '15mm', 'margin-left': '15mm', + 'margin-top': '15mm', + 'margin-bottom': '15mm', }) html, html_options = read_options_from_html(html) @@ -134,13 +136,6 @@ def prepare_header_footer(soup): # {"header-html": "/tmp/frappe-pdf-random.html"} options[html_id] = fname - else: - if html_id == "header-html": - options["margin-top"] = "15mm" - - elif html_id == "footer-html": - options["margin-bottom"] = "15mm" - return options def cleanup(fname, options): From 5162d2d3e9319968b196fbcb7af6a84151cd17d7 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sat, 23 Sep 2017 14:45:47 +0530 Subject: [PATCH 047/135] Better keyboard navigation in setup wizard - call action_complete when enter is pressed on last slide - disable keyboard navigation on action_complete - fixed eslint --- frappe/desk/page/setup_wizard/setup_wizard.js | 46 ++++++++++++------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/frappe/desk/page/setup_wizard/setup_wizard.js b/frappe/desk/page/setup_wizard/setup_wizard.js index cec24485e7..33ed202725 100644 --- a/frappe/desk/page/setup_wizard/setup_wizard.js +++ b/frappe/desk/page/setup_wizard/setup_wizard.js @@ -92,17 +92,23 @@ frappe.setup.SetupWizard = class SetupWizard extends frappe.ui.Slides { } setup_keyboard_nav() { - this.container.on('keydown', (e) => { - if(e.which === 13) { - var $target = $(e.target); - if($target.hasClass('prev-btn')) { - $target.trigger('click'); - } else { - this.container.find('.next-btn').trigger('click'); - e.preventDefault(); - } + $('body').on('keydown', this.handle_enter_press.bind(this)); + } + + disable_keyboard_nav() { + $('body').off('keydown', this.handle_enter_press.bind(this)); + } + + handle_enter_press(e) { + if (e.which === frappe.ui.keyCode.ENTER) { + var $target = $(e.target); + if($target.hasClass('prev-btn')) { + $target.trigger('click'); + } else { + this.container.find('.next-btn').trigger('click'); + e.preventDefault(); } - }); + } } before_show_slide() { @@ -114,6 +120,11 @@ frappe.setup.SetupWizard = class SetupWizard extends frappe.ui.Slides { } show_slide(id) { + if (id === this.slides.length) { + // show_slide called on last slide + this.action_on_complete(); + return; + } super.show_slide(id); frappe.set_route(this.page_name, id + ""); } @@ -168,6 +179,7 @@ frappe.setup.SetupWizard = class SetupWizard extends frappe.ui.Slides { if (!this.current_slide.set_values()) return; this.update_values(); this.show_working_state(); + this.disable_keyboard_nav(); return frappe.call({ method: "frappe.desk.page.setup_wizard.setup_wizard.setup_complete", args: {args: this.values}, @@ -237,6 +249,13 @@ frappe.setup.SetupWizard = class SetupWizard extends frappe.ui.Slides { } get_message(title, message="", loading=false) { + const loading_html = loading + ? '
' + : `
+ +
`; + return $(`
@@ -245,12 +264,7 @@ frappe.setup.SetupWizard = class SetupWizard extends frappe.ui.Slides {

${message}

- ${loading - ? '
' - : `
-
` - } + ${loading_html}
`); From 0bc85c7431384e1585f4236fcfb724184321eac2 Mon Sep 17 00:00:00 2001 From: Ben Cornwell-Mott Date: Sat, 23 Sep 2017 15:32:06 -0700 Subject: [PATCH 048/135] Allow workbook pass in make_xlsx --- frappe/utils/xlsxutils.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frappe/utils/xlsxutils.py b/frappe/utils/xlsxutils.py index afd67cacaa..d4c4727299 100644 --- a/frappe/utils/xlsxutils.py +++ b/frappe/utils/xlsxutils.py @@ -12,9 +12,11 @@ from six import StringIO, string_types # return xlsx file object -def make_xlsx(data, sheet_name): +def make_xlsx(data, sheet_name, wb=None): + + if wb is None: + wb = openpyxl.Workbook(write_only=True) - wb = openpyxl.Workbook(write_only=True) ws = wb.create_sheet(sheet_name, 0) row1 = ws.row_dimensions[1] From 52936f724ed6e339582ffb0750d17b2b1f9ac9f5 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Sun, 24 Sep 2017 12:05:01 +0530 Subject: [PATCH 049/135] [fix] cleanup style for blog listings --- frappe/public/css/website.css | 4 +++ frappe/public/images/default-avatar.png | Bin 0 -> 45267 bytes frappe/public/less/website.less | 5 +++ frappe/templates/includes/blog/blogger.html | 6 ++-- frappe/templates/includes/list/list.html | 2 +- frappe/website/doctype/blog_post/blog_post.py | 2 +- .../blog_post/templates/blog_post.html | 9 +++-- .../blog_post/templates/blog_post_row.html | 32 ++++++++++++------ 8 files changed, 41 insertions(+), 19 deletions(-) create mode 100644 frappe/public/images/default-avatar.png diff --git a/frappe/public/css/website.css b/frappe/public/css/website.css index 6e33918c6c..5e1d9b2bc8 100644 --- a/frappe/public/css/website.css +++ b/frappe/public/css/website.css @@ -981,3 +981,7 @@ li.footer-child-item { margin: 15px 0px; max-width: 100%; } +.blog-list-item { + padding-top: 30px; + padding-bottom: 30px; +} diff --git a/frappe/public/images/default-avatar.png b/frappe/public/images/default-avatar.png new file mode 100644 index 0000000000000000000000000000000000000000..b6413c4912fcfb0e421e4c9a1d2d6c9c6fc936f6 GIT binary patch literal 45267 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
- +
-

{{ blogger_info.full_name }}

+

+ {{ blogger_info.full_name }} +

{%if blogger_info.bio %}{{ blogger_info.bio }}{% endif %}

diff --git a/frappe/templates/includes/list/list.html b/frappe/templates/includes/list/list.html index bf2efba02b..70e7cb25d1 100644 --- a/frappe/templates/includes/list/list.html +++ b/frappe/templates/includes/list/list.html @@ -1,5 +1,5 @@ {% if sub_title %} -

{{ sub_title }}

+

{{ sub_title }}

{% endif %} {% if not result -%}
diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py index 29e0aef8e9..3c28c47cf6 100644 --- a/frappe/website/doctype/blog_post/blog_post.py +++ b/frappe/website/doctype/blog_post/blog_post.py @@ -190,7 +190,7 @@ def get_blog_list(doctype, txt=None, filters=None, limit_start=0, limit_page_len post.category = frappe.db.get_value('Blog Category', post.blog_category, ['route', 'title'], as_dict=True) - if (not "http:" in post.avatar or "https:" in post.avatar) and not post.avatar.startswith("/"): + if post.avatar and (not "http:" in post.avatar or "https:" in post.avatar) and not post.avatar.startswith("/"): post.avatar = "/" + post.avatar return posts diff --git a/frappe/website/doctype/blog_post/templates/blog_post.html b/frappe/website/doctype/blog_post/templates/blog_post.html index 24a128ddd6..d1682593a0 100644 --- a/frappe/website/doctype/blog_post/templates/blog_post.html +++ b/frappe/website/doctype/blog_post/templates/blog_post.html @@ -11,13 +11,12 @@ border-top: 1px solid {{ style.border_color }}; } .blog-info { - text-align:center; margin-top: 30px; } .blog-text { padding-top: 50px; padding-bottom: 50px; - font-size: 18px; + font-size: 16px; line-height: 1.5; } .blog-text p { @@ -28,13 +27,13 @@ padding-bottom: 50px; } .blogger-name { - margin-top: 0px; + margin-top: 5px; }
- - + +

{{ title }}

diff --git a/frappe/website/doctype/blog_post/templates/blog_post_row.html b/frappe/website/doctype/blog_post/templates/blog_post_row.html index 42c1833920..1ea67812f1 100644 --- a/frappe/website/doctype/blog_post/templates/blog_post_row.html +++ b/frappe/website/doctype/blog_post/templates/blog_post_row.html @@ -2,22 +2,34 @@
-

{{ post.title }}

+

{{ post.title }}

{% if post.cover_image %}

{{post.title}} - Cover Image

{% endif %}

{{ post.intro }}

-

- {{ _("By") }} {{ post.full_name }} - {{ frappe.format_date(post.published_on) }} - - {{ post.category.title }} - {{ post.comment_text }} -

+ +
+
+
+ +
+
+
+
+ {{ post.full_name }} +
+
+ {{ frappe.format_date(post.published_on) }} + {% if post.comments %} + + {{ post.comments }} + + {% endif %} +
+
+
From 0df3335e9e982e9baf985877cf0fa3ca2f456ce8 Mon Sep 17 00:00:00 2001 From: creador30 Date: Sun, 24 Sep 2017 11:12:52 +0300 Subject: [PATCH 050/135] [fix] dropbox upload of unicode filenames When using Unicode filenames Dropbox backup fails with an error similar to: UnicodeEncodeError: 'ascii' codec can't encode character u'\u015f' in position 44: ordinal not in range(128) This commit fixes this issue. --- .../integrations/doctype/dropbox_settings/dropbox_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py b/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py index 3ceae47a0e..a839049d7b 100644 --- a/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py +++ b/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py @@ -146,7 +146,7 @@ def upload_from_folder(path, dropbox_folder, dropbox_client, did_not_upload, err def upload_file_to_dropbox(filename, folder, dropbox_client): create_folder_if_not_exists(folder, dropbox_client) chunk_size = 4 * 1024 * 1024 - file_size = os.path.getsize(filename) + file_size = os.path.getsize(encode(filename)) mode = (dropbox.files.WriteMode.overwrite) f = open(encode(filename), 'rb') From a6056ea510358c41447a49df6eff973f0044f2f6 Mon Sep 17 00:00:00 2001 From: Achilles Rasquinha Date: Sun, 24 Sep 2017 17:23:35 +0530 Subject: [PATCH 051/135] added .vscode to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 75bee9a091..4dd4f3f6ce 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ locale dist/ build/ frappe/docs/current +.vscode From 18d17e2fd585dbf709ab89ecf57f08a0ad5e1a1c Mon Sep 17 00:00:00 2001 From: Manas Solanki Date: Sun, 24 Sep 2017 19:11:24 +0530 Subject: [PATCH 052/135] datepicker in the web form --- frappe/website/js/web_form.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/frappe/website/js/web_form.js b/frappe/website/js/web_form.js index fdef813acc..d5bcabc649 100644 --- a/frappe/website/js/web_form.js +++ b/frappe/website/js/web_form.js @@ -373,7 +373,10 @@ frappe.ready(function() { $dates.datepicker({ language: "en", autoClose: true, - dateFormat: frappe.datepicker_format + dateFormat: frappe.datepicker_format, + onSelect: function(date, date_str, e) { + e.$el.trigger('change'); + } }); // initialize dates from YYYY-MM-DD to user format @@ -419,7 +422,7 @@ frappe.ready(function() { }); }); - } + }; setup_text_editor(); }); From a52d927e286a5b259fdc7ff64d7cc55e75a3ad10 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Sun, 24 Sep 2017 20:51:29 +0530 Subject: [PATCH 053/135] [fix] for blog --- frappe/website/doctype/blog_post/blog_post.py | 2 +- frappe/website/doctype/blog_post/templates/blog_post_row.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py index 3c28c47cf6..b3ea0bd797 100644 --- a/frappe/website/doctype/blog_post/blog_post.py +++ b/frappe/website/doctype/blog_post/blog_post.py @@ -190,7 +190,7 @@ def get_blog_list(doctype, txt=None, filters=None, limit_start=0, limit_page_len post.category = frappe.db.get_value('Blog Category', post.blog_category, ['route', 'title'], as_dict=True) - if post.avatar and (not "http:" in post.avatar or "https:" in post.avatar) and not post.avatar.startswith("/"): + if post.avatar and (not "http:" in post.avatar or not "https:" in post.avatar) and not post.avatar.startswith("/"): post.avatar = "/" + post.avatar return posts diff --git a/frappe/website/doctype/blog_post/templates/blog_post_row.html b/frappe/website/doctype/blog_post/templates/blog_post_row.html index 1ea67812f1..83a47079af 100644 --- a/frappe/website/doctype/blog_post/templates/blog_post_row.html +++ b/frappe/website/doctype/blog_post/templates/blog_post_row.html @@ -5,14 +5,14 @@

{{ post.title }}

{% if post.cover_image %}

- {{post.title}} - Cover Image + {{post.title}} - Cover Image

{% endif %}

{{ post.intro }}

-
+
From 1ee6ff100966f3bff31b92ac209ce87e7b8b7925 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Sun, 24 Sep 2017 20:54:28 +0530 Subject: [PATCH 054/135] [fix] for blog --- frappe/website/doctype/blog_post/blog_post.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py index b3ea0bd797..a20e9fa128 100644 --- a/frappe/website/doctype/blog_post/blog_post.py +++ b/frappe/website/doctype/blog_post/blog_post.py @@ -190,7 +190,7 @@ def get_blog_list(doctype, txt=None, filters=None, limit_start=0, limit_page_len post.category = frappe.db.get_value('Blog Category', post.blog_category, ['route', 'title'], as_dict=True) - if post.avatar and (not "http:" in post.avatar or not "https:" in post.avatar) and not post.avatar.startswith("/"): + if post.avatar and (not "http:" in post.avatar and not "https:" in post.avatar) and not post.avatar.startswith("/"): post.avatar = "/" + post.avatar return posts From cef8c6be3805aefa141b0a75e7909a439e850a5f Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Sun, 24 Sep 2017 20:59:11 +0530 Subject: [PATCH 055/135] [minor] web_page, allow any tags --- frappe/website/doctype/web_page/web_page.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/website/doctype/web_page/web_page.json b/frappe/website/doctype/web_page/web_page.json index f71eac66d7..f88a059356 100644 --- a/frappe/website/doctype/web_page/web_page.json +++ b/frappe/website/doctype/web_page/web_page.json @@ -262,7 +262,7 @@ "fieldtype": "Text Editor", "hidden": 0, "ignore_user_permissions": 0, - "ignore_xss_filter": 0, + "ignore_xss_filter": 1, "in_filter": 0, "in_global_search": 1, "in_list_view": 0, @@ -834,7 +834,7 @@ "issingle": 0, "istable": 0, "max_attachments": 20, - "modified": "2017-06-29 23:01:00.126453", + "modified": "2017-09-24 20:58:41.588919", "modified_by": "Administrator", "module": "Website", "name": "Web Page", From adc7ad69cdbab3cd5aa2effd3a500a14d87fd54b Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 25 Sep 2017 11:06:54 +0530 Subject: [PATCH 056/135] [fix] desktop notifications --- frappe/core/page/desktop/desktop.js | 4 ++-- .../js/frappe/ui/toolbar/notifications.js | 2 +- .../website/doctype/web_page/test_web_page.js | 23 +++++++++++++++++++ 3 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 frappe/website/doctype/web_page/test_web_page.js diff --git a/frappe/core/page/desktop/desktop.js b/frappe/core/page/desktop/desktop.js index eae5b7a35d..8b4c062ab6 100644 --- a/frappe/core/page/desktop/desktop.js +++ b/frappe/core/page/desktop/desktop.js @@ -212,8 +212,8 @@ $.extend(frappe.desktop, { notifier.toggle(sum ? true : false); var circle = notifier.find(".circle-text"); var text = sum || ''; - if(text > 20) { - text = '20+'; + if(text > 99) { + text = '99+'; } if(circle.length) { diff --git a/frappe/public/js/frappe/ui/toolbar/notifications.js b/frappe/public/js/frappe/ui/toolbar/notifications.js index 48095c1b8b..dbab78b986 100644 --- a/frappe/public/js/frappe/ui/toolbar/notifications.js +++ b/frappe/public/js/frappe/ui/toolbar/notifications.js @@ -43,7 +43,7 @@ frappe.ui.notifications = { // switch colour on the navbar and disable if no notifications $(".navbar-new-comments") - .html(this.total > 20 ? '20+' : this.total) + .html(this.total > 99 ? '99+' : this.total) .toggleClass("navbar-new-comments-true", this.total ? true : false) .parent().toggleClass("disabled", this.total ? false : true); }, diff --git a/frappe/website/doctype/web_page/test_web_page.js b/frappe/website/doctype/web_page/test_web_page.js new file mode 100644 index 0000000000..0ad6bd58b6 --- /dev/null +++ b/frappe/website/doctype/web_page/test_web_page.js @@ -0,0 +1,23 @@ +/* eslint-disable */ +// rename this file from _test_[name] to test_[name] to activate +// and remove above this line + +QUnit.test("test: Web Page", function (assert) { + let done = assert.async(); + + // number of asserts + assert.expect(1); + + frappe.run_serially([ + // insert a new Web Page + () => frappe.tests.make('Web Page', [ + // values to be set + {key: 'value'} + ]), + () => { + assert.equal(cur_frm.doc.key, 'value'); + }, + () => done() + ]); + +}); From e0410ca7fa4dd9b695293dc96d5c9ba83c1146fb Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 25 Sep 2017 11:21:01 +0530 Subject: [PATCH 057/135] [fix] desktop notifications --- frappe/public/js/frappe/desk.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index 02ec07eebf..343c39d5f4 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -260,7 +260,7 @@ frappe.Application = Class.extend({ $.each(frappe.boot.notification_info.open_count_doctype, function(doctype, count) { if(count) { $('.open-notification.global[data-doctype="'+ doctype +'"]') - .removeClass("hide").html(count > 20 ? "20+" : count); + .removeClass("hide").html(count > 99 ? "99+" : count); } else { $('.open-notification.global[data-doctype="'+ doctype +'"]') .addClass("hide"); From 6b517126594a68ea09719a77fb838e89420a9ec9 Mon Sep 17 00:00:00 2001 From: Achilles Rasquinha Date: Mon, 25 Sep 2017 12:38:56 +0530 Subject: [PATCH 058/135] [MINOR, UX] added color contrast to color picker --- frappe/public/js/frappe/form/controls/color.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/form/controls/color.js b/frappe/public/js/frappe/form/controls/color.js index d13c22d19d..646f7de2f1 100644 --- a/frappe/public/js/frappe/form/controls/color.js +++ b/frappe/public/js/frappe/form/controls/color.js @@ -34,12 +34,15 @@ frappe.ui.form.ControlColor = frappe.ui.form.ControlData.extend({ return `
`; }, set_formatted_input: function(value) { - this._super(value); + this._super(value) + + if (!value) value = '#FFFFFF' + const contrast = frappe.ui.color.get_contrast_color(value) - if(!value) value = '#ffffff'; this.$input.css({ - "background-color": value - }); + "background-color": value, + "color": contrast + }) }, bind_events: function () { var mousedown_happened = false; From ed8b4afde8b6e4d79abb519ffa7268b9f9817eb4 Mon Sep 17 00:00:00 2001 From: Achilles Rasquinha Date: Mon, 25 Sep 2017 12:46:41 +0530 Subject: [PATCH 059/135] fixed codacy --- frappe/public/js/frappe/form/controls/color.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/form/controls/color.js b/frappe/public/js/frappe/form/controls/color.js index 646f7de2f1..7b14b45aca 100644 --- a/frappe/public/js/frappe/form/controls/color.js +++ b/frappe/public/js/frappe/form/controls/color.js @@ -34,15 +34,15 @@ frappe.ui.form.ControlColor = frappe.ui.form.ControlData.extend({ return `
`; }, set_formatted_input: function(value) { - this._super(value) + this._super(value); - if (!value) value = '#FFFFFF' - const contrast = frappe.ui.color.get_contrast_color(value) + if (!value) value = '#FFFFFF'; + const contrast = frappe.ui.color.get_contrast_color(value); this.$input.css({ "background-color": value, "color": contrast - }) + }); }, bind_events: function () { var mousedown_happened = false; From 147917283a3abf2518aeeb2950e08c1c08970c13 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 25 Sep 2017 12:49:44 +0530 Subject: [PATCH 060/135] [fix] naming only once --- frappe/model/document.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frappe/model/document.py b/frappe/model/document.py index 48e1d18e7d..5b64796c5b 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -334,13 +334,18 @@ class Document(BaseDocument): self._doc_before_save = frappe.get_doc(self.doctype, self.name) return self._doc_before_save - def set_new_name(self): + def set_new_name(self, force=False): """Calls `frappe.naming.se_new_name` for parent and child docs.""" + if self.flags.name_set and not force: + return + set_new_name(self) # set name for children for d in self.get_all_children(): set_new_name(d) + self.flags.name_set = True + def get_title(self): '''Get the document title based on title_field or `title` or `name`''' return self.get(self.meta.get_title_field()) From 97959126a05a67cd0f0ed1f751b782259001ffcb Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 25 Sep 2017 13:11:46 +0530 Subject: [PATCH 061/135] [fix] Set test naming series for test records --- frappe/test_runner.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/test_runner.py b/frappe/test_runner.py index 87d1e1febd..ed826b58d8 100644 --- a/frappe/test_runner.py +++ b/frappe/test_runner.py @@ -294,6 +294,10 @@ def make_test_objects(doctype, test_records=None, verbose=None, reset=False): d = frappe.copy_doc(doc) + if d.meta.get_field("naming_series"): + if not d.naming_series: + d.naming_series = "_T-" + d.doctype + "-" + if doc.get('name'): d.name = doc.get('name') else: @@ -303,10 +307,6 @@ def make_test_objects(doctype, test_records=None, verbose=None, reset=False): # do not create test records, if already exists return [] - if d.meta.get_field("naming_series"): - if not d.naming_series: - d.naming_series = "_T-" + d.doctype + "-" - # submit if docstatus is set to 1 for test record docstatus = d.docstatus From 6626b31360b42bb5626b99dc3645b850020b5188 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 25 Sep 2017 12:13:48 +0530 Subject: [PATCH 062/135] Add to Desktop menu item in tree view fixes frappe/erpnext#10548 --- frappe/public/js/frappe/views/treeview.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/views/treeview.js b/frappe/public/js/frappe/views/treeview.js index a6a8cf5105..bbe176223d 100644 --- a/frappe/public/js/frappe/views/treeview.js +++ b/frappe/public/js/frappe/views/treeview.js @@ -286,7 +286,7 @@ frappe.views.TreeView = Class.extend({ frappe.msgprint(__("You are not allowed to print this report")); return false; } - var tree = $(".tree:visible").html(); + var tree = $(".tree:visible").html(); var me = this; frappe.ui.get_print_settings(false, function(print_settings) { var title = __(me.docname || me.doctype); @@ -339,7 +339,15 @@ frappe.views.TreeView = Class.extend({ if (has_perm) { me.page.add_menu_item(menu_item["label"], menu_item["action"]); } - }) + }); + + // last menu item + me.page.add_menu_item(__('Add to Desktop'), () => { + const label = me.doctype === 'Account' ? + __('Chart of Accounts') : + __(me.doctype); + frappe.add_to_desktop(label, me.doctype); + }); } }); From 8af402bcb644516c6b020e48f122bc886d0ed29b Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 25 Sep 2017 12:50:53 +0530 Subject: [PATCH 063/135] Set correct image url in cordova fixes frappe/erpnext#10630, frappe/mobile#13 --- frappe/public/js/frappe/views/image/image_view.js | 12 ++++++++---- .../js/frappe/views/image/image_view_item_row.html | 8 ++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/frappe/public/js/frappe/views/image/image_view.js b/frappe/public/js/frappe/views/image/image_view.js index 5656c3e78e..6e094909f3 100644 --- a/frappe/public/js/frappe/views/image/image_view.js +++ b/frappe/public/js/frappe/views/image/image_view.js @@ -14,6 +14,12 @@ frappe.views.ImageView = frappe.views.ListRenderer.extend({ this._super(); this.page_title = this.page_title + ' ' + __('Images'); }, + prepare_data: function(data) { + data = this._super(data); + // absolute url if cordova, else relative + data._image_url = this.get_image_url(data); + return data; + }, render_image_view: function () { var html = this.items.map(this.render_item.bind(this)).join(""); this.container = $('
') @@ -22,14 +28,12 @@ frappe.views.ImageView = frappe.views.ListRenderer.extend({ this.container.append(html); }, render_item: function (item) { - var image_url = this.get_image_url(item); var indicator = this.get_indicator_html(item); return frappe.render_template("image_view_item_row", { data: item, indicator: indicator, subject: this.get_subject_html(item, true), additional_columns: this.additional_columns, - item_image: image_url, color: frappe.get_palette(item.item_name) }); }, @@ -112,8 +116,8 @@ frappe.views.GalleryView = Class.extend({ } return { - src: i.image, - msrc: i.image, + src: i._image_url, + msrc: i._image_url, name: i.name, w: width, h: height, diff --git a/frappe/public/js/frappe/views/image/image_view_item_row.html b/frappe/public/js/frappe/views/image/image_view_item_row.html index 80692b8bb8..7eca23dddb 100644 --- a/frappe/public/js/frappe/views/image/image_view_item_row.html +++ b/frappe/public/js/frappe/views/image/image_view_item_row.html @@ -13,18 +13,18 @@
- {% if (!item_image) { %} + {% if (!data._image_url) { %} {%= frappe.get_abbr(data._title) %} {% } %} - {% if (item_image) { %} - {{data.title}} + {% if (data._image_url) { %} + {{data.title}} {% } %}