From e5928836124726853f6873b281d89db04ecc9e87 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 27 Jun 2014 20:54:09 +0530 Subject: [PATCH 1/5] Removed ERPNext patch --- frappe/patches.txt | 2 +- frappe/patches/v4_1/__init__.py | 0 frappe/patches/v4_1/set_outgoing_email_footer.py | 11 ----------- 3 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 frappe/patches/v4_1/__init__.py delete mode 100644 frappe/patches/v4_1/set_outgoing_email_footer.py diff --git a/frappe/patches.txt b/frappe/patches.txt index 5c54e972e3..14a584c4e6 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -44,4 +44,4 @@ frappe.patches.v4_0.remove_user_owner_custom_field execute:frappe.delete_doc("DocType", "Website Template") execute:frappe.reload_doc('website', 'doctype', 'website_route') #2014-06-17 execute:frappe.db.sql("""update `tabProperty Setter` set property_type='Text' where property in ('options', 'default')""") #2014-06-20 -frappe.patches.v4_1.set_outgoing_email_footer + diff --git a/frappe/patches/v4_1/__init__.py b/frappe/patches/v4_1/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/frappe/patches/v4_1/set_outgoing_email_footer.py b/frappe/patches/v4_1/set_outgoing_email_footer.py deleted file mode 100644 index 6d9bcbc1a5..0000000000 --- a/frappe/patches/v4_1/set_outgoing_email_footer.py +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors -# MIT License. See license.txt - -from __future__ import unicode_literals -import frappe -from erpnext.setup.install import default_mail_footer - -def execute(): - mail_footer = frappe.db.get_default('mail_footer') or '' - mail_footer += default_mail_footer - frappe.db.set_value("Outgoing Email Settings", "Outgoing Email Settings", "footer", mail_footer) From 2464568cc04939d0915632bef3e50eb02de2ff26 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 27 Jun 2014 20:58:01 +0530 Subject: [PATCH 2/5] Fixes in Website Route system --- frappe/templates/base.html | 15 ++++----- frappe/templates/includes/comments.html | 7 +++- frappe/templates/includes/comments.py | 2 +- frappe/templates/includes/meta_block.html | 5 +++ frappe/templates/includes/navbar.html | 3 +- frappe/templates/includes/sidebar.html | 6 ++-- frappe/templates/pages/404.py | 4 +-- frappe/templates/pages/blog.py | 1 + frappe/templates/pages/sitemap.py | 2 +- frappe/utils/email_lib/bulk.py | 1 + frappe/website/context.py | 2 +- .../doctype/blog_category/blog_category.py | 4 +++ .../website/doctype/blog_post/blog_post.json | 5 +-- frappe/website/doctype/blog_post/blog_post.py | 2 +- frappe/website/doctype/web_page/web_page.py | 4 +-- .../doctype/website_route/website_route.json | 5 +-- .../doctype/website_route/website_route.py | 13 +++++--- frappe/website/js/website.js | 14 ++++++++ frappe/website/sync.py | 23 ++++++++++++- frappe/website/template.py | 4 +++ frappe/website/website_generator.py | 32 +++++++++++-------- frappe/widgets/form/meta.py | 1 - 22 files changed, 109 insertions(+), 46 deletions(-) create mode 100644 frappe/templates/includes/meta_block.html diff --git a/frappe/templates/base.html b/frappe/templates/base.html index 6af5cae355..5853a6965d 100644 --- a/frappe/templates/base.html +++ b/frappe/templates/base.html @@ -14,12 +14,9 @@ Built on Frappe.io. Free and Open Source Framework for the Web. https://frappe.i {%- block head_include %}{% endblock -%} {%- block head -%} - - {%- if metatags -%} - {%- for name in metatags %} - - {%- endfor -%} - {%- endif -%} + {% if meta_block is defined %} + {{ meta_block }} + {% endif %} {%- for link in web_include_css %} @@ -50,15 +47,15 @@ Built on Frappe.io. Free and Open Source Framework for the Web. https://frappe.i
+ + +
{%- if header is defined -%}{{ header }}{%- endif -%}
{%- if breadcrumbs is defined -%}{{ breadcrumbs }}{%- endif -%}
-
diff --git a/frappe/templates/includes/comments.html b/frappe/templates/includes/comments.html index 06e789f086..ecb2c7f641 100644 --- a/frappe/templates/includes/comments.html +++ b/frappe/templates/includes/comments.html @@ -18,7 +18,7 @@


+ placeholder="Your Email Id" type="email"/>

@@ -62,6 +62,11 @@ $(document).ready(function() { return false; } + if (!valid_email(args.comment_by)) { + frappe.msgprint("Please enter a valid email address."); + return false; + } + frappe.call({ btn: this, type: "POST", diff --git a/frappe/templates/includes/comments.py b/frappe/templates/includes/comments.py index 2ee7858cda..6fe8840b33 100644 --- a/frappe/templates/includes/comments.py +++ b/frappe/templates/includes/comments.py @@ -43,7 +43,7 @@ def add_comment(args=None): ifnull(unsubscribed, 0)=0""", (comment.comment_doctype, comment.comment_docname))] owner = frappe.db.get_value(comment.comment_doctype, comment.comment_docname, "owner") - recipients = commentors if owner=="Administrator" else list(set(commentors + [owner])) + recipients = list(set(commentors if owner=="Administrator" else (commentors + [owner]))) from frappe.utils.email_lib.bulk import send diff --git a/frappe/templates/includes/meta_block.html b/frappe/templates/includes/meta_block.html new file mode 100644 index 0000000000..e311040606 --- /dev/null +++ b/frappe/templates/includes/meta_block.html @@ -0,0 +1,5 @@ +{%- if metatags -%} +{%- for name in metatags %} + +{%- endfor -%} +{%- endif -%} diff --git a/frappe/templates/includes/navbar.html b/frappe/templates/includes/navbar.html index b8097711bf..a2ad132ddd 100644 --- a/frappe/templates/includes/navbar.html +++ b/frappe/templates/includes/navbar.html @@ -39,7 +39,7 @@