From 705d48619cb399c5aa9cd4abd6784524b15e7d28 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 9 Oct 2017 08:46:35 +0530 Subject: [PATCH 1/4] [Fix] Signature not displying in the PDF (#4271) --- frappe/utils/data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/utils/data.py b/frappe/utils/data.py index 6ca611be88..84780ce79e 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -791,7 +791,7 @@ def expand_relative_urls(html): def _expand_relative_urls(match): to_expand = list(match.groups()) - if not to_expand[2].startswith('mailto'): + if not to_expand[2].startswith('mailto') and not to_expand[2].startswith('data:'): if not to_expand[2].startswith("/"): to_expand[2] = "/" + to_expand[2] to_expand.insert(2, url) From 229f67664544dac15c81ad827e92ef46afa5740d Mon Sep 17 00:00:00 2001 From: Makarand Bauskar Date: Mon, 9 Oct 2017 13:09:41 +0530 Subject: [PATCH 2/4] [hotfix] minor fixes in the Email Communication subject field (#4278) --- frappe/public/js/frappe/views/communication.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js index 1625ff4849..42924f47b9 100755 --- a/frappe/public/js/frappe/views/communication.js +++ b/frappe/public/js/frappe/views/communication.js @@ -149,7 +149,12 @@ frappe.views.CommunicationComposer = Class.extend({ if (this.frm.subject_field && this.frm.doc[this.frm.subject_field]) { this.subject = __("Re: {0}", [this.frm.doc[this.frm.subject_field]]); } else { - this.subject = __(this.frm.doctype) + ': ' + this.frm[this.frm.meta.title_field || name]; + let title = this.frm.doc.name; + if(this.frm.meta.title_field && this.frm.doc[this.frm.meta.title_field] + && this.frm.doc[this.frm.meta.title_field] != this.frm.doc.name) { + title = `${this.frm.doc[this.frm.meta.title_field]} (#${this.frm.doc.name})`; + } + this.subject = `${__(this.frm.doctype)}: ${title}`; } } } From 60078d61a3878b1ad48a47e85bf8965beea8fd9b Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 9 Oct 2017 13:14:21 +0530 Subject: [PATCH 3/4] Custom Attach field, user not able to attach file (#4274) --- frappe/public/js/frappe/upload.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/upload.js b/frappe/public/js/frappe/upload.js index bb727aa415..2031e8e325 100644 --- a/frappe/public/js/frappe/upload.js +++ b/frappe/public/js/frappe/upload.js @@ -15,7 +15,7 @@ frappe.upload = { // make private by default if (!("options" in opts) || ("options" in opts && - (!opts.options.toLowerCase()=="public" && !opts.options.toLowerCase()=="image"))) { + (opts.options && !opts.options.toLowerCase()=="public" && !opts.options.toLowerCase()=="image"))) { opts.is_private = 1; } From 14898d11268382930c76fed92a3a5df375279158 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Mon, 9 Oct 2017 15:47:32 +0600 Subject: [PATCH 4/4] bumped to version 9.1.3 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 11999aecba..4f02441af8 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template -__version__ = '9.1.2' +__version__ = '9.1.3' __title__ = "Frappe Framework" local = Local()