From aa6f9b1b24bb1516c42ccd5a4e56e09ee9cca478 Mon Sep 17 00:00:00 2001 From: gshmu Date: Wed, 6 Sep 2017 13:59:19 +0800 Subject: [PATCH 1/9] default can't be true after set `opts.is_private` false, is private still true. --- 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 f8c2e579dd..4af9de5e0b 100644 --- a/frappe/public/js/frappe/upload.js +++ b/frappe/public/js/frappe/upload.js @@ -53,7 +53,7 @@ frappe.upload = { $uploaded_files_wrapper.removeClass('hidden').empty(); file_array = file_array.map( - file => Object.assign(file, {is_private: opts.is_private || 1}) + file => Object.assign(file, {is_private: opts.is_private || 0}) ) $upload.data('attached_files', file_array); From 3df0659c87616e7bc565b555921ebd4447539e25 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Wed, 6 Sep 2017 12:17:48 +0530 Subject: [PATCH 2/9] [Print Format] Align labels to right (#4068) --- frappe/printing/doctype/print_format/print_format.json | 6 +++--- frappe/templates/print_formats/standard_macros.html | 4 +++- frappe/www/printview.py | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/frappe/printing/doctype/print_format/print_format.json b/frappe/printing/doctype/print_format/print_format.json index a4f39418e6..919bc2ef15 100644 --- a/frappe/printing/doctype/print_format/print_format.json +++ b/frappe/printing/doctype/print_format/print_format.json @@ -327,7 +327,7 @@ "collapsible": 0, "columns": 0, "default": "0", - "fieldname": "align_labels_left", + "fieldname": "align_labels_right", "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, @@ -336,7 +336,7 @@ "in_global_search": 0, "in_list_view": 0, "in_standard_filter": 0, - "label": "Align Labels to the Left", + "label": "Align Labels to the Right", "length": 0, "no_copy": 0, "permlevel": 0, @@ -698,7 +698,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-05-03 05:58:47.408164", + "modified": "2017-09-05 14:01:05.658719", "modified_by": "Administrator", "module": "Printing", "name": "Print Format", diff --git a/frappe/templates/print_formats/standard_macros.html b/frappe/templates/print_formats/standard_macros.html index a077fb1cd3..a720b404f0 100644 --- a/frappe/templates/print_formats/standard_macros.html +++ b/frappe/templates/print_formats/standard_macros.html @@ -61,7 +61,9 @@ data-fieldname="{{ df.fieldname }}" data-fieldtype="{{ df.fieldtype }}" {%- macro render_field_with_label(df, doc) -%}
-
+
+ {% if df.fieldtype not in ("Image","HTML","Check") and doc.get(df.fieldname) != None %} diff --git a/frappe/www/printview.py b/frappe/www/printview.py index 0c20bb0c25..c3be27f174 100644 --- a/frappe/www/printview.py +++ b/frappe/www/printview.py @@ -98,7 +98,7 @@ def get_html(doc, name=None, print_format=None, meta=None, if print_format: doc._show_section_headings = print_format.show_section_headings doc._line_breaks = print_format.line_breaks - doc._align_labels_left = print_format.align_labels_left + doc._align_labels_right = print_format.align_labels_right def get_template_from_string(): return jenv.from_string(get_print_format(doc.doctype, From 98561b4f1b4831a71081cd19a9f5353c8411187a Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 6 Sep 2017 15:02:17 +0530 Subject: [PATCH 3/9] Update upload.js --- 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 4af9de5e0b..29b1cc803f 100644 --- a/frappe/public/js/frappe/upload.js +++ b/frappe/public/js/frappe/upload.js @@ -97,7 +97,7 @@ frappe.upload = { attached_files = attached_files.map(file => { if (file.name === filename) { - file.is_private = is_private ? 1 : 0; + file.is_private = !!is_private; } return file; }); From 9fa512e26f04c8a82bba90f663b99c165b42349b Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 6 Sep 2017 15:03:35 +0530 Subject: [PATCH 4/9] Update upload.js --- frappe/public/js/frappe/upload.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/upload.js b/frappe/public/js/frappe/upload.js index 29b1cc803f..319fc61971 100644 --- a/frappe/public/js/frappe/upload.js +++ b/frappe/public/js/frappe/upload.js @@ -53,7 +53,7 @@ frappe.upload = { $uploaded_files_wrapper.removeClass('hidden').empty(); file_array = file_array.map( - file => Object.assign(file, {is_private: opts.is_private || 0}) + file => Object.assign(file, {is_private: opts.is_private ? 1 : 0}) ) $upload.data('attached_files', file_array); @@ -97,7 +97,7 @@ frappe.upload = { attached_files = attached_files.map(file => { if (file.name === filename) { - file.is_private = !!is_private; + file.is_private = is_private ? 1 : 0; } return file; }); From 6e6fb684ec62982815b3403a4a13df5572426031 Mon Sep 17 00:00:00 2001 From: Makarand Bauskar Date: Wed, 6 Sep 2017 16:15:37 +0530 Subject: [PATCH 5/9] [hotfix] dont Patch Log, Module Def in Permission Manager (#4070) --- .../page/permission_manager/permission_manager.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/frappe/core/page/permission_manager/permission_manager.py b/frappe/core/page/permission_manager/permission_manager.py index 996c7b23d2..32a85d2864 100644 --- a/frappe/core/page/permission_manager/permission_manager.py +++ b/frappe/core/page/permission_manager/permission_manager.py @@ -3,14 +3,16 @@ from __future__ import unicode_literals import frappe +from frappe import _ import frappe.defaults from frappe.modules.import_file import get_file_path, read_doc_from_file from frappe.translate import send_translations -from frappe.permissions import (reset_perms, get_linked_doctypes, get_all_perms, - setup_custom_perms, add_permission, update_permission_property) from frappe.core.doctype.doctype.doctype import (clear_permissions_cache, validate_permissions_for_doctype) -from frappe import _ +from frappe.permissions import (reset_perms, get_linked_doctypes, get_all_perms, + setup_custom_perms, add_permission, update_permission_property) + +not_allowed_in_permission_manager = ["DocType", "Patch Log", "Module Def"] @frappe.whitelist() def get_roles_and_doctypes(): @@ -21,7 +23,7 @@ def get_roles_and_doctypes(): doctypes = frappe.get_all("DocType", filters={ "istable": 0, - "name": ("not in", "DocType"), + "name": ("not in", ",".join(not_allowed_in_permission_manager)), }, or_filters={ "ifnull(restrict_to_domain, '')": "", "restrict_to_domain": ("in", active_domains) @@ -93,7 +95,6 @@ def reset(doctype): reset_perms(doctype) clear_permissions_cache(doctype) - @frappe.whitelist() def get_users_with_role(role): frappe.only_for("System Manager") From a722b64eb124046677f6feb69759629c3a4dfe95 Mon Sep 17 00:00:00 2001 From: Makarand Bauskar Date: Wed, 6 Sep 2017 18:57:47 +0530 Subject: [PATCH 6/9] [hotfix] don't add trigger if the autoname field and fieldname is not same (#4072) --- frappe/public/js/frappe/form/controls/data.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/data.js b/frappe/public/js/frappe/form/controls/data.js index 698d704a9e..5751451f27 100644 --- a/frappe/public/js/frappe/form/controls/data.js +++ b/frappe/public/js/frappe/form/controls/data.js @@ -29,7 +29,8 @@ frappe.ui.form.ControlData = frappe.ui.form.ControlInput.extend({ if (!this.df.parent) return; this.meta = frappe.get_meta(this.df.parent); if (this.meta && this.meta.autoname - && this.meta.autoname.substr(0, 6)==='field:') { + && this.meta.autoname.substr(0, 6)==='field:' + && this.meta.autoname.substr(6) === this.df.fieldname) { this.$input.on('keyup', () => { this.set_description(''); if (this.doc && this.doc.__islocal) { From 22036c363ee9aabe83158d6943a842dd9ed71989 Mon Sep 17 00:00:00 2001 From: Makarand Bauskar Date: Wed, 6 Sep 2017 19:04:05 +0530 Subject: [PATCH 7/9] Revert "[hotfix] don't add trigger if the autoname field and fieldname is not same (#4072)" (#4073) This reverts commit a722b64eb124046677f6feb69759629c3a4dfe95. --- frappe/public/js/frappe/form/controls/data.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/form/controls/data.js b/frappe/public/js/frappe/form/controls/data.js index 5751451f27..698d704a9e 100644 --- a/frappe/public/js/frappe/form/controls/data.js +++ b/frappe/public/js/frappe/form/controls/data.js @@ -29,8 +29,7 @@ frappe.ui.form.ControlData = frappe.ui.form.ControlInput.extend({ if (!this.df.parent) return; this.meta = frappe.get_meta(this.df.parent); if (this.meta && this.meta.autoname - && this.meta.autoname.substr(0, 6)==='field:' - && this.meta.autoname.substr(6) === this.df.fieldname) { + && this.meta.autoname.substr(0, 6)==='field:') { this.$input.on('keyup', () => { this.set_description(''); if (this.doc && this.doc.__islocal) { From 5a30cca165875511118f016331435d3c7bbfde4c Mon Sep 17 00:00:00 2001 From: Makarand Bauskar Date: Thu, 7 Sep 2017 11:47:09 +0530 Subject: [PATCH 8/9] [hotfix] fixed attachement issue on CommunicationComposer while reply from Communication (#4078) --- frappe/core/doctype/communication/communication.js | 1 + frappe/public/js/frappe/views/communication.js | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/frappe/core/doctype/communication/communication.js b/frappe/core/doctype/communication/communication.js index 0b3db95540..5c8c5a6a22 100644 --- a/frappe/core/doctype/communication/communication.js +++ b/frappe/core/doctype/communication/communication.js @@ -193,6 +193,7 @@ frappe.ui.form.on("Communication", { }); return { + frm: frm, doc: frm.doc, last_email: frm.doc, sender: sender_email_id, diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js index 92db9c1a48..f62914b822 100755 --- a/frappe/public/js/frappe/views/communication.js +++ b/frappe/public/js/frappe/views/communication.js @@ -309,7 +309,8 @@ frappe.views.CommunicationComposer = Class.extend({ var args = { args: { - from_form: 1,folder:"Home/Attachments" + from_form: 1, + folder:"Home/Attachments" }, callback: function(attachment, r) { me.attachments.push(attachment); }, max_width: null, @@ -331,10 +332,10 @@ frappe.views.CommunicationComposer = Class.extend({ } $("
" - +__("Select Attachments")+"
\ -

\ - " - +__("Add Attachment")+"

").appendTo(attach.empty()) + +__("Select Attachments")+"
\ +

\ + " + +__("Add Attachment")+"

").appendTo(attach.empty()) attach.find(".add-more-attachments a").on('click',this,function() { me.upload = frappe.ui.get_upload_dialog(args); }) From d1ee33db225ffe84fe7342cf38b0b7ddc4767252 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Thu, 7 Sep 2017 12:19:19 +0600 Subject: [PATCH 9/9] bumped to version 8.10.2 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index fd98d7872f..eb0fbe62de 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__ = '8.10.1' +__version__ = '8.10.2' __title__ = "Frappe Framework" local = Local()