From 2fb27a7ceb9f2aa575832b68c8562d84b3939b37 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 15 May 2020 13:23:53 +0530 Subject: [PATCH 001/485] refactor: explicitly hide amend button in toolbar --- frappe/public/js/frappe/form/toolbar.js | 29 +++++++++++++++---------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/frappe/public/js/frappe/form/toolbar.js b/frappe/public/js/frappe/form/toolbar.js index 528c874935..6f475fa9e5 100644 --- a/frappe/public/js/frappe/form/toolbar.js +++ b/frappe/public/js/frappe/form/toolbar.js @@ -374,19 +374,24 @@ frappe.ui.form.Toolbar = Class.extend({ var status = this.get_action_status(); if (status) { - if (status !== this.current_status) { - if (status === 'Amend') { - let doc = this.frm.doc; - frappe.xcall('frappe.client.is_document_amended', { - 'doctype': doc.doctype, - 'docname': doc.name - }).then(is_amended => { - if (is_amended) return; - this.set_page_actions(status); - }); - } else { + // When moving from a page with status amend to another page with status amend + // We need to check if document is already amened specifcally and hide + // or clear the menu actions accordingly + + if (status !== this.current_status || status === 'Amend') { + let doc = this.frm.doc; + frappe.xcall('frappe.client.is_document_amended', { + 'doctype': doc.doctype, + 'docname': doc.name + }).then(is_amended => { + if (is_amended) { + this.page.clear_actions(); + return; + } this.set_page_actions(status); - } + }); + } else { + this.set_page_actions(status); } } else { this.page.clear_actions(); From bfaf2fcf7740de19c8568235e80c5eb3ac3cfbf4 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 15 May 2020 13:24:06 +0530 Subject: [PATCH 002/485] feat: do not allow amending already amended docs --- frappe/public/js/frappe/form/form.js | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index 01dfbf81f9..58a1be73c1 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -780,15 +780,24 @@ frappe.ui.form.Form = class FrappeForm { frappe.msgprint(__('"amended_from" field must be present to do an amendment.')); return; } - this.validate_form_action("Amend"); - var me = this; - var fn = function(newdoc) { - newdoc.amended_from = me.docname; - if(me.fields_dict && me.fields_dict['amendment_date']) - newdoc.amendment_date = frappe.datetime.obj_to_str(new Date()); - }; - this.copy_doc(fn, 1); - frappe.utils.play_sound("click"); + + frappe.xcall('frappe.client.is_document_amended', { + 'doctype': this.doc.doctype, + 'docname': this.doc.name + }).then(is_amended => { + if (is_amended) { + frappe.throw(__('This document is already amended, you cannot ammend it again')) + }; + this.validate_form_action("Amend"); + var me = this; + var fn = function(newdoc) { + newdoc.amended_from = me.docname; + if(me.fields_dict && me.fields_dict['amendment_date']) + newdoc.amendment_date = frappe.datetime.obj_to_str(new Date()); + }; + this.copy_doc(fn, 1); + frappe.utils.play_sound("click"); + }); } validate_form_action(action, resolve) { From e4729b00008449e0f96136fe4bfd1f80280b01e7 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Sat, 16 May 2020 13:29:44 +0530 Subject: [PATCH 003/485] feat: added FileAlreadyAttachedException --- frappe/exceptions.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/exceptions.py b/frappe/exceptions.py index 5a1181f31e..fe8c1895d7 100644 --- a/frappe/exceptions.py +++ b/frappe/exceptions.py @@ -98,6 +98,7 @@ class InvalidColumnName(ValidationError): pass class IncompatibleApp(ValidationError): pass class InvalidDates(ValidationError): pass class DataTooLongException(ValidationError): pass +class FileAlreadyAttachedException(Exception): pass # OAuth exceptions class InvalidAuthorizationHeader(CSRFTokenError): pass class InvalidAuthorizationPrefix(CSRFTokenError): pass From d837535740456cff5e1f65bdbad7e67936e99f47 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Sat, 16 May 2020 13:30:15 +0530 Subject: [PATCH 004/485] fix: raise explicit exception not conflicting with NameError --- frappe/core/doctype/file/file.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index b35abfa861..fedd35aa4f 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -180,11 +180,11 @@ class File(Document): if duplicate_file: duplicate_file_doc = frappe.get_cached_doc('File', duplicate_file.name) if duplicate_file_doc.exists_on_disk(): - # if it is attached to a document then throw DuplicateEntryError + # if it is attached to a document then throw FileAlreadyAttachedException if self.attached_to_doctype and self.attached_to_name: self.duplicate_entry = duplicate_file.name frappe.throw(_("Same file has already been attached to the record"), - frappe.DuplicateEntryError) + frappe.FileAlreadyAttachedException) # else just use the url, to avoid uploading a duplicate else: self.file_url = duplicate_file.file_url From af0cccf5cd518e257386ec87808c5e9ef4deeaed Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Sat, 16 May 2020 13:52:30 +0530 Subject: [PATCH 005/485] refactor: delete doc directly without checking for comments --- frappe/core/doctype/file/file.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index fedd35aa4f..0f57ed0a5e 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -704,7 +704,12 @@ def remove_all(dt, dn, from_delete=False): try: for fid in frappe.db.sql_list("""select name from `tabFile` where attached_to_doctype=%s and attached_to_name=%s""", (dt, dn)): - remove_file(fid=fid, attached_to_doctype=dt, attached_to_name=dn, from_delete=from_delete) + if from_delete: + # If deleting a doc, directly delete files + frappe.delete_doc("File", fid, ignore_permissions=True) + else: + # Removes file and adds a comment in the document it is attached to + remove_file(fid=fid, attached_to_doctype=dt, attached_to_name=dn, from_delete=from_delete) except Exception as e: if e.args[0]!=1054: raise # (temp till for patched) From aef2da89b9a91e15df9499ea9908ff4e3464641e Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Sat, 16 May 2020 13:59:16 +0530 Subject: [PATCH 006/485] style: linting fixes for sider --- frappe/public/js/frappe/form/form.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index 58a1be73c1..8a498a69a2 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -786,13 +786,13 @@ frappe.ui.form.Form = class FrappeForm { 'docname': this.doc.name }).then(is_amended => { if (is_amended) { - frappe.throw(__('This document is already amended, you cannot ammend it again')) - }; + frappe.throw(__('This document is already amended, you cannot ammend it again')); + } this.validate_form_action("Amend"); var me = this; var fn = function(newdoc) { newdoc.amended_from = me.docname; - if(me.fields_dict && me.fields_dict['amendment_date']) + if (me.fields_dict && me.fields_dict['amendment_date']) newdoc.amendment_date = frappe.datetime.obj_to_str(new Date()); }; this.copy_doc(fn, 1); From 0a4f1e66bccea0fa7b479d1024b5524be9f8b1f2 Mon Sep 17 00:00:00 2001 From: Himanshu Warekar Date: Fri, 22 May 2020 13:42:42 +0530 Subject: [PATCH 007/485] fix: filter table multiselect datalist --- frappe/public/js/frappe/form/controls/link.js | 13 +++++++++---- .../js/frappe/form/controls/table_multiselect.js | 15 ++++++++++++++- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/form/controls/link.js b/frappe/public/js/frappe/form/controls/link.js index 9d8241f5a7..c847fb8f44 100644 --- a/frappe/public/js/frappe/form/controls/link.js +++ b/frappe/public/js/frappe/form/controls/link.js @@ -117,9 +117,6 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({ value: item.value }; }, - filter: function() { - return true; - }, item: function (item) { var d = this.get_item(item.value); if(!d.label) { d.label = d.value; } @@ -140,6 +137,8 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({ } }); + this.filter_awesomplete(this.awesomplete); + this.$input.on("input", frappe.utils.debounce(function(e) { var doctype = me.get_options(); if(!doctype) return; @@ -467,10 +466,16 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({ for(var i=0; i < fl.length; i++) { frappe.model.set_value(df.parent, docname, fl[i], fetch_values[i], df.fieldtype); } + }, + + filter_awesomplete: function(awesomplete) { + awesomplete.filter = function() { + return true; + } } }); -if(Awesomplete) { +if (Awesomplete) { Awesomplete.prototype.get_item = function(value) { return this._list.find(function(item) { return item.value === value; diff --git a/frappe/public/js/frappe/form/controls/table_multiselect.js b/frappe/public/js/frappe/form/controls/table_multiselect.js index a75a947e3f..5764cb05e6 100644 --- a/frappe/public/js/frappe/form/controls/table_multiselect.js +++ b/frappe/public/js/frappe/form/controls/table_multiselect.js @@ -11,6 +11,8 @@ frappe.ui.form.ControlTableMultiSelect = frappe.ui.form.ControlLink.extend({ // used as an internal model to store values this.rows = []; + // used as an internal model to filter awesomplete values + this._rows_list = [] this.$input_area.on('click', (e) => { if (e.target === this.$input_area.get(0)) { @@ -61,7 +63,7 @@ frappe.ui.form.ControlTableMultiSelect = frappe.ui.form.ControlLink.extend({ }); } } - + this._rows_list = this.rows.map(row => row[link_field.fieldname]); return this.rows; }, validate(value) { @@ -141,4 +143,15 @@ frappe.ui.form.ControlTableMultiSelect = frappe.ui.form.ControlLink.extend({ } return this._link_field; }, + filter_awesomplete: function(awesomplete) { + let me = this; + + awesomplete.filter = function(item) { + if (in_list(me._rows_list, item.value)) { + return false + } + + return true + } + } }); From 30b59881e33d4419b18d967e685f3e638dd2c082 Mon Sep 17 00:00:00 2001 From: Himanshu Warekar Date: Fri, 22 May 2020 14:18:48 +0530 Subject: [PATCH 008/485] fix: sider fixes --- frappe/public/js/frappe/form/controls/link.js | 2 +- .../public/js/frappe/form/controls/table_multiselect.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/form/controls/link.js b/frappe/public/js/frappe/form/controls/link.js index c847fb8f44..6bbc32acbc 100644 --- a/frappe/public/js/frappe/form/controls/link.js +++ b/frappe/public/js/frappe/form/controls/link.js @@ -471,7 +471,7 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({ filter_awesomplete: function(awesomplete) { awesomplete.filter = function() { return true; - } + }; } }); diff --git a/frappe/public/js/frappe/form/controls/table_multiselect.js b/frappe/public/js/frappe/form/controls/table_multiselect.js index 5764cb05e6..f31fac6b69 100644 --- a/frappe/public/js/frappe/form/controls/table_multiselect.js +++ b/frappe/public/js/frappe/form/controls/table_multiselect.js @@ -12,7 +12,7 @@ frappe.ui.form.ControlTableMultiSelect = frappe.ui.form.ControlLink.extend({ // used as an internal model to store values this.rows = []; // used as an internal model to filter awesomplete values - this._rows_list = [] + this._rows_list = []; this.$input_area.on('click', (e) => { if (e.target === this.$input_area.get(0)) { @@ -148,10 +148,10 @@ frappe.ui.form.ControlTableMultiSelect = frappe.ui.form.ControlLink.extend({ awesomplete.filter = function(item) { if (in_list(me._rows_list, item.value)) { - return false + return false; } - return true - } + return true; + }; } }); From 2ea74dee36f1bbd094a7fa967fc50be26ba5e09d Mon Sep 17 00:00:00 2001 From: "Chinmay D. Pai" Date: Tue, 26 May 2020 18:47:17 +0530 Subject: [PATCH 009/485] fix: check for whitelist before calling from search search widget takes query as an input, but does not check whether the query function that is called is whitelisted, basically allowing anyone logged-in to call any function regardless of the whitelist. Signed-off-by: Chinmay D. Pai --- frappe/desk/search.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/desk/search.py b/frappe/desk/search.py index c70b650945..1da2a3d0b5 100644 --- a/frappe/desk/search.py +++ b/frappe/desk/search.py @@ -6,6 +6,7 @@ from __future__ import unicode_literals import frappe, json from frappe.utils import cstr, unique, cint from frappe.permissions import has_permission +from frappe.handler import is_whitelisted from frappe import _ from six import string_types import re @@ -74,6 +75,7 @@ def search_widget(doctype, txt, query=None, searchfield=None, start=0, if query and query.split()[0].lower()!="select": # by method + is_whitelisted(query) frappe.response["values"] = frappe.call(query, doctype, txt, searchfield, start, page_length, filters, as_dict=as_dict) elif not query and doctype in standard_queries: From c4d4fc3574dcb0f716fc8ad5edb162f171a990fe Mon Sep 17 00:00:00 2001 From: "Chinmay D. Pai" Date: Tue, 26 May 2020 18:49:12 +0530 Subject: [PATCH 010/485] chore: add standard queries hooks to whitelist standard queries are used within the search widget, and now require to be whitelisted before they can be executed through the search widget. Signed-off-by: Chinmay D. Pai --- frappe/core/doctype/user/user.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index 0c5ebc3ede..f571240454 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -811,6 +811,7 @@ def reset_password(user): frappe.clear_messages() return 'not found' +@frappe.whitelist() def user_query(doctype, txt, searchfield, start, page_len, filters): from frappe.desk.reportview import get_match_cond From 2321a75f948a152d69d3cb517690ca68f436931d Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 30 Apr 2020 13:01:46 +0530 Subject: [PATCH 011/485] fix: Handle duplicate columns --- .../core/doctype/data_import/exporter_new.py | 24 +++++++--- .../core/doctype/data_import/importer_new.py | 45 +++++++++++++++---- 2 files changed, 54 insertions(+), 15 deletions(-) diff --git a/frappe/core/doctype/data_import/exporter_new.py b/frappe/core/doctype/data_import/exporter_new.py index 85f933be69..d0c3572f2e 100644 --- a/frappe/core/doctype/data_import/exporter_new.py +++ b/frappe/core/doctype/data_import/exporter_new.py @@ -230,13 +230,25 @@ class Exporter: return [i for i, df in enumerate(self.fields) if df.parent == doctype] def add_header(self): - def get_label(df): - if df.parent == self.doctype: - return df.label - else: - return "{0} ({1})".format(df.label, df.parent) - header = [get_label(df) for df in self.fields] + header = [] + for df in self.fields: + is_parent = df.parent == self.doctype + if is_parent: + label = df.label + else: + label = "{0} ({1})".format(df.label, df.parent) + + if label in header: + # this label is already in the header, + # which means two fields with the same label + # add the fieldname to avoid clash + if is_parent: + label = '{0} ({1})'.format(df.label, df.fieldname) + else: + label = '{0} ({1}) ({2})'.format(df.label, df.fieldname, df.parent) + header.append(label) + self.csv_array.append(header) def add_data(self): diff --git a/frappe/core/doctype/data_import/importer_new.py b/frappe/core/doctype/data_import/importer_new.py index 040e9fabc4..383d8bc366 100644 --- a/frappe/core/doctype/data_import/importer_new.py +++ b/frappe/core/doctype/data_import/importer_new.py @@ -175,6 +175,7 @@ class Importer: def parse_columns_from_header_row(self): remap_column = self.template_options.remap_column columns = [] + seen = [] df_by_labels_and_fieldnames = self.build_fields_dict_for_column_matching() @@ -203,7 +204,17 @@ class Importer: else: skip_import = False - if fieldname == "Don't Import": + if header_title in seen: + self.warnings.append( + { + "col": column_number, + "message": _("Skipping Duplicate Column {0}").format(frappe.bold(header_title)), + "type": "info", + } + ) + df = None + skip_import = True + elif fieldname == "Don't Import": skip_import = True self.warnings.append( { @@ -236,6 +247,7 @@ class Importer: index=i, ) ) + seen.append(header_title) return columns @@ -278,17 +290,32 @@ class Importer: fieldtype = df.fieldtype or "Data" parent = df.parent or self.doctype if fieldtype not in no_value_fields: - # label as key - label = ( - df.label if self.doctype == doctype else "{0} ({1})".format(df.label, parent) - ) - out[label] = df - # fieldname as key if self.doctype == doctype: + # for parent doctypes keys will be + # Label + # label + # Label (label) + if not out.get(df.label): + # if Label is already set, don't set it again + # in case of duplicate column headers + out[df.label] = df out[df.fieldname] = df + label_with_fieldname = "{0} ({1})".format(df.label, df.fieldname) + out[label_with_fieldname] = df else: - key = "{0}:{1}".format(doctype, df.fieldname) - out[key] = df + # for child doctypes keys will be + # Label (Child DocType) + # Child DocType:label + # Label (label) (Child DocType) + label = "{0} ({1})".format(df.label, parent) + fieldname = "{0}:{1}".format(doctype, df.fieldname) + label_with_fieldname = "{0} ({1}) ({2})".format(df.label, df.fieldname, parent) + if not out.get(label): + # if Label is already set, don't set it again + # in case of duplicate column headers + out[label] = df + out[fieldname] = df + out[label_with_fieldname] = df # if autoname is based on field # add an entry for "ID (Autoname Field)" From 7ec51923320ca80ddd0283fcd8867088ea7fc96d Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 30 Apr 2020 13:01:51 +0530 Subject: [PATCH 012/485] fix: Style --- frappe/core/doctype/data_import/importer_new.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/frappe/core/doctype/data_import/importer_new.py b/frappe/core/doctype/data_import/importer_new.py index 383d8bc366..cbb2ee482b 100644 --- a/frappe/core/doctype/data_import/importer_new.py +++ b/frappe/core/doctype/data_import/importer_new.py @@ -378,16 +378,8 @@ class Importer: value = cstr(value) # convert boolean values to 0 or 1 - if df.fieldtype == "Check" and value.lower().strip() in [ - "t", - "f", - "true", - "false", - "yes", - "no", - "y", - "n", - ]: + valid_check_values = ["t", "f", "true", "false", "yes", "no", "y", "n"] + if df.fieldtype == "Check" and value.lower().strip() in valid_check_values: value = value.lower().strip() value = 1 if value in ["t", "true", "y", "yes"] else 0 From 4888eb96945f3aaa6cf5011b698b8ed74d012ced Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sun, 3 May 2020 15:19:52 +0530 Subject: [PATCH 013/485] fix: Handle Insert / Update case in exporter --- .../data_import_beta/data_import_beta.js | 23 +----- .../js/frappe/data_import/data_exporter.js | 72 ++++++++++++++----- 2 files changed, 58 insertions(+), 37 deletions(-) diff --git a/frappe/core/doctype/data_import_beta/data_import_beta.js b/frappe/core/doctype/data_import_beta/data_import_beta.js index 527dbd7d0c..72404c74f4 100644 --- a/frappe/core/doctype/data_import_beta/data_import_beta.js +++ b/frappe/core/doctype/data_import_beta/data_import_beta.js @@ -193,33 +193,16 @@ frappe.ui.form.on('Data Import Beta', { frm.data_exporter && frm.data_exporter.doctype === frm.doc.reference_doctype ) { + frm.data_exporter.exporting_for = frm.doc.import_type; frm.data_exporter.dialog.show(); - set_export_records(); } else { frappe.require('/assets/js/data_import_tools.min.js', () => { frm.data_exporter = new frappe.data_import.DataExporter( - frm.doc.reference_doctype + frm.doc.reference_doctype, + frm.doc.import_type ); - set_export_records(); }); } - - function set_export_records() { - if (frm.doc.import_type === 'Insert New Records') { - frm.data_exporter.dialog.set_value('export_records', 'blank_template'); - } else { - frm.data_exporter.dialog.set_value('export_records', 'all'); - } - // Force ID field to be exported when updating existing records - let id_field = frm.data_exporter.dialog.get_field( - frm.doc.reference_doctype - ).options[0]; - if (id_field.value === 'name' && id_field.$checkbox) { - id_field.$checkbox - .find('input') - .prop('disabled', frm.doc.import_type === 'Update Existing Records'); - } - } }, reference_doctype(frm) { diff --git a/frappe/public/js/frappe/data_import/data_exporter.js b/frappe/public/js/frappe/data_import/data_exporter.js index d0bf794df6..7a5efc6cf0 100644 --- a/frappe/public/js/frappe/data_import/data_exporter.js +++ b/frappe/public/js/frappe/data_import/data_exporter.js @@ -2,8 +2,9 @@ import ColumnPickerFields from './column_picker_fields'; frappe.provide('frappe.data_import'); frappe.data_import.DataExporter = class DataExporter { - constructor(doctype) { + constructor(doctype, exporting_for) { this.doctype = doctype; + this.exporting_for = exporting_for; frappe.model.with_doctype(doctype, () => { this.make_dialog(); }); @@ -13,6 +14,36 @@ frappe.data_import.DataExporter = class DataExporter { this.dialog = new frappe.ui.Dialog({ title: __('Export Data'), fields: [ + { + fieldtype: 'Select', + fieldname: 'exporting_for', + label: __('Exporting For'), + options: [ + { + label: __('Insert New Records'), + value: 'Insert New Records' + }, + { + label: __('Update Existing Records'), + value: 'Update Existing Records' + } + ], + change: () => { + let exporting_for = this.dialog.get_value('exporting_for'); + this.dialog.set_value( + 'export_records', + exporting_for === 'Insert New Records' ? 'blank_template' : 'all' + ); + + // Force ID field to be exported when updating existing records + let id_field = this.dialog.get_field(this.doctype).options[0]; + if (id_field.value === 'name' && id_field.$checkbox) { + id_field.$checkbox + .find('input') + .prop('disabled', exporting_for === 'Update Existing Records'); + } + } + }, { fieldtype: 'Select', fieldname: 'export_records', @@ -67,27 +98,30 @@ frappe.data_import.DataExporter = class DataExporter { on_change: () => this.update_primary_action(), options: this.get_multicheck_options(this.doctype) }, - ...frappe.meta.get_table_fields(this.doctype) - .map(df => { - let doctype = df.options; - let label = df.reqd - ? __('{0} (1 row mandatory)', [doctype]) - : __(doctype); - return { - label, - fieldname: doctype, - fieldtype: 'MultiCheck', - columns: 2, - on_change: () => this.update_primary_action(), - options: this.get_multicheck_options(doctype) - }; - }) + ...frappe.meta.get_table_fields(this.doctype).map(df => { + let doctype = df.options; + let label = df.reqd + ? __('{0} (1 row mandatory)', [doctype]) + : __(doctype); + return { + label, + fieldname: doctype, + fieldtype: 'MultiCheck', + columns: 2, + on_change: () => this.update_primary_action(), + options: this.get_multicheck_options(doctype) + }; + }) ], primary_action_label: __('Export'), primary_action: values => this.export_records(values), on_page_show: () => this.select_mandatory() }); + if (this.exporting_for) { + this.dialog.set_value('exporting_for', this.exporting_for); + } + this.make_filter_area(); this.make_select_all_buttons(); this.update_record_count_message(); @@ -192,8 +226,12 @@ frappe.data_import.DataExporter = class DataExporter { } unselect_all() { + let update_existing_records = + this.dialog.get_value('exporting_for') == 'Update Existing Records'; this.dialog.$wrapper - .find(':checkbox') + .find( + `:checkbox${update_existing_records ? ':not([data-unit=name])' : ''}` + ) .prop('checked', false) .trigger('change'); } From fe1a55110d3862d951c7fd6c04920f23b6ea8ab7 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 18 May 2020 07:32:34 +0530 Subject: [PATCH 014/485] fix: Data Export - Handle multiple child tables with the same doctype - Refactor exporter to fix child rows export --- .../core/doctype/data_import/exporter_new.py | 252 +++++++++--------- .../data_import/column_picker_fields.js | 28 -- .../js/frappe/data_import/data_exporter.js | 66 ++++- 3 files changed, 177 insertions(+), 169 deletions(-) delete mode 100644 frappe/public/js/frappe/data_import/column_picker_fields.js diff --git a/frappe/core/doctype/data_import/exporter_new.py b/frappe/core/doctype/data_import/exporter_new.py index d0c3572f2e..744a050c1c 100644 --- a/frappe/core/doctype/data_import/exporter_new.py +++ b/frappe/core/doctype/data_import/exporter_new.py @@ -3,7 +3,11 @@ # MIT License. See license.txt import frappe -from frappe.model import display_fieldtypes, no_value_fields, table_fields +from frappe.model import ( + display_fieldtypes, + no_value_fields, + table_fields as table_fieldtypes, +) from frappe.utils.csvutils import build_csv_response from frappe.utils.xlsxutils import build_xlsx_response from .importer_new import INVALID_VALUES @@ -38,8 +42,8 @@ class Exporter: self.csv_array = [] # fields that get exported - # can be All, Mandatory or User Selected Fields - self.fields = self.get_all_exportable_fields() + self.exportable_fields = self.get_all_exportable_fields() + self.fields = self.serialize_exportable_fields() self.add_header() if export_data: @@ -49,47 +53,51 @@ class Exporter: self.add_data() def get_all_exportable_fields(self): - return self.get_exportable_parent_fields() + self.get_exportable_children_fields() + child_table_fields = [ + df.fieldname for df in self.meta.fields if df.fieldtype in table_fieldtypes + ] - def get_exportable_parent_fields(self): - parent_fields = self.get_exportable_fields(self.doctype) + def is_exportable(df): + return df and df.fieldtype not in (display_fieldtypes + no_value_fields) - # if autoname is based on field - # then merge ID and the field column title as "ID (Autoname Field)" - autoname = self.meta.autoname - if autoname and autoname.startswith("field:"): - fieldname = autoname[len("field:") :] - autoname_field = self.meta.get_field(fieldname) - if autoname_field: - name_field = parent_fields[0] - name_field.label = "ID ({})".format(autoname_field.label) - # remove the autoname field as it is a duplicate of ID field - parent_fields = [ - df for df in parent_fields if df.fieldname != autoname_field.fieldname - ] + meta = frappe.get_meta(self.doctype) + exportable_fields = frappe._dict({}) - return parent_fields + for key, fieldnames in self.export_fields.items(): + if key == self.doctype: + # parent fields + exportable_fields[key] = self.get_exportable_fields(key, fieldnames) - def get_exportable_children_fields(self): - child_table_fields = [df for df in self.meta.fields if df.fieldtype in table_fields] - if self.export_fields == "Mandatory": - child_table_fields = [df for df in child_table_fields if df.reqd] + elif key in child_table_fields: + # child fields + child_df = meta.get_field(key) + child_doctype = child_df.options + exportable_fields[key] = self.get_exportable_fields(child_doctype, fieldnames) - children = [df.options for df in child_table_fields] - children_fields = [] - for child in children: - children_fields += self.get_exportable_fields(child) + return exportable_fields - return children_fields + def serialize_exportable_fields(self): + fields = [] + for key, exportable_fields in self.exportable_fields.items(): + for _df in exportable_fields: + # make a copy of df dict to avoid reference mutation + if isinstance(_df, frappe.core.doctype.docfield.docfield.DocField): + df = _df.as_dict() + else: + df = _df.copy() - def get_exportable_fields(self, doctype): + df.is_child_table_field = key != self.doctype + if df.is_child_table_field: + df.child_table_df = self.meta.get_field(key) + fields.append(df) + return fields + + def get_exportable_fields(self, doctype, fieldnames): meta = frappe.get_meta(doctype) def is_exportable(df): return df and df.fieldtype not in (display_fieldtypes + no_value_fields) - # filter out invalid fieldtypes - all_fields = [df for df in meta.fields if is_exportable(df)] # add name field name_field = frappe._dict( { @@ -100,30 +108,55 @@ class Exporter: "parent": doctype, } ) - all_fields = [name_field] + all_fields - if self.export_fields == "Mandatory": - fields = [df for df in all_fields if df.reqd] + fields = [meta.get_field(fieldname) for fieldname in fieldnames] + fields = [df for df in fields if is_exportable(df)] - if self.export_fields == "All": - fields = list(all_fields) - - elif isinstance(self.export_fields, dict): - fields_to_export = self.export_fields.get(doctype, []) - fields = [meta.get_field(fieldname) for fieldname in fields_to_export] - fields = [df for df in fields if is_exportable(df)] - if 'name' in fields_to_export: - fields = [name_field] + fields + if "name" in fieldnames: + fields = [name_field] + fields return fields or [] def get_data_to_export(self): frappe.permissions.can_export(self.doctype, raise_exception=True) + data_to_export = [] - def get_column_name(df): - return "`tab{0}`.`{1}`".format(df.parent, df.fieldname) + table_fields = [f for f in self.exportable_fields if f != self.doctype] + data = self.get_data_as_docs() - fields = [get_column_name(df) for df in self.fields] + for doc in data: + rows = [] + rows = self.add_data_row(self.doctype, None, doc, rows, 0) + + if table_fields: + # add child table data + for f in table_fields: + for i, child_row in enumerate(doc[f]): + table_df = self.meta.get_field(f) + child_doctype = table_df.options + rows = self.add_data_row(child_doctype, child_row.parentfield, child_row, rows, i) + + data_to_export += rows + + return data_to_export + + def add_data_row(self, doctype, parentfield, doc, rows, row_idx): + if len(rows) < row_idx + 1: + rows.append([""] * len(self.fields)) + + row = rows[row_idx] + + for i, df in enumerate(self.fields): + if df.parent == doctype: + if df.is_child_table_field and df.child_table_df.fieldname != parentfield: + continue + row[i] = doc.get(df.fieldname, "") + + return rows + + def get_data_as_docs(self): + format_column_name = lambda df: "`tab{0}`.`{1}`".format(df.parent, df.fieldname) + fields = [format_column_name(df) for df in self.fields] filters = self.export_filters if self.meta.is_nested_set(): @@ -131,94 +164,51 @@ class Exporter: else: order_by = "`tab{0}`.`creation` DESC".format(self.doctype) - data = frappe.db.get_list( + parent_fields = [ + format_column_name(df) for df in self.fields if df.parent == self.doctype + ] + parent_data = frappe.db.get_list( self.doctype, filters=filters, - fields=fields, + fields=["name"] + parent_fields, limit_page_length=self.export_page_length, order_by=order_by, - as_list=1, + as_list=0, ) + parent_names = [p.name for p in parent_data] - data = self.remove_duplicate_values(data) - data = self.remove_row_gaps(data) - data = self.remove_empty_rows(data) - # data = self.remove_values_from_name_column(data) - - return data - - def remove_duplicate_values(self, data): - out = [] - - doctypes = set([df.parent for df in self.fields]) - - def name_exists_in_column_before_row(name, column_index, row_index): - column_values = [row[column_index] for i, row in enumerate(data) if i < row_index] - return name in column_values - - for i, row in enumerate(data): - # first row is fine - if i == 0: - out.append(row) + child_data = {} + for key in self.exportable_fields: + if key == self.doctype: continue + child_table_df = self.meta.get_field(key) + child_table_doctype = child_table_df.options + child_fields = ["name", "idx", "parent", "parentfield"] + list( + set( + [format_column_name(df) for df in self.fields if df.parent == child_table_doctype] + ) + ) + data = frappe.db.get_list( + child_table_doctype, + filters={ + "parent": ("in", parent_names), + "parentfield": child_table_df.fieldname, + "parenttype": self.doctype, + }, + fields=child_fields, + order_by="idx asc", + as_list=0, + ) + child_data[key] = data - row = list(row) - for doctype in doctypes: - name_index = self.get_name_column_index(doctype) - name = row[name_index] - column_indexes = self.get_column_indexes(doctype) + return self.merge_data(parent_data, child_data) - if name_exists_in_column_before_row(name, name_index, i): - # remove the values from the row - row = [None if i in column_indexes else d for i, d in enumerate(row)] + def merge_data(self, parent_data, child_data): + for doc in parent_data: + for table_field, table_rows in child_data.items(): + doc[table_field] = [row for row in table_rows if row.parent == doc.name] - out.append(row) - - return out - - def remove_row_gaps(self, data): - doctypes = set([df.parent for df in self.fields if df.parent != self.doctype]) - - def get_nearest_empty_row_index(col_index, row_index): - col_values = [row[col_index] for row in data] - i = row_index - 1 - while not col_values[i]: - i = i - 1 - out = i + 1 - if row_index != out: - return out - - for i, row in enumerate(data): - # if this is the row that contains parent values then skip - if row[0]: - continue - - for doctype in doctypes: - name_index = self.get_name_column_index(doctype) - name = row[name_index] - column_indexes = self.get_column_indexes(doctype) - - if not name: - continue - - row_index = get_nearest_empty_row_index(name_index, i) - if row_index: - for col_index in column_indexes: - data[row_index][col_index] = row[col_index] - row[col_index] = None - - return data - - # pylint: disable=R0201 - def remove_empty_rows(self, data): - return [row for row in data if any(v not in INVALID_VALUES for v in row)] - - def remove_values_from_name_column(self, data): - out = [] - name_columns = [i for i, df in enumerate(self.fields) if df.fieldname == "name"] - for row in data: - out.append(["" if i in name_columns else value for i, value in enumerate(row)]) - return out + return parent_data def get_name_column_index(self, doctype): for i, df in enumerate(self.fields): @@ -233,20 +223,20 @@ class Exporter: header = [] for df in self.fields: - is_parent = df.parent == self.doctype + is_parent = not df.is_child_table_field if is_parent: label = df.label else: - label = "{0} ({1})".format(df.label, df.parent) + label = "{0} ({1})".format(df.label, df.child_table_df.label) if label in header: # this label is already in the header, # which means two fields with the same label # add the fieldname to avoid clash if is_parent: - label = '{0} ({1})'.format(df.label, df.fieldname) + label = "{0}".format(df.fieldname) else: - label = '{0} ({1}) ({2})'.format(df.label, df.fieldname, df.parent) + label = "{0}.{1}".format(df.child_table_df.fieldname, df.fieldname) header.append(label) self.csv_array.append(header) @@ -267,9 +257,9 @@ class Exporter: return csv_array def build_response(self): - if self.file_type == 'CSV': + if self.file_type == "CSV": self.build_csv_response() - elif self.file_type == 'Excel': + elif self.file_type == "Excel": self.build_xlsx_response() def build_csv_response(self): diff --git a/frappe/public/js/frappe/data_import/column_picker_fields.js b/frappe/public/js/frappe/data_import/column_picker_fields.js deleted file mode 100644 index 36cbf3c413..0000000000 --- a/frappe/public/js/frappe/data_import/column_picker_fields.js +++ /dev/null @@ -1,28 +0,0 @@ -export default class ColumnPickerFields extends frappe.views.ReportView { - show() {} - - get_fields_as_options() { - let column_map = this.get_columns_for_picker(); - let doctypes = [this.doctype].concat( - ...frappe.meta.get_table_fields(this.doctype).map(df => df.options) - ); - // flatten array - return [].concat( - ...doctypes.map(doctype => { - return column_map[doctype].map(df => { - let label = df.label; - let value = df.fieldname; - if (this.doctype !== doctype) { - label = `${df.label} (${doctype})`; - value = `${doctype}:${df.fieldname}`; - } - return { - label, - value, - description: value - }; - }); - }) - ); - } -} diff --git a/frappe/public/js/frappe/data_import/data_exporter.js b/frappe/public/js/frappe/data_import/data_exporter.js index 7a5efc6cf0..8276be6670 100644 --- a/frappe/public/js/frappe/data_import/data_exporter.js +++ b/frappe/public/js/frappe/data_import/data_exporter.js @@ -1,4 +1,3 @@ -import ColumnPickerFields from './column_picker_fields'; frappe.provide('frappe.data_import'); frappe.data_import.DataExporter = class DataExporter { @@ -100,16 +99,20 @@ frappe.data_import.DataExporter = class DataExporter { }, ...frappe.meta.get_table_fields(this.doctype).map(df => { let doctype = df.options; + let child_fieldname = df.fieldname; let label = df.reqd - ? __('{0} (1 row mandatory)', [doctype]) - : __(doctype); + ? __('{0} ({1}) (1 row mandatory)', [ + df.label || df.fieldname, + doctype + ]) + : __('{0} ({1})', [df.label || df.fieldname, doctype]); return { label, - fieldname: doctype, + fieldname: child_fieldname, fieldtype: 'MultiCheck', columns: 2, on_change: () => this.update_primary_action(), - options: this.get_multicheck_options(doctype) + options: this.get_multicheck_options(doctype, child_fieldname) }; }) ], @@ -291,11 +294,9 @@ frappe.data_import.DataExporter = class DataExporter { }, {}); } - get_multicheck_options(doctype) { + get_multicheck_options(doctype, child_fieldname = null) { if (!this.column_map) { - this.column_map = new ColumnPickerFields({ - doctype: this.doctype - }).get_columns_for_picker(); + this.column_map = get_columns_for_picker(this.doctype); } let autoname_field = null; @@ -305,7 +306,11 @@ frappe.data_import.DataExporter = class DataExporter { autoname_field = frappe.meta.get_field(doctype, fieldname); } - return this.column_map[doctype] + let fields = child_fieldname + ? this.column_map[child_fieldname] + : this.column_map[doctype]; + + return fields .filter(df => { if (autoname_field && df.fieldname === autoname_field.fieldname) { return false; @@ -327,3 +332,44 @@ frappe.data_import.DataExporter = class DataExporter { }); } }; + +function get_columns_for_picker(doctype) { + let out = {}; + + const standard_fields_filter = df => + !in_list(frappe.model.no_value_type, df.fieldtype); + + // parent + let doctype_fields = frappe.meta + .get_docfields(doctype) + .filter(standard_fields_filter); + + out[doctype] = [ + { + label: __('ID'), + fieldname: 'name', + fieldtype: 'Data', + reqd: 1 + } + ].concat(doctype_fields); + + // children + const table_fields = frappe.meta.get_table_fields(doctype); + table_fields.forEach(df => { + const cdt = df.options; + const child_table_fields = frappe.meta + .get_docfields(cdt) + .filter(standard_fields_filter); + + out[df.fieldname] = [ + { + label: __('ID'), + fieldname: 'name', + fieldtype: 'Data', + reqd: 1 + } + ].concat(child_table_fields); + }); + + return out; +} From 11ec3442a3d8032ac78e4149c8be8285b321a651 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 28 May 2020 19:24:04 +0530 Subject: [PATCH 015/485] feat: remove writer introduction from bog settings --- .../website/doctype/blog_settings/blog_settings.json | 8 +------- .../doctype/blog_settings/test_blog_settings.py | 10 ++++++++++ 2 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 frappe/website/doctype/blog_settings/test_blog_settings.py diff --git a/frappe/website/doctype/blog_settings/blog_settings.json b/frappe/website/doctype/blog_settings/blog_settings.json index f0e51de170..a05c0ea5f3 100644 --- a/frappe/website/doctype/blog_settings/blog_settings.json +++ b/frappe/website/doctype/blog_settings/blog_settings.json @@ -7,7 +7,6 @@ "field_order": [ "blog_title", "blog_introduction", - "writers_introduction", "section_break_4", "social_share_settings" ], @@ -22,11 +21,6 @@ "fieldtype": "Small Text", "label": "Blog Introduction" }, - { - "fieldname": "writers_introduction", - "fieldtype": "Small Text", - "label": "Writers Introduction" - }, { "collapsible": 1, "fieldname": "section_break_4", @@ -43,7 +37,7 @@ "idx": 1, "issingle": 1, "links": [], - "modified": "2020-05-04 09:10:41.815238", + "modified": "2020-05-28 18:49:08.356608", "modified_by": "Administrator", "module": "Website", "name": "Blog Settings", diff --git a/frappe/website/doctype/blog_settings/test_blog_settings.py b/frappe/website/doctype/blog_settings/test_blog_settings.py new file mode 100644 index 0000000000..e4ddb85c4b --- /dev/null +++ b/frappe/website/doctype/blog_settings/test_blog_settings.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Frappe Technologies and Contributors +# See license.txt +from __future__ import unicode_literals + +# import frappe +import unittest + +class TestBlogSettings(unittest.TestCase): + pass From 892149af99ae4b81e6005b2b25dfbcf0dc4a9209 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 28 May 2020 19:24:31 +0530 Subject: [PATCH 016/485] feat: give precedence to template --- frappe/website/render.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/frappe/website/render.py b/frappe/website/render.py index c1bca3f5c5..f137a28eaa 100644 --- a/frappe/website/render.py +++ b/frappe/website/render.py @@ -214,14 +214,13 @@ def build_page(path): context = get_context(path) - if context.source: - html = frappe.render_template(context.source, context) - - elif context.template: + if context.template: if path.endswith('min.js'): html = frappe.get_jloader().get_source(frappe.get_jenv(), context.template)[0] else: html = frappe.get_template(context.template).render(context) + elif context.source: + html = frappe.render_template(context.source, context) if '{index}' in html: html = html.replace('{index}', get_toc(context.route)) From 8b08a7d71d8418891869411cbaf7be525f35730e Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 28 May 2020 19:25:10 +0530 Subject: [PATCH 017/485] refactor: blogger doctype * remove blog post count * Set image field --- frappe/website/doctype/blog_post/blog_post.py | 11 ++++------- frappe/website/doctype/blogger/blogger.json | 16 ++++------------ 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py index 4596c60710..5516d17780 100644 --- a/frappe/website/doctype/blog_post/blog_post.py +++ b/frappe/website/doctype/blog_post/blog_post.py @@ -39,11 +39,6 @@ class BlogPost(WebsiteGenerator): if self.published and not self.published_on: self.published_on = today() - # update posts - frappe.db.sql("""UPDATE `tabBlogger` SET `posts`=(SELECT COUNT(*) FROM `tabBlog Post` - WHERE IFNULL(`blogger`,'')=`tabBlogger`.`name`) - WHERE `name`=%s""", (self.blogger,)) - self.set_read_time() def on_update(self): @@ -133,8 +128,9 @@ class BlogPost(WebsiteGenerator): def get_list_context(context=None): list_context = frappe._dict( - template = "templates/includes/blog/blog.html", + template = "/templates/includes/blog/blog.html", get_list = get_blog_list, + no_breadcrumbs = True, hide_filters = True, children = get_children(), # show_search = True, @@ -161,7 +157,8 @@ def get_list_context(context=None): else: list_context.parents = [{"name": _("Home"), "route": "/"}] - list_context.update(frappe.get_doc("Blog Settings", "Blog Settings").as_dict(no_default_fields=True)) + list_context.update(frappe.get_doc("Blog Settings").as_dict(no_default_fields=True)) + return list_context def get_children(): diff --git a/frappe/website/doctype/blogger/blogger.json b/frappe/website/doctype/blogger/blogger.json index b8165a5908..f7494e7ec5 100644 --- a/frappe/website/doctype/blogger/blogger.json +++ b/frappe/website/doctype/blogger/blogger.json @@ -13,8 +13,7 @@ "full_name", "user", "bio", - "avatar", - "posts" + "avatar" ], "fields": [ { @@ -51,20 +50,13 @@ }, { "fieldname": "avatar", - "fieldtype": "Attach", + "fieldtype": "Attach Image", "label": "Avatar" - }, - { - "fieldname": "posts", - "fieldtype": "Int", - "in_list_view": 1, - "label": "Posts", - "no_copy": 1, - "read_only": 1 } ], "icon": "fa fa-user", "idx": 1, + "image_field": "avatar", "links": [ { "link_doctype": "Blog Post", @@ -72,7 +64,7 @@ } ], "max_attachments": 1, - "modified": "2020-04-19 08:21:09.684300", + "modified": "2020-05-28 19:22:40.959895", "modified_by": "Administrator", "module": "Website", "name": "Blogger", From ea728d158f630b8f8d3a1a64f9c3d2dd49b994d9 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 28 May 2020 22:07:22 +0530 Subject: [PATCH 018/485] feat: added image extra small option --- frappe/public/scss/website-image.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/frappe/public/scss/website-image.scss b/frappe/public/scss/website-image.scss index 8c32e821fe..d416c05650 100644 --- a/frappe/public/scss/website-image.scss +++ b/frappe/public/scss/website-image.scss @@ -55,6 +55,12 @@ img:after { width: 100%; } +.website-image-extra-small { + @include website-image; + width: 2.5rem; + height: 2.5rem; +} + .website-image-small { @include website-image; width: 5rem; From 5ea0688e40c27473f69743d7a0f1d210ebf7a1ba Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 28 May 2020 22:07:37 +0530 Subject: [PATCH 019/485] feat: added blog.scss --- frappe/public/scss/blog.scss | 48 +++++++++++++++++++++++++++++++++ frappe/public/scss/website.scss | 1 + 2 files changed, 49 insertions(+) create mode 100644 frappe/public/scss/blog.scss diff --git a/frappe/public/scss/blog.scss b/frappe/public/scss/blog.scss new file mode 100644 index 0000000000..86c5b18ceb --- /dev/null +++ b/frappe/public/scss/blog.scss @@ -0,0 +1,48 @@ +.blog-list-item { + @extend .col-12; + + &:not(.featured) { + @extend .col-md-4; + + .blog-list-body { + min-height: 14rem; + } + } + + .blog-list-cover { + @extend .col-12; + } + + .blog-list-body { + @extend .col-12; + @extend .mt-3; + } + + .post-cover-container { + min-height: 12rem; + overflow: hidden; + border-radius: $border-radius; + + img { + min-height: 12rem; + width: 100%; + } + } + + &.featured { + .blog-list-cover { + @extend .col-12; + @extend .col-md-8; + } + + .blog-list-body { + @extend .col-12; + @extend .col-md-4; + @extend .mt-0; + } + + .post-cover-container { + max-height: 22rem; + } + } +} \ No newline at end of file diff --git a/frappe/public/scss/website.scss b/frappe/public/scss/website.scss index 0149ac0d0a..152551c8d1 100644 --- a/frappe/public/scss/website.scss +++ b/frappe/public/scss/website.scss @@ -5,6 +5,7 @@ @import 'multilevel-dropdown'; @import 'website-image'; @import 'page-builder'; +@import 'blog'; @import 'markdown'; @import 'sidebar'; From 78cb3a9c178964bebe0270234b4690fc9b7fb7c7 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 28 May 2020 22:08:08 +0530 Subject: [PATCH 020/485] feat: updated blog listing layout --- frappe/templates/includes/blog/blog.html | 32 ++++++-- frappe/templates/includes/blog/blog_list.html | 25 +++++++ .../blog_post/templates/blog_post_row.html | 73 ++++++++++--------- 3 files changed, 91 insertions(+), 39 deletions(-) create mode 100644 frappe/templates/includes/blog/blog_list.html diff --git a/frappe/templates/includes/blog/blog.html b/frappe/templates/includes/blog/blog.html index 5afaeb6ab8..a841bff627 100644 --- a/frappe/templates/includes/blog/blog.html +++ b/frappe/templates/includes/blog/blog.html @@ -1,15 +1,35 @@ {% extends "templates/web.html" %} - {% block title %}{{ blog_title or _("Blog") }}{% endblock %} -{% block header %}

{{ blog_title or _("Blog") }}

{% endblock %} {% block hero %}{% endblock %} {% block page_content %} - - + +{{ web_blocks([ + { + 'template': "Hero", + 'values': { + 'title': blog_title, + 'subtitle': blog_introduction, + }, + 'add_container': 0, + 'add_top_padding': 0, + 'add_bottom_padding': 0, + 'css_class': "py-5" + } + ]) +}} +
-
- {% include "templates/includes/list/list.html" %} +
+ {% if not result -%} +
+ {{ no_result_message or _("Nothing to show") }} +
+ {% else %} + {% for item in result %} + {{ item }} + {% endfor %} + {% endif %}
{% endblock %} diff --git a/frappe/templates/includes/blog/blog_list.html b/frappe/templates/includes/blog/blog_list.html new file mode 100644 index 0000000000..cfe25f3682 --- /dev/null +++ b/frappe/templates/includes/blog/blog_list.html @@ -0,0 +1,25 @@ +{% if sub_title %} +

{{ sub_title }}

+{% endif %} +{% if not result -%} +
+ {{ no_result_message or _("Nothing to show") }} +
+{% else %} +
+ + {% if result_heading_template %}{% include result_heading_template %}{% endif %} + +
+ {% for item in result %} + {{ item }} + {% endfor %} +
+ +
+{%- endif %} 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 dffe0ef81d..d197494ae5 100644 --- a/frappe/website/doctype/blog_post/templates/blog_post_row.html +++ b/frappe/website/doctype/blog_post/templates/blog_post_row.html @@ -1,38 +1,45 @@ {%- set post = doc -%} -
-
-
-
-
-
-
{{ post.category.title }}
-

{{ post.title }}

-

{{ post.intro }}

-
-
- {{ post.full_name }} - · - {{ frappe.format_date(post.published_on) }} - {% if post.comments %} - · - {% if post.comments == 1 %} - {{ _('1 comment') }} - {% else %} - {{ _('{0} comments').format(post.comments) }} - {% endif %} - {% endif %} - {% if post.read_time %} - · - {{ _('{0} min read').format(post.read_time) }} - {% endif %} -
-
-
- {% if post.cover_image %} - {{post.title}} - Cover Image - {% endif %} + +{%- if post.featured -%} + {% set col_class="featured" %} +{%- else -%} + {% set col_class="" %} +{%- endif -%} + +
+
+ {% if post.cover_image %} +
+ + {{post.title}} - Cover Image + +
+ {% endif %} +
+
+
+
+ {%- if post.featured -%} + {{ _('Featured') }} · + {%- endif -%} + {{ post.category.title }} +
+ {%- if post.featured -%} +

{{ post.title }}

+ {%- else -%} +
{{ post.title }}
+ {%- endif -%} +

{{ post.intro }}

+
+
+ +
+ {{ post.full_name }} +
+ {{ frappe.format_date(post.published_on) }} + {% if post.read_time %} · {{ post.read_time }} min read {% endif %}
-
+
\ No newline at end of file From 5f4cf98ee20f5aac96fb1cbb947469414cefe44d Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 28 May 2020 22:09:19 +0530 Subject: [PATCH 021/485] feat: added featured checkbox and validation --- frappe/website/doctype/blog_post/blog_post.json | 14 +++++++++++--- frappe/website/doctype/blog_post/blog_post.py | 10 ++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/frappe/website/doctype/blog_post/blog_post.json b/frappe/website/doctype/blog_post/blog_post.json index 3d24879c62..3fb18af2cd 100644 --- a/frappe/website/doctype/blog_post/blog_post.json +++ b/frappe/website/doctype/blog_post/blog_post.json @@ -10,12 +10,13 @@ "title", "published_on", "published", - "read_time", + "featured", "disable_comments", "column_break_3", "blog_category", "blogger", "route", + "read_time", "section_break_5", "blog_intro", "content_type", @@ -143,7 +144,8 @@ { "fieldname": "meta_image", "fieldtype": "Attach Image", - "label": "Meta Image" + "label": "Meta Image", + "mandatory_depends_on": "eval:doc.featured" }, { "fieldname": "section_break_20", @@ -167,6 +169,12 @@ "fieldtype": "Int", "label": "Read Time", "read_only": 1 + }, + { + "default": "0", + "fieldname": "featured", + "fieldtype": "Check", + "label": "Featured" } ], "has_web_view": 1, @@ -175,7 +183,7 @@ "is_published_field": "published", "links": [], "max_attachments": 5, - "modified": "2020-04-30 17:32:41.055883", + "modified": "2020-05-28 21:40:26.068480", "modified_by": "Administrator", "module": "Website", "name": "Blog Post", diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py index 5516d17780..0492173ad6 100644 --- a/frappe/website/doctype/blog_post/blog_post.py +++ b/frappe/website/doctype/blog_post/blog_post.py @@ -39,8 +39,18 @@ class BlogPost(WebsiteGenerator): if self.published and not self.published_on: self.published_on = today() + if self.featured: + if not self.meta_image: + frappe.throw(_("A featured post must have a cover image")) + self.reset_featured_for_other_blogs() + self.set_read_time() + def reset_featured_for_other_blogs(self): + all_posts = frappe.get_all("Blog Post", {"featured": 1}) + for post in all_posts: + frappe.db.set_value("Blog Post", post.name, "featured", 0) + def on_update(self): super(BlogPost, self).on_update() clear_cache("writers") From 54cd0191aeee4c68354da79279491b95af8bab4c Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 28 May 2020 22:10:29 +0530 Subject: [PATCH 022/485] feat: update query for new layout --- frappe/website/doctype/blog_post/blog_post.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py index 0492173ad6..efa69c55bd 100644 --- a/frappe/website/doctype/blog_post/blog_post.py +++ b/frappe/website/doctype/blog_post/blog_post.py @@ -208,6 +208,9 @@ def get_blog_list(doctype, txt=None, filters=None, limit_start=0, limit_page_len select t1.title, t1.name, t1.blog_category, t1.route, t1.published_on, t1.read_time, t1.published_on as creation, + t1.read_time as read_time, + t1.featured as featured, + t1.meta_image as cover_image, t1.content as content, t1.content_type as content_type, t1.content_html as content_html, @@ -223,7 +226,7 @@ def get_blog_list(doctype, txt=None, filters=None, limit_start=0, limit_page_len where ifnull(t1.published,0)=1 and t1.blogger = t2.name %(condition)s - order by published_on desc, name asc + order by featured desc, published_on desc, name asc limit %(start)s, %(page_len)s""" % { "start": limit_start, "page_len": limit_page_length, "condition": (" and " + " and ".join(conditions)) if conditions else "" @@ -232,9 +235,9 @@ def get_blog_list(doctype, txt=None, filters=None, limit_start=0, limit_page_len posts = frappe.db.sql(query, as_dict=1) for post in posts: - post.content = get_html_content_based_on_type(post, 'content', post.content_type) - post.cover_image = find_first_image(post.content) + if not post.cover_image: + post.cover_image = find_first_image(post.content) post.published = global_date_format(post.creation) post.content = strip_html_tags(post.content) @@ -247,7 +250,7 @@ def get_blog_list(doctype, txt=None, filters=None, limit_start=0, limit_page_len post.avatar = post.avatar or "" post.category = frappe.db.get_value('Blog Category', post.blog_category, - ['route', 'title'], as_dict=True) + ['name', 'route', 'title'], as_dict=True) if post.avatar and (not "http:" in post.avatar and not "https:" in post.avatar) and not post.avatar.startswith("/"): post.avatar = "/" + post.avatar From 806c2ac0b6c6ec4b0c584e56de14aac49b6aedc7 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 28 May 2020 23:12:23 +0530 Subject: [PATCH 023/485] fix: Move Importer/Exporter to Data Import Beta --- .../exporter_new.py => data_import_beta/exporter.py} | 0 .../doctype/{data_import => data_import_beta}/importer_new.py | 0 .../test_exporter_new.py => data_import_beta/test_exporter.py} | 2 +- .../test_importer_new.py => data_import_beta/test_importer.py} | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename frappe/core/doctype/{data_import/exporter_new.py => data_import_beta/exporter.py} (100%) rename frappe/core/doctype/{data_import => data_import_beta}/importer_new.py (100%) rename frappe/core/doctype/{data_import/test_exporter_new.py => data_import_beta/test_exporter.py} (94%) rename frappe/core/doctype/{data_import/test_importer_new.py => data_import_beta/test_importer.py} (97%) diff --git a/frappe/core/doctype/data_import/exporter_new.py b/frappe/core/doctype/data_import_beta/exporter.py similarity index 100% rename from frappe/core/doctype/data_import/exporter_new.py rename to frappe/core/doctype/data_import_beta/exporter.py diff --git a/frappe/core/doctype/data_import/importer_new.py b/frappe/core/doctype/data_import_beta/importer_new.py similarity index 100% rename from frappe/core/doctype/data_import/importer_new.py rename to frappe/core/doctype/data_import_beta/importer_new.py diff --git a/frappe/core/doctype/data_import/test_exporter_new.py b/frappe/core/doctype/data_import_beta/test_exporter.py similarity index 94% rename from frappe/core/doctype/data_import/test_exporter_new.py rename to frappe/core/doctype/data_import_beta/test_exporter.py index 0d3aedb033..8e63019ecc 100644 --- a/frappe/core/doctype/data_import/test_exporter_new.py +++ b/frappe/core/doctype/data_import_beta/test_exporter.py @@ -5,7 +5,7 @@ from __future__ import unicode_literals import unittest import frappe -from frappe.core.doctype.data_import.exporter_new import Exporter +from frappe.core.doctype.data_import_beta.exporter import Exporter class TestExporter(unittest.TestCase): diff --git a/frappe/core/doctype/data_import/test_importer_new.py b/frappe/core/doctype/data_import_beta/test_importer.py similarity index 97% rename from frappe/core/doctype/data_import/test_importer_new.py rename to frappe/core/doctype/data_import_beta/test_importer.py index d6349daa55..d1db8f84ce 100644 --- a/frappe/core/doctype/data_import/test_importer_new.py +++ b/frappe/core/doctype/data_import_beta/test_importer.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals import datetime import unittest import frappe -from frappe.core.doctype.data_import.importer_new import Importer +from frappe.core.doctype.data_import_beta.importer import Importer content_empty_rows = '''title,start_date,idx,show_title ,,, From 429ff2ef87160c0b3e026aedf6383efa9528f33b Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 28 May 2020 23:16:46 +0530 Subject: [PATCH 024/485] fix: Refactor Data Import - Break Importer into classes ImportFile, Row, Column, Header - Show warnings section before import preview --- frappe/cache_manager.py | 2 +- .../data_import_beta/data_import_beta.css | 3 + .../data_import_beta/data_import_beta.js | 14 +- .../data_import_beta/data_import_beta.json | 80 +- .../data_import_beta/data_import_beta.py | 18 +- .../doctype/data_import_beta/importer_new.py | 1789 +++++++++-------- .../js/frappe/data_import/data_exporter.js | 26 +- .../js/frappe/data_import/import_preview.js | 6 +- frappe/public/less/form.less | 7 +- frappe/utils/data.py | 72 + 10 files changed, 1078 insertions(+), 939 deletions(-) create mode 100644 frappe/core/doctype/data_import_beta/data_import_beta.css diff --git a/frappe/cache_manager.py b/frappe/cache_manager.py index 4560680653..92d12289c6 100644 --- a/frappe/cache_manager.py +++ b/frappe/cache_manager.py @@ -24,7 +24,7 @@ user_cache_keys = ("bootinfo", "user_recent", "roles", "user_doc", "lang", "has_role:Page", "has_role:Report") doctype_cache_keys = ("meta", "form_meta", "table_columns", "last_modified", - "linked_doctypes", 'notifications', 'workflow' ,'energy_point_rule_map') + "linked_doctypes", 'notifications', 'workflow' ,'energy_point_rule_map', 'data_import_column_header_map') def clear_user_cache(user=None): diff --git a/frappe/core/doctype/data_import_beta/data_import_beta.css b/frappe/core/doctype/data_import_beta/data_import_beta.css new file mode 100644 index 0000000000..5206540a33 --- /dev/null +++ b/frappe/core/doctype/data_import_beta/data_import_beta.css @@ -0,0 +1,3 @@ +.warnings .warning { + margin-bottom: 40px; +} diff --git a/frappe/core/doctype/data_import_beta/data_import_beta.js b/frappe/core/doctype/data_import_beta/data_import_beta.js index 72404c74f4..1c648621d8 100644 --- a/frappe/core/doctype/data_import_beta/data_import_beta.js +++ b/frappe/core/doctype/data_import_beta/data_import_beta.js @@ -57,7 +57,7 @@ frappe.ui.form.on('Data Import Beta', { frm.set_query('reference_doctype', () => { return { filters: { - allow_import: 1 + name: ['in', frappe.boot.user.can_import] } }; }); @@ -236,7 +236,7 @@ frappe.ui.form.on('Data Import Beta', { frm .call({ method: 'get_preview_from_template', - args: { data_import: frm.doc.name }, + args: { data_import: frm.doc.name, import_file: frm.doc.import_file }, error_handlers: { TimestampMismatchError() { // ignore this error @@ -331,8 +331,8 @@ frappe.ui.form.on('Data Import Beta', { }) .join(''); return ` -
-
${__('Row {0}', [row_number])}
+
+
${__('Row {0}', [row_number])}
    ${message}
`; @@ -346,8 +346,8 @@ frappe.ui.form.on('Data Import Beta', { header = __('Column {0}', [warning.col]); } return ` -
-
${header}
+
+
${header}
${warning.message}
`; @@ -355,7 +355,7 @@ frappe.ui.form.on('Data Import Beta', { .join(''); frm.get_field('import_warnings').$wrapper.html(`
-
${html}
+
${html}
`); }, diff --git a/frappe/core/doctype/data_import_beta/data_import_beta.json b/frappe/core/doctype/data_import_beta/data_import_beta.json index 777af0a071..8876d2246a 100644 --- a/frappe/core/doctype/data_import_beta/data_import_beta.json +++ b/frappe/core/doctype/data_import_beta/data_import_beta.json @@ -16,11 +16,11 @@ "submit_after_import", "mute_emails", "template_options", - "section_import_preview", - "import_preview", "import_warnings_section", "template_warnings", "import_warnings", + "section_import_preview", + "import_preview", "import_log_section", "import_log", "show_failed_logs", @@ -34,7 +34,9 @@ "label": "Document Type", "options": "DocType", "reqd": 1, - "set_only_once": 1 + "set_only_once": 1, + "show_days": 1, + "show_seconds": 1 }, { "fieldname": "import_type", @@ -43,28 +45,38 @@ "label": "Import Type", "options": "\nInsert New Records\nUpdate Existing Records", "reqd": 1, - "set_only_once": 1 + "set_only_once": 1, + "show_days": 1, + "show_seconds": 1 }, { "depends_on": "eval:!doc.__islocal", "fieldname": "import_file", "fieldtype": "Attach", "in_list_view": 1, - "label": "Import File" + "label": "Import File", + "show_days": 1, + "show_seconds": 1 }, { "fieldname": "import_preview", "fieldtype": "HTML", - "label": "Import Preview" + "label": "Import Preview", + "show_days": 1, + "show_seconds": 1 }, { "fieldname": "section_import_preview", "fieldtype": "Section Break", - "label": "Preview" + "label": "Preview", + "show_days": 1, + "show_seconds": 1 }, { "fieldname": "column_break_5", - "fieldtype": "Column Break" + "fieldtype": "Column Break", + "show_days": 1, + "show_seconds": 1 }, { "fieldname": "template_options", @@ -72,23 +84,31 @@ "hidden": 1, "label": "Template Options", "options": "JSON", - "read_only": 1 + "read_only": 1, + "show_days": 1, + "show_seconds": 1 }, { "fieldname": "import_log", "fieldtype": "Code", "label": "Import Log", - "options": "JSON" + "options": "JSON", + "show_days": 1, + "show_seconds": 1 }, { "fieldname": "import_log_section", "fieldtype": "Section Break", - "label": "Import Log" + "label": "Import Log", + "show_days": 1, + "show_seconds": 1 }, { "fieldname": "import_log_preview", "fieldtype": "HTML", - "label": "Import Log Preview" + "label": "Import Log Preview", + "show_days": 1, + "show_seconds": 1 }, { "default": "Pending", @@ -97,56 +117,72 @@ "hidden": 1, "label": "Status", "options": "Pending\nSuccess\nPartial Success\nError", - "read_only": 1 + "read_only": 1, + "show_days": 1, + "show_seconds": 1 }, { "fieldname": "template_warnings", "fieldtype": "Code", "hidden": 1, "label": "Template Warnings", - "options": "JSON" + "options": "JSON", + "show_days": 1, + "show_seconds": 1 }, { "default": "0", "fieldname": "submit_after_import", "fieldtype": "Check", "label": "Submit After Import", - "set_only_once": 1 + "set_only_once": 1, + "show_days": 1, + "show_seconds": 1 }, { "fieldname": "import_warnings_section", "fieldtype": "Section Break", - "label": "Warnings" + "label": "Warnings", + "show_days": 1, + "show_seconds": 1 }, { "fieldname": "import_warnings", "fieldtype": "HTML", - "label": "Import Warnings" + "label": "Import Warnings", + "show_days": 1, + "show_seconds": 1 }, { "depends_on": "reference_doctype", "fieldname": "download_template", "fieldtype": "Button", - "label": "Download Template" + "label": "Download Template", + "show_days": 1, + "show_seconds": 1 }, { "default": "1", "fieldname": "mute_emails", "fieldtype": "Check", "label": "Don't Send Emails", - "set_only_once": 1 + "set_only_once": 1, + "show_days": 1, + "show_seconds": 1 }, { "default": "0", "fieldname": "show_failed_logs", "fieldtype": "Check", - "label": "Show Failed Logs" + "label": "Show Failed Logs", + "show_days": 1, + "show_seconds": 1 } ], "hide_toolbar": 1, "links": [], - "modified": "2020-02-17 15:35:04.386098", - "modified_by": "faris@erpnext.com", + "modified": "2020-05-28 22:11:38.266208", + "modified_by": "Administrator", "module": "Core", "name": "Data Import Beta", "owner": "Administrator", diff --git a/frappe/core/doctype/data_import_beta/data_import_beta.py b/frappe/core/doctype/data_import_beta/data_import_beta.py index 8f12bd20ed..23e0681011 100644 --- a/frappe/core/doctype/data_import_beta/data_import_beta.py +++ b/frappe/core/doctype/data_import_beta/data_import_beta.py @@ -5,8 +5,9 @@ from __future__ import unicode_literals import frappe from frappe.model.document import Document -from frappe.core.doctype.data_import.importer_new import Importer -from frappe.core.doctype.data_import.exporter_new import Exporter + +from frappe.core.doctype.data_import_beta.importer import Importer +from frappe.core.doctype.data_import_beta.exporter import Exporter from frappe.core.page.background_jobs.background_jobs import get_info from frappe.utils.background_jobs import enqueue from frappe import _ @@ -25,7 +26,10 @@ class DataImportBeta(Document): # validate template self.get_importer() - def get_preview_from_template(self): + def get_preview_from_template(self, import_file=None): + if import_file: + self.import_file = import_file + if not self.import_file: return @@ -62,8 +66,8 @@ class DataImportBeta(Document): @frappe.whitelist() -def get_preview_from_template(data_import): - return frappe.get_doc("Data Import Beta", data_import).get_preview_from_template() +def get_preview_from_template(data_import, import_file): + return frappe.get_doc("Data Import Beta", data_import).get_preview_from_template(import_file) @frappe.whitelist() @@ -81,8 +85,8 @@ def start_import(data_import): frappe.db.rollback() data_import.db_set("status", "Error") frappe.log_error(title=data_import.name) - frappe.db.commit() - frappe.publish_realtime("data_import_refresh", {"data_import": data_import.name}) + + frappe.publish_realtime("data_import_refresh", {"data_import": data_import.name}) @frappe.whitelist() diff --git a/frappe/core/doctype/data_import_beta/importer_new.py b/frappe/core/doctype/data_import_beta/importer_new.py index cbb2ee482b..02721fb93f 100644 --- a/frappe/core/doctype/data_import_beta/importer_new.py +++ b/frappe/core/doctype/data_import_beta/importer_new.py @@ -1,12 +1,12 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors +# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors # MIT License. See license.txt -import io +from __future__ import unicode_literals import os -import json -import timeit +import io import frappe +import timeit +import json from datetime import datetime from frappe import _ from frappe.utils import cint, flt, update_progress_bar, cstr, DATETIME_FORMAT @@ -15,65 +15,406 @@ from frappe.utils.xlsxutils import ( read_xlsx_file_from_attached_file, read_xls_file_from_attached_file, ) -from frappe.model import no_value_fields, table_fields +from frappe.model import no_value_fields, table_fields as table_fieldtypes -INVALID_VALUES = ["", None] +INVALID_VALUES = ("", None) MAX_ROWS_IN_PREVIEW = 10 INSERT = "Insert New Records" UPDATE = "Update Existing Records" -# pylint: disable=R0201 + class Importer: - def __init__( - self, doctype, data_import=None, file_path=None, content=None, console=False - ): + def __init__(self, doctype, data_import=None, import_type=None, console=False): self.doctype = doctype - self.template_options = frappe._dict({"remap_column": {}}) self.console = console - if data_import: - self.data_import = data_import - if self.data_import.template_options: - template_options = frappe.parse_json(self.data_import.template_options) - self.template_options.update(template_options) - self.import_type = self.data_import.import_type + self.data_import = data_import + if not self.data_import: + self.data_import = frappe.get_doc(doctype="Data Import Beta") + if import_type: + self.data_import.import_type = import_type + + self.template_options = frappe.parse_json(self.data_import.template_options or "{}") + self.import_type = self.data_import.import_type + + self.import_file = ImportFile( + doctype, data_import.import_file, self.template_options, self.import_type + ) + + def get_data_for_import_preview(self): + return self.import_file.get_data_for_import_preview() + + def before_import(self): + # set user lang for translations + frappe.cache().hdel("lang", frappe.session.user) + frappe.set_user_lang(frappe.session.user) + + # set flags + frappe.flags.in_import = True + frappe.flags.mute_emails = self.data_import.mute_emails + + self.data_import.db_set("template_warnings", "") + + def import_data(self): + self.before_import() + + # parse docs from rows + payloads = self.import_file.get_payloads_for_import() + + # dont import if there are non-ignorable warnings + warnings = self.import_file.get_warnings() + warnings = [w for w in warnings if w.get("type") != "info"] + + print(warnings) + + if warnings: + if self.console: + self.print_grouped_warnings(warnings) + else: + self.data_import.db_set("template_warnings", json.dumps(warnings)) + return + + # setup import log + if self.data_import.import_log: + import_log = frappe.parse_json(self.data_import.import_log) else: - self.data_import = None + import_log = [] - self.import_type = self.import_type or INSERT + # remove previous failures from import log + import_log = [l for l in import_log if l.get("success") == True] - self.header_row = None - self.data = None - # used to store date formats guessed from data rows per column - self._guessed_date_formats = {} - # used to store eta during import - self.last_eta = 0 - # used to collect warnings during template parsing - # and show them to user - self.warnings = [] - self.meta = frappe.get_meta(doctype) - self.prepare_content(file_path, content) + # get successfully imported rows + imported_rows = [] + for log in import_log: + log = frappe._dict(log) + if log.success: + imported_rows += log.row_indexes + + # start import + total_payload_count = len(payloads) + batch_size = frappe.conf.data_import_batch_size or 1000 + + for batch_index, batched_payloads in enumerate( + frappe.utils.create_batch(payloads, batch_size) + ): + for i, payload in enumerate(batched_payloads): + doc = payload.doc + row_indexes = [row.row_number for row in payload.rows] + current_index = (i + 1) + (batch_index * batch_size) + + if set(row_indexes).intersection(set(imported_rows)): + print("Skipping imported rows", row_indexes) + if total_payload_count > 5: + frappe.publish_realtime( + "data_import_progress", + { + "current": current_index, + "total": total_payload_count, + "skipping": True, + "data_import": self.data_import.name, + }, + ) + continue + + try: + start = timeit.default_timer() + doc = self.process_doc(doc) + processing_time = timeit.default_timer() - start + eta = self.get_eta(current_index, total_payload_count, processing_time) + + if self.console: + update_progress_bar( + "Importing {0} records".format(total_payload_count), + current_index, + total_payload_count, + ) + elif total_payload_count > 5: + frappe.publish_realtime( + "data_import_progress", + { + "current": current_index, + "total": total_payload_count, + "docname": doc.name, + "data_import": self.data_import.name, + "success": True, + "row_indexes": row_indexes, + "eta": eta, + }, + ) + + import_log.append( + frappe._dict(success=True, docname=doc.name, row_indexes=row_indexes) + ) + # commit after every successful import + frappe.db.commit() + + except Exception: + import_log.append( + frappe._dict( + success=False, + exception=frappe.get_traceback(), + messages=frappe.local.message_log, + row_indexes=row_indexes, + ) + ) + frappe.clear_messages() + # rollback if exception + frappe.db.rollback() + + # set status + failures = [l for l in import_log if l.get("success") == False] + if len(failures) == total_payload_count: + status = "Pending" + elif len(failures) > 0: + status = "Partial Success" + else: + status = "Success" + + if self.console: + self.print_import_log(import_log) + else: + self.data_import.db_set("status", status) + self.data_import.db_set("import_log", json.dumps(import_log)) + + self.after_import() + + return import_log + + def after_import(self): + frappe.flags.in_import = False + frappe.flags.mute_emails = False + + def process_doc(self, doc): + if self.import_type == INSERT: + return self.insert_record(doc) + elif self.import_type == UPDATE: + return self.update_record(doc) + + def insert_record(self, doc): + meta = frappe.get_meta(self.doctype) + new_doc = frappe.new_doc(self.doctype) + new_doc.update(doc) + + if (meta.autoname or "").lower() != "prompt": + # name can only be set directly if autoname is prompt + new_doc.set("name", None) + + new_doc.flags.updater_reference = { + "doctype": self.data_import.doctype, + "docname": self.data_import.name, + "label": _("via Data Import"), + } + + new_doc.insert() + if meta.is_submittable and self.data_import.submit_after_import: + new_doc.submit() + return new_doc + + def update_record(self, doc): + existing_doc = frappe.get_doc(self.doctype, doc["name"]) + existing_doc.flags.updater_reference = { + "doctype": self.data_import.doctype, + "docname": self.data_import.name, + "label": _("via Data Import"), + } + existing_doc.update(doc) + existing_doc.save() + return existing_doc + + def get_eta(self, current, total, processing_time): + self.last_eta = getattr(self, "last_eta", 0) + remaining = total - current + eta = processing_time * remaining + if not self.last_eta or eta < self.last_eta: + self.last_eta = eta + return self.last_eta + + +class ImportFile: + def __init__(self, doctype, file, template_options=None, import_type=None): + self.doctype = doctype + self.template_options = template_options or frappe._dict( + column_to_field_map=frappe._dict() + ) + self.column_to_field_map = self.template_options.column_to_field_map + self.import_type = import_type + + self.file_doc = self.file_path = None + if isinstance(file, frappe.model.document.Document) and file.doctype == "File": + self.file_doc = file + elif isinstance(file, frappe.string_types): + if frappe.db.exists("File", {"file_url": file}): + self.file_doc = frappe.get_doc("File", {"file_url": file}) + elif os.path.exists(file): + self.file_path = file + + if not self.file_doc and not self.file_path: + frappe.throw(_("Invalid template file for import")) + + self.raw_data = self.get_data_from_template_file() self.parse_data_from_template() - def prepare_content(self, file_path, content): + def get_data_from_template_file(self): + content = None extension = None - if self.data_import and self.data_import.import_file: - file_doc = frappe.get_doc("File", {"file_url": self.data_import.import_file}) - parts = file_doc.get_extension() + + if self.file_doc: + parts = self.file_doc.get_extension() extension = parts[1] - content = file_doc.get_content() + content = self.file_doc.get_content() extension = extension.lstrip(".") - if file_path: - content, extension = self.read_file(file_path) + elif self.file_path: + content, extension = self.read_file(self.file_path) + + if not content: + frappe.throw(_("Invalid or corrupted content for import")) if not extension: extension = "csv" if content: - self.read_content(content, extension) + return self.read_content(content, extension) - self.validate_template_content() + def parse_data_from_template(self): + header = None + data = [] + + for i, row in enumerate(self.raw_data): + if all(v in INVALID_VALUES for v in row): + # empty row + continue + + if not header: + header = Header(i, row, self.doctype, self.raw_data, self.column_to_field_map) + else: + row_obj = Row(i, row, self.doctype, header, self.import_type) + data.append(row_obj) + + self.header = header + self.columns = self.header.columns + self.data = data + + if len(data) <= 1: + frappe.throw( + _("Import template should contain a Header and atleast one row."), + title=_("Template Error"), + ) + + def get_data_for_import_preview(self): + """Adds a serial number column as the first column""" + + columns = [frappe._dict({"header_title": "Sr. No", "skip_import": True})] + columns += [col.as_dict() for col in self.columns] + data = [[row.row_number] + row.as_list() for row in self.data] + + warnings = self.get_warnings() + + out = frappe._dict() + out.data = data + out.columns = columns + out.warnings = warnings + total_number_of_rows = len(out.data) + if total_number_of_rows > MAX_ROWS_IN_PREVIEW: + out.data = out.data[:MAX_ROWS_IN_PREVIEW] + out.max_rows_exceeded = True + out.max_rows_in_preview = MAX_ROWS_IN_PREVIEW + out.total_number_of_rows = total_number_of_rows + return out + + def get_payloads_for_import(self): + payloads = [] + # make a copy + data = list(self.data) + while data: + doc, rows, data = self.parse_next_row_for_import(data) + payloads.append(frappe._dict(doc=doc, rows=rows)) + return payloads + + def parse_next_row_for_import(self, data): + """ + Parses rows that make up a doc. A doc maybe built from a single row or multiple rows. + Returns the doc, rows, and data without the rows. + """ + doctypes = self.header.doctypes + + # first row is included by default + first_row = data[0] + rows = [first_row] + + # if there are child doctypes, find the subsequent rows + if len(doctypes) > 1: + # subsequent rows either dont have any parent value set + # or have the same value as the parent row + # we include a row if either of conditions match + parent_column_indexes = self.header.get_column_indexes(self.doctype) + parent_row_values = first_row.get_values(parent_column_indexes) + + data_without_first_row = data[1:] + for row in data_without_first_row: + row_values = row.get_values(parent_column_indexes) + # if the row is blank, it's a child row doc + if all([v in INVALID_VALUES for v in row_values]): + rows.append(row) + continue + # if the row has same values as parent row, it's a child row doc + if row_values == parent_row_values: + rows.append(row) + continue + # if any of those conditions dont match, it's the next doc + break + + parsed_docs = {} + parent_doc = None + for row in rows: + for doctype, table_df in doctypes: + if doctype == self.doctype and not parent_doc: + parent_doc = row.parse_doc(doctype) + + if doctype != self.doctype and table_df: + child_doc = row.parse_doc(doctype, parent_doc, table_df) + parent_doc[table_df.fieldname] = parent_doc.get(table_df.fieldname, []) + parent_doc[table_df.fieldname].append(child_doc) + + doc = parent_doc + # check if there is atleast one row for mandatory table fields + meta = frappe.get_meta(self.doctype) + mandatory_table_fields = [ + df + for df in meta.fields + if df.fieldtype in table_fieldtypes + and df.reqd + and len(doc.get(df.fieldname, [])) == 0 + ] + if len(mandatory_table_fields) == 1: + self.warnings.append( + { + "row": first_row.row_number, + "message": _("There should be atleast one row for {0} table").format( + mandatory_table_fields[0].label + ), + } + ) + elif mandatory_table_fields: + fields_string = ", ".join([df.label for df in mandatory_table_fields]) + message = _("There should be atleast one row for the following tables: {0}").format( + fields_string + ) + self.warnings.append({"row": first_row.row_number, "message": message}) + + return doc, rows, data[len(rows) :] + + def get_warnings(self): + warnings = [] + for col in self.header.columns: + warnings += col.warnings + + for row in self.data: + warnings += row.warnings + + return warnings + + ###### def read_file(self, file_path): extn = file_path.split(".")[1] @@ -98,18 +439,10 @@ class Importer: elif extension == "xls": data = read_xls_file_from_attached_file(content) - data = self.remove_empty_rows_and_columns(data) - - if len(data) <= 1: - frappe.throw( - _("Import template should contain a Header and atleast one row."), title=error_title - ) - - self.header_row = data[0] - self.data = data[1:] + return data def validate_template_content(self): - column_count = len(self.header_row) + column_count = len(self.columns) if any([len(row) != column_count and len(row) != 0 for row in self.data]): frappe.throw( _("Number of columns does not match with data"), title=_("Invalid Template") @@ -151,45 +484,324 @@ class Importer: return data_without_empty_rows_and_columns - def get_data_for_import_preview(self): - out = frappe._dict() - out.data = list(self.rows) - out.columns = self.columns - out.warnings = self.warnings - total_number_of_rows = len(out.data) - if total_number_of_rows > MAX_ROWS_IN_PREVIEW: - out.data = out.data[:MAX_ROWS_IN_PREVIEW] - out.max_rows_exceeded = True - out.max_rows_in_preview = MAX_ROWS_IN_PREVIEW - out.total_number_of_rows = total_number_of_rows - return out - def parse_data_from_template(self): - columns = self.parse_columns_from_header_row() - columns = self.detect_date_formats(columns) - columns, data = self.add_serial_no_column(columns, self.data) +class Row: + link_values_exist_map = {} - self.columns = columns - self.rows = data + def __init__(self, index, row, doctype, header, import_type): + self.index = index + self.row_number = index + 1 + self.doctype = doctype + self.data = row + self.header = header + self.import_type = import_type + self.warnings = [] - def parse_columns_from_header_row(self): - remap_column = self.template_options.remap_column - columns = [] - seen = [] + len_row = len(self.data) + len_columns = len(self.header.columns) + if len_row != len_columns: + less_than_columns = len_row < len_columns + message = ( + "Row has less values than columns" + if less_than_columns + else "Row has more values than columns" + ) + self.warnings.append( + {"row": self.row_number, "message": message,} + ) - df_by_labels_and_fieldnames = self.build_fields_dict_for_column_matching() + def parse_doc(self, doctype, parent_doc=None, table_df=None): + col_indexes = self.header.get_column_indexes(doctype, table_df) + values = self.get_values(col_indexes) + columns = self.header.get_columns(col_indexes) + doc = self._parse_doc(doctype, columns, values, parent_doc, table_df) + return doc - for i, header_title in enumerate(self.header_row): - header_row_index = str(i) - column_number = str(i + 1) - skip_import = False - fieldname = remap_column.get(header_row_index) + def _parse_doc(self, doctype, columns, values, parent_doc=None, table_df=None): + doc = frappe._dict() + if self.import_type == INSERT: + # new_doc returns a dict with default values set + doc = frappe.new_doc( + doctype, + parent_doc=parent_doc, + parentfield=table_df.fieldname if table_df else None, + as_dict=True, + ) - if fieldname and fieldname != "Don't Import": - df = df_by_labels_and_fieldnames.get(fieldname) + # remove standard fields and __islocal + for key in frappe.model.default_fields + ("__islocal",): + doc.pop(key, None) + + for col, value in zip(columns, values): + df = col.df + if value in INVALID_VALUES: + value = None + + if value is not None: + value = self.validate_value(value, col) + + if value is not None: + doc[df.fieldname] = self.parse_value(value, col) + + is_table = frappe.get_meta(doctype).istable + is_update = self.import_type == UPDATE + if is_table and is_update and doc.get("name") in INVALID_VALUES: + # for table rows being inserted in update + # create a new doc with defaults set + new_doc = frappe.new_doc(doctype, as_dict=True) + new_doc.update(doc) + doc = new_doc + + self.check_mandatory_fields(doctype, doc) + return doc + + def validate_value(self, value, col): + df = col.df + if df.fieldtype == "Select": + select_options = df.get_select_options() + if select_options and value not in select_options: + options_string = ", ".join([frappe.bold(d) for d in select_options]) + msg = _("Value must be one of {0}").format(options_string) + self.warnings.append( + { + "row": self.row_number, + "field": df.as_dict(convert_dates_to_str=True), + "message": msg, + } + ) + return + + elif df.fieldtype == "Link": + exists = self.link_exists(value, df) + if not exists: + msg = _("Value {0} missing for {1}").format( + frappe.bold(value), frappe.bold(df.options) + ) + self.warnings.append( + { + "row": self.row_number, + "field": df.as_dict(convert_dates_to_str=True), + "message": msg, + } + ) + return + elif df.fieldtype in ["Date", "Datetime"]: + value = self.get_date(value, col) + if isinstance(value, frappe.string_types): + # value was not parsed as datetime object + self.warnings.append( + { + "row": self.row_number, + "col": col.column_number, + "field": df.as_dict(convert_dates_to_str=True), + "message": _("Value {0} must in {1} format").format( + frappe.bold(value), frappe.bold(get_user_format(col.date_format)) + ), + } + ) + return + + return value + + def link_exists(self, value, df): + key = df.options + "::" + value + if Row.link_values_exist_map.get(key) is None: + Row.link_values_exist_map[key] = frappe.db.exists(df.options, value) + return Row.link_values_exist_map.get(key) + + def parse_value(self, value, col): + df = col.df + if isinstance(value, datetime) and df.fieldtype in ["Date", "Datetime"]: + return value + + value = cstr(value) + + # convert boolean values to 0 or 1 + valid_check_values = ["t", "f", "true", "false", "yes", "no", "y", "n"] + if df.fieldtype == "Check" and value.lower().strip() in valid_check_values: + value = value.lower().strip() + value = 1 if value in ["t", "true", "y", "yes"] else 0 + + if df.fieldtype in ["Int", "Check"]: + value = cint(value) + elif df.fieldtype in ["Float", "Percent", "Currency"]: + value = flt(value) + elif df.fieldtype in ["Date", "Datetime"]: + value = self.get_date(value, col) + + return value + + def get_date(self, value, column): + date_format = column.date_format + if date_format: + try: + return datetime.strptime(value, date_format) + except ValueError: + # ignore date values that dont match the format + # import will break for these values later + pass + return value + + def check_mandatory_fields(self, doctype, doc): + """If import type is Insert: + Check for mandatory fields (except table fields) in doc + if import type is Update: + Check for name field or autoname field in doc + """ + meta = frappe.get_meta(doctype) + if self.import_type == UPDATE: + if meta.istable: + # when updating records with table rows, + # there are two scenarios: + # 1. if row 'name' is provided in the template + # the table row will be updated + # 2. if row 'name' is not provided + # then a new row will be added + # so we dont need to check for mandatory + return + + id_field = self.get_id_field(doctype) + if doc.get(id_field.fieldname) in INVALID_VALUES: + self.warnings.append( + { + "row": self.row_number, + "message": _("{0} is a mandatory field").format(id_field.label), + } + ) + return + + fields = [ + df + for df in meta.fields + if df.fieldtype not in table_fieldtypes + and df.reqd + and doc.get(df.fieldname) in INVALID_VALUES + ] + + if not fields: + return + + if len(fields) == 1: + self.warnings.append( + { + "row": self.row_number, + "message": _("{0} is a mandatory field").format(fields[0].label), + } + ) + else: + fields_string = ", ".join([df.label for df in fields]) + self.warnings.append( + { + "row": self.row_number, + "message": _("{0} are mandatory fields").format(fields_string), + } + ) + + def get_id_field(self, doctype): + autoname_field = self.get_autoname_field(doctype) + if autoname_field: + return autoname_field + return frappe._dict({"label": "ID", "fieldname": "name", "fieldtype": "Data"}) + + def get_autoname_field(self, doctype): + meta = frappe.get_meta(doctype) + if meta.autoname and meta.autoname.startswith("field:"): + fieldname = meta.autoname[len("field:") :] + return meta.get_field(fieldname) + + def get_values(self, indexes): + return [self.data[i] for i in indexes] + + def get(self, index): + return self.data[index] + + def as_list(self): + return self.data + + +class Header(Row): + def __init__(self, index, row, doctype, raw_data, column_to_field_map): + self.index = index + self.row_number = index + 1 + self.data = row + self.doctype = doctype + + self.seen = [] + self.columns = [] + + for j, header in enumerate(row): + column_values = [get_item_at_index(r, j) for r in raw_data] + column = Column( + j, header, self.doctype, column_values, column_to_field_map.get(header), self.seen + ) + self.seen.append(header) + self.columns.append(column) + + doctypes = [] + for col in self.columns: + if not col.df: + continue + if col.df.parent == self.doctype: + doctypes.append((col.df.parent, None)) + else: + doctypes.append((col.df.parent, col.df.child_table_df)) + + self.doctypes = sorted( + list(set(doctypes)), key=lambda x: -1 if x[0] == self.doctype else 1 + ) + + def get_column_indexes(self, doctype, tablefield=None): + return [ + col.index + for col in self.columns + if not col.skip_import and col.df and col.df.parent == doctype + ] + + def get_columns(self, indexes): + return [self.columns[i] for i in indexes] + + def get_docfields(self, indexes): + return [col.df for col in self.get_columns(indexes)] + + +class Column: + seen = [] + fields_column_map = {} + + def __init__(self, index, header, doctype, column_values, map_to_field=None, seen=[]): + self.index = index + self.column_number = index + 1 + self.doctype = doctype + self.header_title = header + self.column_values = column_values + self.map_to_field = map_to_field + self.seen = seen + + self.date_format = None + self.df = None + self.skip_import = None + self.warnings = [] + + self.meta = frappe.get_meta(doctype) + self.parse() + self.parse_date_format() + + def parse(self): + # df_by_labels_and_fieldnames = Column.build_fields_dict_for_column_matching( + # self.doctype + # ) + + header_title = self.header_title + header_row_index = str(self.index) + column_number = str(self.column_number) + skip_import = False + + if self.map_to_field and self.map_to_field != "Don't Import": + df = get_df_for_column_header(self.doctype, self.map_to_field) + # df = df_by_labels_and_fieldnames.get(self.map_to_field) + if df: self.warnings.append( { - "col": column_number, "message": _("Mapping column {0} to field {1}").format( frappe.bold(header_title or "Untitled Column"), frappe.bold(df.label) ), @@ -197,138 +809,129 @@ class Importer: } ) else: - df = df_by_labels_and_fieldnames.get(header_title) - - if not df: - skip_import = True - else: - skip_import = False - - if header_title in seen: self.warnings.append( { - "col": column_number, - "message": _("Skipping Duplicate Column {0}").format(frappe.bold(header_title)), - "type": "info", - } - ) - df = None - skip_import = True - elif fieldname == "Don't Import": - skip_import = True - self.warnings.append( - { - "col": column_number, - "message": _("Skipping column {0}").format(frappe.bold(header_title)), - "type": "info", - } - ) - elif header_title and not df: - self.warnings.append( - { - "col": column_number, - "message": _("Cannot match column {0} with any field").format( - frappe.bold(header_title) + "message": _("Could not map column {0} to field {1}").format( + column_number, self.map_to_field ), "type": "info", } ) - elif not header_title and not df: - self.warnings.append( - {"col": column_number, "message": _("Skipping Untitled Column"), "type": "info"} - ) + else: + df = get_df_for_column_header(self.doctype, header_title) + # df = df_by_labels_and_fieldnames.get(header_title) - columns.append( - frappe._dict( - df=df, - skip_import=skip_import, - header_title=header_title, - column_number=column_number, - index=i, - ) - ) - seen.append(header_title) + if not df: + skip_import = True + else: + skip_import = False - return columns - - def build_fields_dict_for_column_matching(self): - """ - Build a dict with various keys to match with column headers and value as docfield - The keys can be label or fieldname - { - 'Customer': df1, - 'customer': df1, - 'Due Date': df2, - 'due_date': df2, - 'Item Code (Sales Invoice Item)': df3, - 'Sales Invoice Item:item_code': df3, - } - """ - out = {} - - table_doctypes = [df.options for df in self.meta.get_table_fields()] - doctypes = table_doctypes + [self.doctype] - for doctype in doctypes: - # name field - name_key = "ID" if self.doctype == doctype else "ID ({})".format(doctype) - name_df = frappe._dict( + if header_title in self.seen: + self.warnings.append( { - "fieldtype": "Data", - "fieldname": "name", - "label": "ID", - "reqd": self.import_type == UPDATE, - "parent": doctype, + "col": column_number, + "message": _("Skipping Duplicate Column {0}").format(frappe.bold(header_title)), + "type": "info", } ) - out[name_key] = name_df - out["name"] = name_df + df = None + skip_import = True + elif self.map_to_field == "Don't Import": + skip_import = True + self.warnings.append( + { + "col": column_number, + "message": _("Skipping column {0}").format(frappe.bold(header_title)), + "type": "info", + } + ) + elif header_title and not df: + self.warnings.append( + { + "col": column_number, + "message": _("Cannot match column {0} with any field").format( + frappe.bold(header_title) + ), + "type": "info", + } + ) + elif not header_title and not df: + self.warnings.append( + {"col": column_number, "message": _("Skipping Untitled Column"), "type": "info"} + ) - # other fields - meta = frappe.get_meta(doctype) - fields = self.get_standard_fields(doctype) + meta.fields - for df in fields: - fieldtype = df.fieldtype or "Data" - parent = df.parent or self.doctype - if fieldtype not in no_value_fields: - if self.doctype == doctype: - # for parent doctypes keys will be - # Label - # label - # Label (label) - if not out.get(df.label): - # if Label is already set, don't set it again - # in case of duplicate column headers - out[df.label] = df - out[df.fieldname] = df - label_with_fieldname = "{0} ({1})".format(df.label, df.fieldname) - out[label_with_fieldname] = df - else: - # for child doctypes keys will be - # Label (Child DocType) - # Child DocType:label - # Label (label) (Child DocType) - label = "{0} ({1})".format(df.label, parent) - fieldname = "{0}:{1}".format(doctype, df.fieldname) - label_with_fieldname = "{0} ({1}) ({2})".format(df.label, df.fieldname, parent) - if not out.get(label): - # if Label is already set, don't set it again - # in case of duplicate column headers - out[label] = df - out[fieldname] = df - out[label_with_fieldname] = df + self.df = df + self.skip_import = skip_import - # if autoname is based on field - # add an entry for "ID (Autoname Field)" - autoname_field = self.get_autoname_field(self.doctype) - if autoname_field: - out["ID ({})".format(autoname_field.label)] = autoname_field - # ID field should also map to the autoname field - out["ID"] = autoname_field - out["name"] = autoname_field + def parse_date_format(self): + if self.df and self.df.fieldtype in ("Date", "Time", "Datetime"): + self.date_format = self.guess_date_format_for_column() - return out + def guess_date_format_for_column(self): + """ Guesses date format for a column by parsing the first 100 values in the column, + getting the date format and then returning the one which has the maximum frequency + """ + PARSE_ROW_COUNT = 100 - def get_standard_fields(self, doctype): + date_formats = [ + frappe.utils.guess_date_format(d) for d in self.column_values if isinstance(d, str) + ] + date_formats = [d for d in date_formats if d] + if not date_formats: + return + + unique_date_formats = set(date_formats) + print(unique_date_formats) + max_occurred_date_format = max(unique_date_formats, key=date_formats.count) + + # fmt: off + message = _("The column {0} has {1} different date formats. Automatically setting {2} as the default format as it is the most common. Please change other values in this column to this format.") + # fmt: on + user_date_format = get_user_format(max_occurred_date_format) + self.warnings.append( + { + "col": self.column_number, + "message": message.format( + frappe.bold(self.header_title), + len(unique_date_formats), + frappe.bold(user_date_format), + ), + "type": "info", + } + ) + + return max_occurred_date_format + + def as_dict(self): + d = frappe._dict() + d.index = self.index + d.column_number = self.column_number + d.doctype = self.doctype + d.header_title = self.header_title + d.column_values = self.column_values + d.map_to_field = self.map_to_field + d.date_format = self.date_format + d.df = self.df + d.skip_import = self.skip_import + d.warnings = self.warnings + return d + + +def build_fields_dict_for_column_matching(parent_doctype): + """ + Build a dict with various keys to match with column headers and value as docfield + The keys can be label or fieldname + { + 'Customer': df1, + 'customer': df1, + 'Due Date': df2, + 'due_date': df2, + 'Item Code (Sales Invoice Item)': df3, + 'Sales Invoice Item:item_code': df3, + } + """ + + def get_standard_fields(doctype): meta = frappe.get_meta(doctype) if meta.istable: standard_fields = [ @@ -350,714 +953,124 @@ class Importer: out.append(df) return out - def detect_date_formats(self, columns): - for col in columns: - if col.df and col.df.fieldtype in ["Date", "Time", "Datetime"]: - col.date_format = self.guess_date_format_for_column(col, columns) - return columns + parent_meta = frappe.get_meta(parent_doctype) + out = {} - def add_serial_no_column(self, columns, data): - columns_with_serial_no = [ - frappe._dict({"header_title": "Sr. No", "skip_import": True}) - ] + columns + # doctypes and fieldname if it is a child doctype + doctypes = [[parent_doctype, None]] + [ + [df.options, df] for df in parent_meta.get_table_fields() + ] - # update index for each column - for i, col in enumerate(columns_with_serial_no): - col.index = i + for doctype, table_df in doctypes: + # name field + name_by_label = ( + "ID" if doctype == parent_doctype else "ID ({0})".format(table_df.label) + ) + name_by_fieldname = ( + "name" if doctype == parent_doctype else "{0}.name".format(table_df.fieldname) + ) + name_df = frappe._dict( + { + "fieldtype": "Data", + "fieldname": "name", + "label": "ID", + "reqd": 1, # self.import_type == UPDATE, + "parent": doctype, + } + ) - data_with_serial_no = [] - for i, row in enumerate(data): - data_with_serial_no.append([self.row_index_map[i] + 1] + row) + if doctype != parent_doctype: + name_df.is_child_table_field = True + name_df.child_table_df = table_df - return columns_with_serial_no, data_with_serial_no + out[name_by_label] = name_df + out[name_by_fieldname] = name_df - def parse_value(self, value, df): - if isinstance(value, datetime) and df.fieldtype in ["Date", "Datetime"]: - return value - - value = cstr(value) - - # convert boolean values to 0 or 1 - valid_check_values = ["t", "f", "true", "false", "yes", "no", "y", "n"] - if df.fieldtype == "Check" and value.lower().strip() in valid_check_values: - value = value.lower().strip() - value = 1 if value in ["t", "true", "y", "yes"] else 0 - - if df.fieldtype in ["Int", "Check"]: - value = cint(value) - elif df.fieldtype in ["Float", "Percent", "Currency"]: - value = flt(value) - elif df.fieldtype in ["Date", "Datetime"]: - value = self.parse_date_format(value, df) - - return value - - def parse_date_format(self, value, df): - date_format = self.get_date_format_for_df(df) or DATETIME_FORMAT - try: - return datetime.strptime(value, date_format) - except ValueError: - # ignore date values that dont match the format - # import will break for these values later - pass - return value - - def get_date_format_for_df(self, df): - return self._guessed_date_formats.get(df.parent + df.fieldname) - - def guess_date_format_for_column(self, column, columns): - """ Guesses date format for a column by parsing the first 10 values in the column, - getting the date format and then returning the one which has the maximum frequency - """ - PARSE_ROW_COUNT = 10 - - df = column.df - key = df.parent + df.fieldname - - if not self._guessed_date_formats.get(key): - matches = [col for col in columns if col.df == df] - if not matches: - self._guessed_date_formats[key] = None - return - - column = matches[0] - column_index = column.index - - date_values = [ - row[column_index] for row in self.data[:PARSE_ROW_COUNT] if row[column_index] - ] - date_formats = [ - guess_date_format(d) if isinstance(d, str) else None for d in date_values - ] - if not date_formats: - return - max_occurred_date_format = max(set(date_formats), key=date_formats.count) - self._guessed_date_formats[key] = max_occurred_date_format - - return self._guessed_date_formats[key] - - def import_data(self): - # set user lang for translations - frappe.cache().hdel("lang", frappe.session.user) - frappe.set_user_lang(frappe.session.user) - - if not self.console: - self.data_import.db_set("template_warnings", "") - - # set flags - frappe.flags.in_import = True - frappe.flags.mute_emails = self.data_import.mute_emails - - # prepare a map for missing link field values - self.prepare_missing_link_field_values() - - # parse docs from rows - payloads = self.get_payloads_for_import() - - # dont import if there are non-ignorable warnings - warnings = [w for w in self.warnings if w.get("type") != "info"] - if warnings: - if self.console: - self.print_grouped_warnings(warnings) - else: - self.data_import.db_set("template_warnings", json.dumps(warnings)) - frappe.publish_realtime( - "data_import_refresh", {"data_import": self.data_import.name} - ) - return - - # setup import log - if self.data_import.import_log: - import_log = frappe.parse_json(self.data_import.import_log) - else: - import_log = [] - - # remove previous failures from import log - import_log = [l for l in import_log if l.get("success") == True] - - # get successfully imported rows - imported_rows = [] - for log in import_log: - log = frappe._dict(log) - if log.success: - imported_rows += log.row_indexes - - # start import - total_payload_count = len(payloads) - batch_size = frappe.conf.data_import_batch_size or 1000 - - for batch_index, batched_payloads in enumerate( - frappe.utils.create_batch(payloads, batch_size) - ): - for i, payload in enumerate(batched_payloads): - doc = payload.doc - row_indexes = [row[0] for row in payload.rows] - current_index = (i + 1) + (batch_index * batch_size) - - if set(row_indexes).intersection(set(imported_rows)): - print("Skipping imported rows", row_indexes) - if total_payload_count > 5: - frappe.publish_realtime( - "data_import_progress", - { - "current": current_index, - "total": total_payload_count, - "skipping": True, - "data_import": self.data_import.name, - }, - ) - continue - - try: - start = timeit.default_timer() - doc = self.process_doc(doc) - processing_time = timeit.default_timer() - start - eta = self.get_eta(current_index, total_payload_count, processing_time) - - if total_payload_count > 5: - frappe.publish_realtime( - "data_import_progress", - { - "current": current_index, - "total": total_payload_count, - "docname": doc.name, - "data_import": self.data_import.name, - "success": True, - "row_indexes": row_indexes, - "eta": eta, - }, - ) - if self.console: - update_progress_bar( - "Importing {0} records".format(total_payload_count), - current_index, - total_payload_count, - ) - import_log.append( - frappe._dict(success=True, docname=doc.name, row_indexes=row_indexes) + # other fields + fields = get_standard_fields(doctype) + frappe.get_meta(doctype).fields + for df in fields: + fieldtype = df.fieldtype or "Data" + parent = df.parent or parent_doctype + if fieldtype not in no_value_fields: + if parent_doctype == doctype: + # for parent doctypes keys will be + # Label + # label + # Label (label) + if not out.get(df.label): + # if Label is already set, don't set it again + # in case of duplicate column headers + out[df.label] = df + out[df.fieldname] = df + label_with_fieldname = "{0} ({1})".format(df.label, df.fieldname) + out[label_with_fieldname] = df + else: + # in case there are multiple table fields with the same doctype + # for child doctypes keys will be + # Label (Table Field Label) + # table_field.fieldname + table_fields = parent_meta.get( + "fields", {"fieldtype": ["in", table_fieldtypes], "options": parent} ) - # commit after every successful import - frappe.db.commit() + for table_field in table_fields: + by_label = "{0} ({1})".format(df.label, table_field.label) + by_fieldname = "{0}.{1}".format(table_field.fieldname, df.fieldname) - except Exception: - import_log.append( - frappe._dict( - success=False, - exception=frappe.get_traceback(), - messages=frappe.local.message_log, - row_indexes=row_indexes, - ) - ) - frappe.clear_messages() - # rollback if exception - frappe.db.rollback() + # create a new df object to avoid mutation problems + if isinstance(df, dict): + new_df = frappe._dict(df.copy()) + else: + new_df = df.as_dict() - # set status - failures = [l for l in import_log if l.get("success") == False] - if len(failures) == total_payload_count: - status = "Pending" - elif len(failures) > 0: - status = "Partial Success" - else: - status = "Success" + new_df.is_child_table_field = True + new_df.child_table_df = table_field + out[by_label] = new_df + out[by_fieldname] = new_df - if self.console: - self.print_import_log(import_log) - else: - self.data_import.db_set("status", status) - self.data_import.db_set("import_log", json.dumps(import_log)) + # if autoname is based on field + # add an entry for "ID (Autoname Field)" + autoname_field = get_autoname_field(parent_doctype) + if autoname_field: + out["ID ({})".format(autoname_field.label)] = autoname_field + # ID field should also map to the autoname field + out["ID"] = autoname_field + out["name"] = autoname_field - frappe.flags.in_import = False - frappe.flags.mute_emails = False - frappe.publish_realtime("data_import_refresh", {"data_import": self.data_import.name}) + return out - return import_log - def get_payloads_for_import(self): - payloads = [] - # make a copy - data = list(self.rows) - while data: - doc, rows, data = self.parse_next_row_for_import(data) - payloads.append(frappe._dict(doc=doc, rows=rows)) - return payloads +def get_df_for_column_header(doctype, header): + def build_fields_dict_for_doctype(): + return build_fields_dict_for_column_matching(doctype) - def parse_next_row_for_import(self, data): - """ - Parses rows that make up a doc. A doc maybe built from a single row or multiple rows. - Returns the doc, rows, and data without the rows. - """ - doctypes = set([col.df.parent for col in self.columns if col.df and col.df.parent]) + df_by_labels_and_fieldname = frappe.cache().hget( + "data_import_column_header_map", doctype, generator=build_fields_dict_for_doctype + ) + return df_by_labels_and_fieldname.get(header) - # first row is included by default - first_row = data[0] - rows = [first_row] - # if there are child doctypes, find the subsequent rows - if len(doctypes) > 1: - # subsequent rows either dont have any parent value set - # or have the same value as the parent row - # we include a row if either of conditions match - parent_column_indexes = [ - col.index - for col in self.columns - if not col.skip_import and col.df and col.df.parent == self.doctype - ] - parent_row_values = [first_row[i] for i in parent_column_indexes] +# utilities - data_without_first_row = data[1:] - for row in data_without_first_row: - row_values = [row[i] for i in parent_column_indexes] - # if the row is blank, it's a child row doc - if all([v in INVALID_VALUES for v in row_values]): - rows.append(row) - continue - # if the row has same values as parent row, it's a child row doc - if row_values == parent_row_values: - rows.append(row) - continue - # if any of those conditions dont match, it's the next doc - break - def get_column_indexes(doctype): - return [ - col.index - for col in self.columns - if not col.skip_import and col.df and col.df.parent == doctype - ] +def get_autoname_field(doctype): + meta = frappe.get_meta(doctype) + if meta.autoname and meta.autoname.startswith("field:"): + fieldname = meta.autoname[len("field:") :] + return meta.get_field(fieldname) - def validate_value(value, df): - if df.fieldtype == "Select": - select_options = df.get_select_options() - if select_options and value not in select_options: - options_string = ", ".join([frappe.bold(d) for d in select_options]) - msg = _("Value must be one of {0}").format(options_string) - self.warnings.append( - { - "row": row_number, - "field": df.as_dict(convert_dates_to_str=True), - "message": msg, - } - ) - return - elif df.fieldtype == "Link": - d = self.get_missing_link_field_values(df.options) - if value in d.missing_values and not d.one_mandatory: - msg = _("Value {0} missing for {1}").format( - frappe.bold(value), frappe.bold(df.options) - ) - self.warnings.append( - { - "row": row_number, - "field": df.as_dict(convert_dates_to_str=True), - "message": msg, - } - ) - return value +def get_item_at_index(_list, i, default=None): + try: + a = _list[i] + except IndexError: + a = default + return a - return value - def parse_doc(doctype, docfields, values, row_number): - doc = frappe._dict() - if self.import_type == INSERT: - # new_doc returns a dict with default values set - doc = frappe.new_doc(doctype, as_dict=True) - - # remove standard fields and __islocal - for key in frappe.model.default_fields + ("__islocal",): - doc.pop(key, None) - - for df, value in zip(docfields, values): - if value in INVALID_VALUES: - value = None - - if value is not None: - value = validate_value(value, df) - - if value is not None: - doc[df.fieldname] = self.parse_value(value, df) - - is_table = frappe.get_meta(doctype).istable - is_update = self.import_type == UPDATE - if is_table and is_update and doc.get("name") in INVALID_VALUES: - # for table rows being inserted in update - # create a new doc with defaults set - new_doc = frappe.new_doc(doctype, as_dict=True) - new_doc.update(doc) - doc = new_doc - - check_mandatory_fields(doctype, doc, row_number) - return doc - - def check_mandatory_fields(doctype, doc, row_number): - """If import type is Insert: - Check for mandatory fields (except table fields) in doc - if import type is Update: - Check for name field or autoname field in doc - """ - meta = frappe.get_meta(doctype) - if self.import_type == UPDATE: - if meta.istable: - # when updating records with table rows, - # there are two scenarios: - # 1. if row 'name' is provided in the template - # the table row will be updated - # 2. if row 'name' is not provided - # then a new row will be added - # so we dont need to check for mandatory - return - - id_field = self.get_id_field(doctype) - if doc.get(id_field.fieldname) in INVALID_VALUES: - self.warnings.append( - { - "row": row_number, - "message": _("{0} is a mandatory field").format(id_field.label), - } - ) - return - - fields = [ - df - for df in meta.fields - if df.fieldtype not in table_fields - and df.reqd - and doc.get(df.fieldname) in INVALID_VALUES - ] - - if not fields: - return - - if len(fields) == 1: - self.warnings.append( - { - "row": row_number, - "message": _("{0} is a mandatory field").format(fields[0].label), - } - ) - else: - fields_string = ", ".join([df.label for df in fields]) - self.warnings.append( - {"row": row_number, "message": _("{0} are mandatory fields").format(fields_string)} - ) - - parsed_docs = {} - for row in rows: - for doctype in doctypes: - if doctype == self.doctype and parsed_docs.get(doctype): - # if parent doc is already parsed from the first row - # then skip - continue - - row_number = row[0] - column_indexes = get_column_indexes(doctype) - values = [row[i] for i in column_indexes] - - if all(v in INVALID_VALUES for v in values): - # skip values if all of them are empty - continue - - columns = [self.columns[i] for i in column_indexes] - docfields = [col.df for col in columns] - doc = parse_doc(doctype, docfields, values, row_number) - parsed_docs[doctype] = parsed_docs.get(doctype, []) - parsed_docs[doctype].append(doc) - - # build the doc with children - doc = {} - for doctype, docs in parsed_docs.items(): - if doctype == self.doctype: - doc.update(docs[0]) - else: - table_dfs = self.meta.get( - "fields", {"options": doctype, "fieldtype": ["in", table_fields]} - ) - if table_dfs: - table_field = table_dfs[0] - doc[table_field.fieldname] = docs - - # check if there is atleast one row for mandatory table fields - mandatory_table_fields = [ - df - for df in self.meta.fields - if df.fieldtype in table_fields and df.reqd and len(doc.get(df.fieldname, [])) == 0 - ] - if len(mandatory_table_fields) == 1: - self.warnings.append( - { - "row": first_row[0], - "message": _("There should be atleast one row for {0} table").format( - mandatory_table_fields[0].label - ), - } - ) - elif mandatory_table_fields: - fields_string = ", ".join([df.label for df in mandatory_table_fields]) - message = _("There should be atleast one row for the following tables: {0}").format( - fields_string - ) - self.warnings.append({"row": first_row[0], "message": message}) - - return doc, rows, data[len(rows) :] - - def process_doc(self, doc): - if self.import_type == INSERT: - return self.insert_record(doc) - elif self.import_type == UPDATE: - return self.update_record(doc) - - def insert_record(self, doc): - self.create_missing_linked_records(doc) - - new_doc = frappe.new_doc(self.doctype) - new_doc.update(doc) - # name shouldn't be set when inserting a new record - new_doc.set("name", None) - new_doc.insert() - if self.meta.is_submittable and self.data_import.submit_after_import: - new_doc.submit() - return new_doc - - def create_missing_linked_records(self, doc): - """ - Finds fields that are of type Link, and creates the corresponding - document automatically if it has only one mandatory field - """ - link_values = [] - - def get_link_fields(doc, doctype): - for fieldname, value in doc.items(): - meta = frappe.get_meta(doctype) - df = meta.get_field(fieldname) - if not df: - continue - if df.fieldtype == "Link" and value not in INVALID_VALUES: - link_values.append([df.options, value]) - elif df.fieldtype in table_fields: - for row in value: - get_link_fields(row, df.options) - - get_link_fields(doc, self.doctype) - - for link_doctype, link_value in link_values: - d = self.missing_link_values.get(link_doctype) - if d and d.one_mandatory and link_value in d.missing_values: - # find the autoname field - autoname_field = self.get_autoname_field(link_doctype) - name_field = autoname_field.fieldname if autoname_field else "name" - new_doc = frappe.new_doc(link_doctype) - new_doc.set(name_field, link_value) - new_doc.insert() - d.missing_values.remove(link_value) - - def update_record(self, doc): - id_fieldname = self.get_id_fieldname(self.doctype) - id_value = doc[id_fieldname] - existing_doc = frappe.get_doc(self.doctype, id_value) - existing_doc.flags.updater_reference = { - "doctype": self.data_import.doctype, - "docname": self.data_import.name, - "label": _("via Data Import"), - } - existing_doc.update(doc) - existing_doc.save() - return existing_doc - - def export_errored_rows(self): - from frappe.utils.csvutils import build_csv_response - - if not self.data_import: - return - - import_log = frappe.parse_json(self.data_import.import_log or "[]") - failures = [l for l in import_log if l.get("success") == False] - row_indexes = [] - for f in failures: - row_indexes.extend(f.get("row_indexes", [])) - - # de duplicate - row_indexes = list(set(row_indexes)) - row_indexes.sort() - - header_row = [col.header_title for col in self.columns[1:]] - rows = [header_row] - rows += [row[1:] for row in self.rows if row[0] in row_indexes] - - build_csv_response(rows, self.doctype) - - def get_missing_link_field_values(self, doctype): - return self.missing_link_values.get(doctype, {}) - - def prepare_missing_link_field_values(self): - columns = self.columns - rows = self.rows - link_column_indexes = [ - col.index for col in columns if col.df and col.df.fieldtype == "Link" - ] - - self.missing_link_values = {} - for index in link_column_indexes: - col = columns[index] - column_values = [row[index] for row in rows] - values = set([v for v in column_values if v not in INVALID_VALUES]) - doctype = col.df.options - - missing_values = [value for value in values if not frappe.db.exists(doctype, value)] - if self.missing_link_values.get(doctype): - self.missing_link_values[doctype].missing_values += missing_values - else: - self.missing_link_values[doctype] = frappe._dict( - missing_values=missing_values, - one_mandatory=self.has_one_mandatory_field(doctype), - df=col.df, - ) - - def get_eta(self, current, total, processing_time): - remaining = total - current - eta = processing_time * remaining - if not self.last_eta or eta < self.last_eta: - self.last_eta = eta - return self.last_eta - - def has_one_mandatory_field(self, doctype): - meta = frappe.get_meta(doctype) - # get mandatory fields with default not set - mandatory_fields = [df for df in meta.fields if df.reqd and not df.default] - mandatory_fields_count = len(mandatory_fields) - if meta.autoname and meta.autoname.lower() == "prompt": - mandatory_fields_count += 1 - return mandatory_fields_count == 1 - - def get_id_fieldname(self, doctype): - return self.get_id_field(doctype).fieldname - - def get_id_field(self, doctype): - autoname_field = self.get_autoname_field(doctype) - if autoname_field: - return autoname_field - return frappe._dict({"label": "ID", "fieldname": "name", "fieldtype": "Data"}) - - def get_autoname_field(self, doctype): - meta = frappe.get_meta(doctype) - if meta.autoname and meta.autoname.startswith("field:"): - fieldname = meta.autoname[len("field:") :] - return meta.get_field(fieldname) - - def print_grouped_warnings(self, warnings): - warnings_by_row = {} - other_warnings = [] - for w in warnings: - if w.get("row"): - warnings_by_row.setdefault(w.get("row"), []).append(w) - else: - other_warnings.append(w) - - for row_number, warnings in warnings_by_row.items(): - print("Row {0}".format(row_number)) - for w in warnings: - print(w.get("message")) - - for w in other_warnings: - print(w.get("message")) - - def print_import_log(self, import_log): - failed_records = [l for l in import_log if not l.success] - successful_records = [l for l in import_log if l.success] - - if successful_records: - print( - "Successfully imported {0} records out of {1}".format( - len(successful_records), len(import_log) - ) - ) - - if failed_records: - print("Failed to import {0} records".format(len(failed_records))) - file_name = "{0}_import_on_{1}.txt".format(self.doctype, frappe.utils.now()) - print("Check {0} for errors".format(os.path.join("sites", file_name))) - text = "" - for w in failed_records: - text += "Row Indexes: {0}\n".format(str(w.get("row_indexes", []))) - text += "Messages:\n{0}\n".format("\n".join(w.get("messages", []))) - text += "Traceback:\n{0}\n\n".format(w.get("exception")) - - with open(file_name, "w") as f: - f.write(text) - - -DATE_FORMATS = [ - r"%d-%m-%Y", - r"%m-%d-%Y", - r"%Y-%m-%d", - r"%d-%m-%y", - r"%m-%d-%y", - r"%y-%m-%d", - r"%d/%m/%Y", - r"%m/%d/%Y", - r"%Y/%m/%d", - r"%d/%m/%y", - r"%m/%d/%y", - r"%y/%m/%d", - r"%d.%m.%Y", - r"%m.%d.%Y", - r"%Y.%m.%d", - r"%d.%m.%y", - r"%m.%d.%y", - r"%y.%m.%d", -] - -TIME_FORMATS = [ - r"%H:%M:%S.%f", - r"%H:%M:%S", - r"%H:%M", - r"%I:%M:%S.%f %p", - r"%I:%M:%S %p", - r"%I:%M %p", -] - - -def guess_date_format(date_string): - date_string = date_string.strip() - - _date = None - _time = None - - if " " in date_string: - _date, _time = date_string.split(" ", 1) - else: - _date = date_string - - date_format = None - time_format = None - - for f in DATE_FORMATS: - try: - # if date is parsed without any exception - # capture the date format - datetime.strptime(_date, f) - date_format = f - break - except ValueError: - pass - - if _time: - for f in TIME_FORMATS: - try: - # if time is parsed without any exception - # capture the time format - datetime.strptime(_time, f) - time_format = f - break - except ValueError: - pass - - full_format = date_format - if time_format: - full_format += " " + time_format - return full_format - - -def import_data(doctype, file_path): - i = Importer(doctype, file_path) - i.import_data() +def get_user_format(date_format): + return ( + date_format.replace("%Y", "yyyy") + .replace("%y", "yy") + .replace("%m", "mm") + .replace("%d", "dd") + ) diff --git a/frappe/public/js/frappe/data_import/data_exporter.js b/frappe/public/js/frappe/data_import/data_exporter.js index 8276be6670..21f0b78a25 100644 --- a/frappe/public/js/frappe/data_import/data_exporter.js +++ b/frappe/public/js/frappe/data_import/data_exporter.js @@ -202,16 +202,16 @@ frappe.data_import.DataExporter = class DataExporter { } select_mandatory() { - let mandatory_table_doctypes = frappe.meta + let mandatory_table_fields = frappe.meta .get_table_fields(this.doctype) .filter(df => df.reqd) - .map(df => df.options); - mandatory_table_doctypes.push(this.doctype); + .map(df => df.fieldname); + mandatory_table_fields.push(this.doctype); let multicheck_fields = this.dialog.fields .filter(df => df.fieldtype === 'MultiCheck') .map(df => df.fieldname) - .filter(doctype => mandatory_table_doctypes.includes(doctype)); + .filter(doctype => mandatory_table_fields.includes(doctype)); let checkboxes = [].concat( ...multicheck_fields.map(fieldname => { @@ -333,16 +333,24 @@ frappe.data_import.DataExporter = class DataExporter { } }; -function get_columns_for_picker(doctype) { +export function get_columns_for_picker(doctype) { let out = {}; - const standard_fields_filter = df => - !in_list(frappe.model.no_value_type, df.fieldtype); + const exportable_fields = df => { + let keep = true; + if (frappe.model.no_value_type.includes(df.fieldtype)) { + keep = false; + } + if (['lft', 'rgt'].includes(df.fieldname)) { + keep = false; + } + return keep; + }; // parent let doctype_fields = frappe.meta .get_docfields(doctype) - .filter(standard_fields_filter); + .filter(exportable_fields); out[doctype] = [ { @@ -359,7 +367,7 @@ function get_columns_for_picker(doctype) { const cdt = df.options; const child_table_fields = frappe.meta .get_docfields(cdt) - .filter(standard_fields_filter); + .filter(exportable_fields); out[df.fieldname] = [ { diff --git a/frappe/public/js/frappe/data_import/import_preview.js b/frappe/public/js/frappe/data_import/import_preview.js index 27d81b75b7..7cf8431456 100644 --- a/frappe/public/js/frappe/data_import/import_preview.js +++ b/frappe/public/js/frappe/data_import/import_preview.js @@ -1,5 +1,5 @@ import DataTable from 'frappe-datatable'; -import ColumnPickerFields from './column_picker_fields'; +import { get_columns_for_picker } from './data_exporter'; frappe.provide('frappe.data_import'); @@ -236,9 +236,7 @@ frappe.data_import.ImportPreview = class ImportPreview { } show_column_mapper() { - let column_picker_fields = new ColumnPickerFields({ - doctype: this.doctype - }); + let column_picker_fields = get_columns_for_picker(this.doctype); let changed = []; let fields = this.preview_data.columns.map((col, i) => { let df = col.df; diff --git a/frappe/public/less/form.less b/frappe/public/less/form.less index df0334c14f..cd391c1f10 100644 --- a/frappe/public/less/form.less +++ b/frappe/public/less/form.less @@ -249,6 +249,7 @@ } .progress-message { + font-feature-settings: "tnum" 1; margin-top: 0px; } } @@ -1011,7 +1012,7 @@ body[data-route^="Form/Communication"] textarea[data-fieldname="subject"] { .map-columns .form-section { padding: 0 7px 7px; - border-bottom: none; + border-top: none; .clearfix { display: none; @@ -1021,3 +1022,7 @@ body[data-route^="Form/Communication"] textarea[data-fieldname="subject"] { .map-columns .form-section:first-child { padding-top: 7px; } + +.table-preview { + margin-top: 12px; +} diff --git a/frappe/utils/data.py b/frappe/utils/data.py index 7e991f472e..0d946c01a8 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -1185,3 +1185,75 @@ def is_subset(list_a, list_b): def generate_hash(*args, **kwargs): return frappe.generate_hash(*args, **kwargs) + + + +def guess_date_format(date_string): + DATE_FORMATS = [ + r"%d-%m-%Y", + r"%m-%d-%Y", + r"%Y-%m-%d", + r"%d-%m-%y", + r"%m-%d-%y", + r"%y-%m-%d", + r"%d/%m/%Y", + r"%m/%d/%Y", + r"%Y/%m/%d", + r"%d/%m/%y", + r"%m/%d/%y", + r"%y/%m/%d", + r"%d.%m.%Y", + r"%m.%d.%Y", + r"%Y.%m.%d", + r"%d.%m.%y", + r"%m.%d.%y", + r"%y.%m.%d", + ] + + TIME_FORMATS = [ + r"%H:%M:%S.%f", + r"%H:%M:%S", + r"%H:%M", + r"%I:%M:%S.%f %p", + r"%I:%M:%S %p", + r"%I:%M %p", + ] + + date_string = date_string.strip() + + _date = None + _time = None + + if " " in date_string: + _date, _time = date_string.split(" ", 1) + else: + _date = date_string + + date_format = None + time_format = None + + for f in DATE_FORMATS: + try: + # if date is parsed without any exception + # capture the date format + datetime.datetime.strptime(_date, f) + date_format = f + break + except ValueError: + pass + + if _time: + for f in TIME_FORMATS: + try: + # if time is parsed without any exception + # capture the time format + datetime.datetime.strptime(_time, f) + time_format = f + break + except ValueError: + pass + + full_format = date_format + if time_format: + full_format += " " + time_format + return full_format From 5a7ff2a446b095ec6a1bcfc4192b57483a17c92f Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 28 May 2020 23:17:14 +0530 Subject: [PATCH 025/485] fix: Rename importer_new to importer --- .../doctype/data_import_beta/{importer_new.py => importer.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename frappe/core/doctype/data_import_beta/{importer_new.py => importer.py} (100%) diff --git a/frappe/core/doctype/data_import_beta/importer_new.py b/frappe/core/doctype/data_import_beta/importer.py similarity index 100% rename from frappe/core/doctype/data_import_beta/importer_new.py rename to frappe/core/doctype/data_import_beta/importer.py From b7dfe7969dd6b2851844b1e9c090cbb6447748de Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 28 May 2020 23:18:08 +0530 Subject: [PATCH 026/485] fix: Create version for document creation So that we can track if documents were created by Data Import --- frappe/core/doctype/version/version.py | 11 +++++ frappe/model/document.py | 7 ++- .../public/js/frappe/form/footer/timeline.js | 48 ++++++++++++------- 3 files changed, 48 insertions(+), 18 deletions(-) diff --git a/frappe/core/doctype/version/version.py b/frappe/core/doctype/version/version.py index 216cdb1716..7654db4ae5 100644 --- a/frappe/core/doctype/version/version.py +++ b/frappe/core/doctype/version/version.py @@ -21,6 +21,17 @@ class Version(Document): else: return False + def for_insert(self, doc): + updater_reference = doc.flags.updater_reference + data = { + 'creation': doc.creation, + 'updater_reference': updater_reference, + 'created_by': doc.owner + } + self.ref_doctype = doc.doctype + self.docname = doc.name + self.data = frappe.as_json(data) + def get_data(self): return json.loads(self.data) diff --git a/frappe/model/document.py b/frappe/model/document.py index 843cb421fe..db56e1e395 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -961,7 +961,7 @@ class Document(BaseDocument): update_global_search(self) - if getattr(self.meta, 'track_changes', False) and self._doc_before_save and not self.flags.ignore_version: + if getattr(self.meta, 'track_changes', False) and not self.flags.ignore_version and not self.doctype == 'Version': self.save_version() self.run_method('on_change') @@ -1059,7 +1059,10 @@ class Document(BaseDocument): def save_version(self): """Save version info""" version = frappe.new_doc('Version') - if version.set_diff(self._doc_before_save, self): + if not self._doc_before_save: + version.for_insert(self) + version.insert(ignore_permissions=True) + elif version.set_diff(self._doc_before_save, self): version.insert(ignore_permissions=True) if not frappe.flags.in_migrate: follow_document(self.doctype, self.name, frappe.session.user) diff --git a/frappe/public/js/frappe/form/footer/timeline.js b/frappe/public/js/frappe/form/footer/timeline.js index bb44408c2a..7821a04c50 100644 --- a/frappe/public/js/frappe/form/footer/timeline.js +++ b/frappe/public/js/frappe/form/footer/timeline.js @@ -205,16 +205,18 @@ frappe.ui.form.Timeline = class Timeline {
').appendTo(me.list); } - // created - me.render_timeline_item({ - content: __("created"), - comment_type: "Created", - communication_type: "Comment", - sender: this.frm.doc.owner, - communication_date: this.frm.doc.creation, - creation: this.frm.doc.creation, - frm: this.frm - }); + // if a created comment is not added, add the default one + if (!timeline.find(comment => comment.comment_type === 'Created')) { + me.render_timeline_item({ + content: __("created"), + comment_type: "Created", + communication_type: "Comment", + sender: this.frm.doc.owner, + communication_date: this.frm.doc.creation, + creation: this.frm.doc.creation, + frm: this.frm + }); + } this.wrapper.find(".is-email").prop("checked", this.last_type==="Email").change(); @@ -564,12 +566,17 @@ frappe.ui.form.Timeline = class Timeline { let updater_reference = data.updater_reference; if (!$.isEmptyObject(updater_reference)) { let label = updater_reference.label || __('via {0}', [updater_reference.doctype]); - updater_reference_link = frappe.utils.get_form_link( - updater_reference.doctype, - updater_reference.docname, - true, - label - ); + let { doctype, docname } = updater_reference; + if (doctype && docname) { + updater_reference_link = frappe.utils.get_form_link( + doctype, + docname, + true, + label + ); + } else { + updater_reference_link = label; + } } // value changed in parent @@ -677,6 +684,15 @@ frappe.ui.form.Timeline = class Timeline { } } }); + + // creation by updater reference + if (data.creation && data.created_by) { + if (updater_reference_link) { + out.push(me.get_version_comment(version, __('created {0}', [updater_reference_link]), 'Created')); + } else { + out.push(me.get_version_comment(version, __('created'), 'Created')); + } + } }); } From 33857269efd594298d2f2da9186101b65c93f5a1 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 29 May 2020 10:35:47 +0530 Subject: [PATCH 027/485] feat: updated styles for blog post --- frappe/public/scss/blog.scss | 43 +++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/frappe/public/scss/blog.scss b/frappe/public/scss/blog.scss index 86c5b18ceb..b24fb631fd 100644 --- a/frappe/public/scss/blog.scss +++ b/frappe/public/scss/blog.scss @@ -7,6 +7,10 @@ .blog-list-body { min-height: 14rem; } + + .post-cover-container { + height: 12rem; + } } .blog-list-cover { @@ -19,7 +23,6 @@ } .post-cover-container { - min-height: 12rem; overflow: hidden; border-radius: $border-radius; @@ -45,4 +48,42 @@ max-height: 22rem; } } +} + +.blog-container { + max-width: 840px; + font-size: 18px; + margin: 0px auto; + font-family: Inter, sans-serif; + + .blog-intro { + font-size: 1.25rem; + font-weight: 300; + } + + .blog-content { + p { + line-height: 1.8; + margin-bottom: 1.2rem; + } + + h1, h2, h3 { + margin-top: 2rem; + } + + h4, h5, h6 { + margin-top: 1.5rem; + } + + img { + border-radius: $border-radius; + } + + blockquote{ + font-weight: 300; + padding: 1.2rem 1.8rem; + border-left: 8px solid $gray-300 ; + background: $gray-100; + } + } } \ No newline at end of file From ee5b7aa84ef5135934c1537ec0503de4093e62eb Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 29 May 2020 10:36:15 +0530 Subject: [PATCH 028/485] refactor: remove breadcrumbs from blog post --- frappe/website/doctype/blog_post/blog_post.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py index efa69c55bd..c3f78bff26 100644 --- a/frappe/website/doctype/blog_post/blog_post.py +++ b/frappe/website/doctype/blog_post/blog_post.py @@ -63,6 +63,8 @@ class BlogPost(WebsiteGenerator): if not cint(self.published): raise Exception("This blog has not been published yet!") + context.no_breadcrumbs = True + # temp fields context.full_name = get_fullname(self.owner) context.updated = global_date_format(self.published_on) From 6ffe45e5ce729e92c497666bf9c7b83618e8f787 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 29 May 2020 10:37:42 +0530 Subject: [PATCH 029/485] refactor: simplify social links --- frappe/website/doctype/blog_post/blog_post.py | 26 ++++++-------- .../blog_post/templates/blog_post.html | 36 +++---------------- .../doctype/blog_settings/blog_settings.json | 20 +++++------ 3 files changed, 24 insertions(+), 58 deletions(-) diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py index c3f78bff26..9551c26e15 100644 --- a/frappe/website/doctype/blog_post/blog_post.py +++ b/frappe/website/doctype/blog_post/blog_post.py @@ -99,25 +99,19 @@ class BlogPost(WebsiteGenerator): def fetch_social_links_info(self): + if not frappe.db.get_single_value("Blog Settings", "enable_social_sharing", cache=True): + return [] + url = frappe.local.site + "/" +self.route - social_url_map = { - "twitter": "https://twitter.com/intent/tweet?text=" +self.title + "&url=" + url, - "facebook": "https://www.facebook.com/sharer.php?u=" + url, - "linkedin": "https://www.linkedin.com/sharing/share-offsite/?url=" + url, - "email": "mailto:?subject=" + self.title + "&body=" + url, - } - social_link = [] - for link in frappe.get_cached_doc("Blog Settings").social_share_settings: - social_media = link.social_link_type + social_links = [ + { "icon": "twitter", "link": "https://twitter.com/intent/tweet?text=" + self.title + "&url=" + url }, + { "icon": "facebook", "link": "https://www.facebook.com/sharer.php?u=" + url }, + { "icon": "linkedin", "link": "https://www.linkedin.com/sharing/share-offsite/?url=" + url }, + { "icon": "envelope", "link": "mailto:?subject=" + self.title + "&body=" + url } + ] - social_link.append({ - 'icon': social_media if not social_media == 'email' else 'envelope', - 'url': social_url_map.get(social_media), - 'color': link.color, - 'background': link.background_color - }) - return social_link + return social_links def load_comments(self, context): context.comment_list = get_comment_list(self.doctype, self.name) diff --git a/frappe/website/doctype/blog_post/templates/blog_post.html b/frappe/website/doctype/blog_post/templates/blog_post.html index 12e5ccf2d7..f1c99dd0fd 100644 --- a/frappe/website/doctype/blog_post/templates/blog_post.html +++ b/frappe/website/doctype/blog_post/templates/blog_post.html @@ -24,13 +24,12 @@ {% endif %} {% if social_links %} - {% endif %}
@@ -54,31 +53,4 @@ -{% endblock %} - -{% block style %} - -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/frappe/website/doctype/blog_settings/blog_settings.json b/frappe/website/doctype/blog_settings/blog_settings.json index a05c0ea5f3..63dae06c68 100644 --- a/frappe/website/doctype/blog_settings/blog_settings.json +++ b/frappe/website/doctype/blog_settings/blog_settings.json @@ -7,8 +7,8 @@ "field_order": [ "blog_title", "blog_introduction", - "section_break_4", - "social_share_settings" + "column_break", + "enable_social_sharing" ], "fields": [ { @@ -22,22 +22,22 @@ "label": "Blog Introduction" }, { - "collapsible": 1, - "fieldname": "section_break_4", - "fieldtype": "Section Break" + "default": "0", + "fieldname": "enable_social_sharing", + "fieldtype": "Check", + "label": "Enable Social Sharing" }, { - "fieldname": "social_share_settings", - "fieldtype": "Table", - "label": "Social Share Settings", - "options": "Social Link Settings" + "collapsible": 1, + "fieldname": "column_break", + "fieldtype": "Column Break" } ], "icon": "fa fa-cog", "idx": 1, "issingle": 1, "links": [], - "modified": "2020-05-28 18:49:08.356608", + "modified": "2020-05-28 22:34:46.679003", "modified_by": "Administrator", "module": "Website", "name": "Blog Settings", From b60fffc60492646f2124dce7ea92629c98a9c086 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 29 May 2020 10:38:13 +0530 Subject: [PATCH 030/485] feat: updated layout for blog and blogger --- frappe/templates/includes/blog/blogger.html | 2 +- .../blog_post/templates/blog_post.html | 42 +++++++++++-------- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/frappe/templates/includes/blog/blogger.html b/frappe/templates/includes/blog/blogger.html index 68df22786d..136d2cdaa9 100644 --- a/frappe/templates/includes/blog/blogger.html +++ b/frappe/templates/includes/blog/blogger.html @@ -1,7 +1,7 @@ {% from "frappe/templates/includes/macros.html" import square_image_with_fallback %}
- {{ square_image_with_fallback(src=blogger_info.avatar, size='72px', alt=blogger_info.full_name, class='align-self-start mr-3 rounded') }} + {{ square_image_with_fallback(src=blogger_info.avatar, size='90px', alt=blogger_info.full_name, class='align-self-start mr-3 rounded') }}
{{ blogger_info.full_name }} diff --git a/frappe/website/doctype/blog_post/templates/blog_post.html b/frappe/website/doctype/blog_post/templates/blog_post.html index f1c99dd0fd..f0eb505d61 100644 --- a/frappe/website/doctype/blog_post/templates/blog_post.html +++ b/frappe/website/doctype/blog_post/templates/blog_post.html @@ -8,22 +8,30 @@
-
- -

{{ title }}

-

- {{ blog_intro }} -

- - -
- {{ frappe.format_date(published_on) }} - {% if read_time %} - · - {{ read_time }} min read - {% endif %} - {% if social_links %} -
+ {% if not hide_cta %} + {{ web_blocks([ + { + 'template': "Section With CTA", + 'values': cta, + 'add_container': 0, + 'add_top_padding': 0, + 'add_bottom_padding': 0, + 'css_class': "py-5" + } + ]) + }} + {% endif %} {% if blogger_info %}
diff --git a/frappe/website/doctype/blog_settings/blog_settings.json b/frappe/website/doctype/blog_settings/blog_settings.json index 63dae06c68..a1c9591837 100644 --- a/frappe/website/doctype/blog_settings/blog_settings.json +++ b/frappe/website/doctype/blog_settings/blog_settings.json @@ -8,7 +8,16 @@ "blog_title", "blog_introduction", "column_break", - "enable_social_sharing" + "enable_social_sharing", + "show_cta_in_blog", + "cta_section", + "title", + "subtitle", + "cta_label", + "cta_url", + "column_break_11", + "cta_description", + "show_confetti" ], "fields": [ { @@ -31,13 +40,64 @@ "collapsible": 1, "fieldname": "column_break", "fieldtype": "Column Break" + }, + { + "default": "0", + "fieldname": "show_cta_in_blog", + "fieldtype": "Check", + "label": "Show CTA in Blog" + }, + { + "depends_on": "eval:doc.show_cta_in_blog", + "fieldname": "cta_section", + "fieldtype": "Section Break", + "label": "CTA" + }, + { + "fieldname": "title", + "fieldtype": "Data", + "label": "Title", + "mandatory_depends_on": "eval:doc.show_cta_in_blog" + }, + { + "fieldname": "subtitle", + "fieldtype": "Data", + "label": "Subtitle", + "mandatory_depends_on": "eval:doc.show_cta_in_blog" + }, + { + "fieldname": "cta_label", + "fieldtype": "Data", + "label": "CTA Label", + "mandatory_depends_on": "eval:doc.show_cta_in_blog" + }, + { + "fieldname": "cta_url", + "fieldtype": "Data", + "label": "CTA URL", + "mandatory_depends_on": "eval:doc.show_cta_in_blog" + }, + { + "fieldname": "column_break_11", + "fieldtype": "Column Break" + }, + { + "fieldname": "cta_description", + "fieldtype": "Data", + "label": "CTA Description" + }, + { + "default": "0", + "fieldname": "show_confetti", + "fieldtype": "Check", + "label": "Show Confetti" } ], "icon": "fa fa-cog", "idx": 1, "issingle": 1, "links": [], - "modified": "2020-05-28 22:34:46.679003", + "modified": "2020-05-29 16:39:44.018100", "modified_by": "Administrator", "module": "Website", "name": "Blog Settings", From 3de8549b0b67f1bfe8ca4ad4b63c9a73d0105f47 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 1 Jun 2020 13:42:23 +0530 Subject: [PATCH 043/485] refactor: allow blogger to read blog settings --- frappe/website/doctype/blog_settings/blog_settings.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/frappe/website/doctype/blog_settings/blog_settings.json b/frappe/website/doctype/blog_settings/blog_settings.json index a1c9591837..1b96054705 100644 --- a/frappe/website/doctype/blog_settings/blog_settings.json +++ b/frappe/website/doctype/blog_settings/blog_settings.json @@ -97,7 +97,7 @@ "idx": 1, "issingle": 1, "links": [], - "modified": "2020-05-29 16:39:44.018100", + "modified": "2020-06-01 13:41:44.150987", "modified_by": "Administrator", "module": "Website", "name": "Blog Settings", @@ -111,6 +111,13 @@ "role": "Website Manager", "share": 1, "write": 1 + }, + { + "email": 1, + "print": 1, + "read": 1, + "role": "Blogger", + "share": 1 } ], "sort_field": "modified", From 7dfb7e0646b1c49ee547fd2cd1f6c547e8c79cb7 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 1 Jun 2020 13:53:03 +0530 Subject: [PATCH 044/485] refactor: remove cover image --- frappe/public/scss/blog.scss | 6 +++--- .../blog_post/templates/blog_post_row.html | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/frappe/public/scss/blog.scss b/frappe/public/scss/blog.scss index aa6c3b543c..f857270292 100644 --- a/frappe/public/scss/blog.scss +++ b/frappe/public/scss/blog.scss @@ -15,13 +15,13 @@ border-radius: $border-radius; img { - min-height: 12rem; + min-height: 10rem; width: 100%; } } .default-cover { - background: $gray-300; + background: $gray-200; color: $gray-600; display: flex; flex-direction: column; @@ -34,7 +34,7 @@ @extend .col-md-4; .blog-list-body { - min-height: 12rem; + min-height: 14rem; } .post-cover-container { 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 5987532c98..a80525c761 100644 --- a/frappe/website/doctype/blog_post/templates/blog_post_row.html +++ b/frappe/website/doctype/blog_post/templates/blog_post_row.html @@ -2,15 +2,15 @@
- {% if post.cover_image %} - + + {% if post.cover_image %} {{post.title}} - Cover Image - - {% else %} -
-
{{ post.title }}
-
- {% endif %} + {% else %} +
+
{{ post.title }}
+
+ {% endif %} +
From 299200da190b1663dc854e26fdc8f81dd8d2fb31 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 1 Jun 2020 14:13:45 +0530 Subject: [PATCH 045/485] refactor: macro for avatar --- frappe/templates/includes/blog/blogger.html | 2 +- frappe/templates/includes/comments/comment.html | 2 +- frappe/templates/includes/macros.html | 16 ++-------------- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/frappe/templates/includes/blog/blogger.html b/frappe/templates/includes/blog/blogger.html index 136d2cdaa9..ef8f8257e8 100644 --- a/frappe/templates/includes/blog/blogger.html +++ b/frappe/templates/includes/blog/blogger.html @@ -1,7 +1,7 @@ {% from "frappe/templates/includes/macros.html" import square_image_with_fallback %}
- {{ square_image_with_fallback(src=blogger_info.avatar, size='90px', alt=blogger_info.full_name, class='align-self-start mr-3 rounded') }} + {{ square_image_with_fallback(src=blogger_info.avatar, size='small', alt=blogger_info.full_name, class='align-self-start mr-3 rounded') }}
{{ blogger_info.full_name }} diff --git a/frappe/templates/includes/comments/comment.html b/frappe/templates/includes/comments/comment.html index 3fe3d7df58..1deb49bb3e 100644 --- a/frappe/templates/includes/comments/comment.html +++ b/frappe/templates/includes/comments/comment.html @@ -1,7 +1,7 @@ {% from "frappe/templates/includes/macros.html" import square_image_with_fallback %}
- {{ square_image_with_fallback(src=frappe.get_gravatar(comment.comment_email or comment.sender), size='48px', alt=comment.sender_full_name, class='align-self-start mr-3') }} + {{ square_image_with_fallback(src=frappe.get_gravatar(comment.comment_email or comment.sender), size='extra-small', alt=comment.sender_full_name, class='align-self-start mr-3') }}
diff --git a/frappe/templates/includes/macros.html b/frappe/templates/includes/macros.html index 3e822b8bf3..767bd59ec9 100644 --- a/frappe/templates/includes/macros.html +++ b/frappe/templates/includes/macros.html @@ -1,18 +1,6 @@ -{% macro square_image_with_fallback(src=None, size=None, alt=None, class="") %} +{% macro square_image_with_fallback(src=None, size='small', alt=None, class="") %} {% if src %} -{{ alt or '' }} + {% else %}
{% endif %} From e868fac37961e1e505f5fa97575bb033035d4f31 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 1 Jun 2020 15:19:33 +0530 Subject: [PATCH 046/485] refactor: simpler blog layout with cards --- frappe/public/scss/blog.scss | 66 +++---------------- .../blog_post/templates/blog_post_row.html | 57 +++++++--------- 2 files changed, 33 insertions(+), 90 deletions(-) diff --git a/frappe/public/scss/blog.scss b/frappe/public/scss/blog.scss index f857270292..64a27b3193 100644 --- a/frappe/public/scss/blog.scss +++ b/frappe/public/scss/blog.scss @@ -1,62 +1,12 @@ -.blog-list-item { - @extend .col-12; +.card-img-top { + width: 100%; + overflow: hidden; + height: 12rem; + width: auto; - .blog-list-cover { - @extend .col-12; - } - - .blog-list-body { - @extend .col-12; - @extend .mt-3; - } - - .post-cover-container { - overflow: hidden; - border-radius: $border-radius; - - img { - min-height: 10rem; - width: 100%; - } - } - - .default-cover { - background: $gray-200; - color: $gray-600; - display: flex; - flex-direction: column; - justify-content: end; - height: 100%; - padding: 1rem; - } - - &:not(.featured) { - @extend .col-md-4; - - .blog-list-body { - min-height: 14rem; - } - - .post-cover-container { - height: 10rem; - } - } - - &.featured { - .blog-list-cover { - @extend .col-12; - @extend .col-md-8; - } - - .blog-list-body { - @extend .col-12; - @extend .col-md-4; - @extend .mt-0; - } - - .post-cover-container { - max-height: 22rem; - } + img { + width: 100%; + min-height: 100%; } } 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 a80525c761..bd5b0b382b 100644 --- a/frappe/website/doctype/blog_post/templates/blog_post_row.html +++ b/frappe/website/doctype/blog_post/templates/blog_post_row.html @@ -1,42 +1,35 @@ {%- set post = doc -%} -
-
-
- - {% if post.cover_image %} - {{post.title}} - Cover Image - {% else %} -
-
{{ post.title }}
-
- {% endif %} - +
+
+
+ {{post.title}} - Cover Image
-
-
-
-
+
+
+
+ {%- if post.featured -%} + {{ _('Featured') }} · + {%- endif -%} + {{ post.category.title }} +
{%- if post.featured -%} - {{ _('Featured') }} · +
{{ post.title }}
+ {%- else -%} +
{{ post.title }}
{%- endif -%} - {{ post.category.title }} +

{{ post.intro }}

- {%- if post.featured -%} -

{{ post.title }}

- {%- else -%} -
{{ post.title }}
- {%- endif -%} -

{{ post.intro }}

-
-
- -
- {{ post.full_name }} -
- {{ frappe.format_date(post.published_on) }} - {% if post.read_time %} · {{ post.read_time }} min read {% endif %} +
+ +
+ {{ post.full_name }} +
+ {{ frappe.format_date(post.published_on) }} + {% if post.read_time %} · {{ post.read_time }} min read {% endif %} +
+
\ No newline at end of file From f38e081d04a722a4f38571762037b9eda9eaf8ea Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 1 Jun 2020 17:52:18 +0530 Subject: [PATCH 047/485] refactor: tweak typography --- frappe/public/scss/blog.scss | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/frappe/public/scss/blog.scss b/frappe/public/scss/blog.scss index 64a27b3193..9b78e47e48 100644 --- a/frappe/public/scss/blog.scss +++ b/frappe/public/scss/blog.scss @@ -12,7 +12,7 @@ .blog-container { max-width: 840px; - font-size: 18px; + font-size: 16px; margin: 0px auto; font-family: Inter, sans-serif; @@ -23,10 +23,34 @@ .blog-content { p { - line-height: 1.8; + line-height: 1.625; margin-bottom: 1.2rem; } + h1 { + font-size: 2rem; + } + + h1.blog-header { + font-size: 2.5rem; + } + + h2 { + font-size: 1.75rem; + } + + h3 { + font-size: 1.5rem; + } + + h4 { + font-size: 1.25rem; + } + + h5, h6 { + font-size: 1rem; + } + h1, h2, h3 { margin-top: 2rem; } From 9e358261f1baef3eb84cd43eeb4ab9a41667cde7 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 1 Jun 2020 18:32:29 +0530 Subject: [PATCH 048/485] feat: added section small cta --- frappe/public/scss/page-builder.scss | 44 +++++++++++++++++++ .../section_with_small_cta/__init__.py | 0 .../section_with_small_cta.html | 11 +++++ .../section_with_small_cta.json | 37 ++++++++++++++++ 4 files changed, 92 insertions(+) create mode 100644 frappe/website/web_template/section_with_small_cta/__init__.py create mode 100644 frappe/website/web_template/section_with_small_cta/section_with_small_cta.html create mode 100644 frappe/website/web_template/section_with_small_cta/section_with_small_cta.json diff --git a/frappe/public/scss/page-builder.scss b/frappe/public/scss/page-builder.scss index a028e34158..cc96a2751c 100644 --- a/frappe/public/scss/page-builder.scss +++ b/frappe/public/scss/page-builder.scss @@ -224,6 +224,50 @@ } } +.section-small-cta { + padding: 1.8rem; + background-color: lighten($primary, 42%); + border-radius: 0.75rem; + display: flex; + flex-direction: column; + text-align: center; + + @include media-breakpoint-up(sm) { + flex-direction: column; + text-align: left; + } + + @include media-breakpoint-up(md) { + flex-direction: row; + justify-content: space-between; + + div { + align-self: center; + } + } + + .title { + max-width: 36rem; + font-size: $font-size-xl; + font-weight: 800; + line-height: 1.25; + @include media-breakpoint-up(md) { + font-size: $font-size-2xl; + } + } + .subtitle { + max-width: 36rem; + font-size: $font-size-base; + color: $gray-900; + margin-bottom: 1.2rem; + + @include media-breakpoint-up(md) { + font-size: $font-size-lg; + margin-bottom: 0px; + } + } +} + .section-cta-container { position: relative; .confetti { diff --git a/frappe/website/web_template/section_with_small_cta/__init__.py b/frappe/website/web_template/section_with_small_cta/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/website/web_template/section_with_small_cta/section_with_small_cta.html b/frappe/website/web_template/section_with_small_cta/section_with_small_cta.html new file mode 100644 index 0000000000..e2f8f5d7f6 --- /dev/null +++ b/frappe/website/web_template/section_with_small_cta/section_with_small_cta.html @@ -0,0 +1,11 @@ +
+
+
+

{{ title }}

+

{{ subtitle }}

+
+ +
+
diff --git a/frappe/website/web_template/section_with_small_cta/section_with_small_cta.json b/frappe/website/web_template/section_with_small_cta/section_with_small_cta.json new file mode 100644 index 0000000000..d392830473 --- /dev/null +++ b/frappe/website/web_template/section_with_small_cta/section_with_small_cta.json @@ -0,0 +1,37 @@ +{ + "creation": "2020-06-01 15:56:38.002136", + "docstatus": 0, + "doctype": "Web Template", + "fields": [ + { + "fieldname": "title", + "fieldtype": "Data", + "label": "Title", + "reqd": 0 + }, + { + "fieldname": "subtitle", + "fieldtype": "Small Text", + "label": "Subtitle", + "reqd": 0 + }, + { + "fieldname": "cta_label", + "fieldtype": "Data", + "label": "CTA Label", + "reqd": 0 + }, + { + "fieldname": "cta_url", + "fieldtype": "Data", + "label": "CTA URL", + "reqd": 0 + } + ], + "idx": 0, + "modified": "2020-06-01 17:51:23.073342", + "modified_by": "Administrator", + "name": "Section with Small CTA", + "owner": "Administrator", + "standard": 1 +} \ No newline at end of file From b00fb8bd21dc111c3301ea9789ebef446c2df777 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 1 Jun 2020 18:33:03 +0530 Subject: [PATCH 049/485] refactor: replace cta with small cta --- frappe/website/doctype/blog_post/blog_post.py | 4 +--- .../blog_post/templates/blog_post.html | 2 +- .../doctype/blog_settings/blog_settings.json | 19 +++---------------- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py index dcd712b634..a696ebc8c2 100644 --- a/frappe/website/doctype/blog_post/blog_post.py +++ b/frappe/website/doctype/blog_post/blog_post.py @@ -112,9 +112,7 @@ class BlogPost(WebsiteGenerator): "title": blog_settings.title, "subtitle": blog_settings.subtitle, "cta_label": blog_settings.cta_label, - "cta_url": blog_settings.cta_url, - "cta_description": blog_settings.cta_description, - "show_confetti": blog_settings.show_confetti + "cta_url": blog_settings.cta_url } return {} diff --git a/frappe/website/doctype/blog_post/templates/blog_post.html b/frappe/website/doctype/blog_post/templates/blog_post.html index f38c3db4b4..862380de47 100644 --- a/frappe/website/doctype/blog_post/templates/blog_post.html +++ b/frappe/website/doctype/blog_post/templates/blog_post.html @@ -48,7 +48,7 @@ {% if not hide_cta %} {{ web_blocks([ { - 'template': "Section With CTA", + 'template': "Section With Small CTA", 'values': cta, 'add_container': 0, 'add_top_padding': 0, diff --git a/frappe/website/doctype/blog_settings/blog_settings.json b/frappe/website/doctype/blog_settings/blog_settings.json index 1b96054705..73ea3ce877 100644 --- a/frappe/website/doctype/blog_settings/blog_settings.json +++ b/frappe/website/doctype/blog_settings/blog_settings.json @@ -13,11 +13,9 @@ "cta_section", "title", "subtitle", - "cta_label", - "cta_url", "column_break_11", - "cta_description", - "show_confetti" + "cta_label", + "cta_url" ], "fields": [ { @@ -80,24 +78,13 @@ { "fieldname": "column_break_11", "fieldtype": "Column Break" - }, - { - "fieldname": "cta_description", - "fieldtype": "Data", - "label": "CTA Description" - }, - { - "default": "0", - "fieldname": "show_confetti", - "fieldtype": "Check", - "label": "Show Confetti" } ], "icon": "fa fa-cog", "idx": 1, "issingle": 1, "links": [], - "modified": "2020-06-01 13:41:44.150987", + "modified": "2020-06-01 15:57:21.564652", "modified_by": "Administrator", "module": "Website", "name": "Blog Settings", From 882b200f32c475ab5fa26b6c9b7129d23d5f6988 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 1 Jun 2020 18:33:25 +0530 Subject: [PATCH 050/485] feat: updated blog typography --- frappe/public/scss/blog.scss | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/frappe/public/scss/blog.scss b/frappe/public/scss/blog.scss index 9b78e47e48..f0b8d9e34f 100644 --- a/frappe/public/scss/blog.scss +++ b/frappe/public/scss/blog.scss @@ -23,7 +23,7 @@ .blog-content { p { - line-height: 1.625; + line-height: 1.8; margin-bottom: 1.2rem; } @@ -47,15 +47,20 @@ font-size: 1.25rem; } - h5, h6 { + h5, + h6 { font-size: 1rem; } - h1, h2, h3 { + h1, + h2, + h3 { margin-top: 2rem; } - h4, h5, h6 { + h4, + h5, + h6 { margin-top: 1.5rem; } @@ -63,11 +68,11 @@ border-radius: $border-radius; } - blockquote{ + blockquote { font-weight: 300; padding: 1.2rem 1.8rem; - border-left: 8px solid $gray-300 ; + border-left: 8px solid $gray-300; background: $gray-100; } } -} \ No newline at end of file +} From 8e815552f648ca295befaa002b522588e32fd5fc Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 1 Jun 2020 19:15:00 +0530 Subject: [PATCH 051/485] feat: use blog_post_list as default --- frappe/model/meta.py | 3 +++ frappe/templates/includes/blog/blog_list.html | 25 ------------------- frappe/website/doctype/blog_post/blog_post.py | 1 - .../blog_post/templates/blog_post_list.html} | 0 frappe/www/list.py | 3 +++ 5 files changed, 6 insertions(+), 26 deletions(-) delete mode 100644 frappe/templates/includes/blog/blog_list.html rename frappe/{templates/includes/blog/blog.html => website/doctype/blog_post/templates/blog_post_list.html} (100%) diff --git a/frappe/model/meta.py b/frappe/model/meta.py index 0c5ec75597..1cc3abba5b 100644 --- a/frappe/model/meta.py +++ b/frappe/model/meta.py @@ -483,6 +483,9 @@ class Meta(Document): def get_row_template(self): return self.get_web_template(suffix='_row') + def get_list_template(self): + return self.get_web_template(suffix='_list') + def get_web_template(self, suffix=''): '''Returns the relative path of the row template for this doctype''' module_name = frappe.scrub(self.module) diff --git a/frappe/templates/includes/blog/blog_list.html b/frappe/templates/includes/blog/blog_list.html deleted file mode 100644 index cfe25f3682..0000000000 --- a/frappe/templates/includes/blog/blog_list.html +++ /dev/null @@ -1,25 +0,0 @@ -{% if sub_title %} -

{{ sub_title }}

-{% endif %} -{% if not result -%} -
- {{ no_result_message or _("Nothing to show") }} -
-{% else %} -
- - {% if result_heading_template %}{% include result_heading_template %}{% endif %} - -
- {% for item in result %} - {{ item }} - {% endfor %} -
- -
-{%- endif %} diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py index a696ebc8c2..8a0e2323fc 100644 --- a/frappe/website/doctype/blog_post/blog_post.py +++ b/frappe/website/doctype/blog_post/blog_post.py @@ -153,7 +153,6 @@ class BlogPost(WebsiteGenerator): def get_list_context(context=None): list_context = frappe._dict( - template = "/templates/includes/blog/blog.html", get_list = get_blog_list, no_breadcrumbs = True, hide_filters = True, diff --git a/frappe/templates/includes/blog/blog.html b/frappe/website/doctype/blog_post/templates/blog_post_list.html similarity index 100% rename from frappe/templates/includes/blog/blog.html rename to frappe/website/doctype/blog_post/templates/blog_post_list.html diff --git a/frappe/www/list.py b/frappe/www/list.py index 313505b729..03171a74bd 100644 --- a/frappe/www/list.py +++ b/frappe/www/list.py @@ -171,6 +171,9 @@ def get_list_context(context, doctype, web_form_name=None): if not meta.custom and not list_context.row_template: list_context.row_template = meta.get_row_template() + if not meta.custom and not list_context.list_template: + list_context.template = meta.get_list_template() + return list_context def get_list(doctype, txt, filters, limit_start, limit_page_length=20, ignore_permissions=False, From 89b8eea57b50832dc46701b11eefd607ae1d2f57 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 1 Jun 2020 19:29:17 +0530 Subject: [PATCH 052/485] feat: move social share after content --- frappe/website/doctype/blog_post/blog_post.py | 1 + .../blog_post/templates/blog_post.html | 31 ++++++++++++------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py index 8a0e2323fc..beffcdca25 100644 --- a/frappe/website/doctype/blog_post/blog_post.py +++ b/frappe/website/doctype/blog_post/blog_post.py @@ -75,6 +75,7 @@ class BlogPost(WebsiteGenerator): context.updated = global_date_format(self.published_on) context.social_links = self.fetch_social_links_info() context.cta = self.fetch_cta() + context.enable_cta = not self.hide_cta and frappe.db.get_single_value("Blog Settings", "show_cta_in_blog", cache=True) if self.blogger: context.blogger_info = frappe.get_doc("Blogger", self.blogger).as_dict() diff --git a/frappe/website/doctype/blog_post/templates/blog_post.html b/frappe/website/doctype/blog_post/templates/blog_post.html index 862380de47..e7e1e5db95 100644 --- a/frappe/website/doctype/blog_post/templates/blog_post.html +++ b/frappe/website/doctype/blog_post/templates/blog_post.html @@ -18,11 +18,6 @@

{{ blog_intro }}

- {%-if featured -%} -
- {{ _("Featured") }} -
- {%- endif -%}
{{ frappe.format_date(published_on) }} @@ -32,11 +27,11 @@ {% endif %}
- {% if social_links %} - {% for link in social_links %} - - {% endfor %} - {% endif %} + {%-if featured -%} +
+ {{ _("Featured") }} +
+ {%- endif -%}
@@ -45,7 +40,7 @@
- {% if not hide_cta %} + {% if enable_cta %} {{ web_blocks([ { 'template': "Section With Small CTA", @@ -53,11 +48,23 @@ 'add_container': 0, 'add_top_padding': 0, 'add_bottom_padding': 0, - 'css_class': "py-5" + 'css_class': "my-5" } ]) }} {% endif %} +
+
+ Published on {{ frappe.format_date(published_on) }} +
+
+ {% if social_links %} + {% for link in social_links %} + + {% endfor %} + {% endif %} +
+
{% if blogger_info %}
From 5d9d06a7a2c6dd0c67c9d26fd5414433ffd31257 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 1 Jun 2020 19:51:43 +0530 Subject: [PATCH 053/485] refactor: minor blog styling --- frappe/public/scss/blog.scss | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/frappe/public/scss/blog.scss b/frappe/public/scss/blog.scss index f0b8d9e34f..999df7bde0 100644 --- a/frappe/public/scss/blog.scss +++ b/frappe/public/scss/blog.scss @@ -11,8 +11,8 @@ } .blog-container { - max-width: 840px; font-size: 16px; + max-width: 800px; margin: 0px auto; font-family: Inter, sans-serif; @@ -22,11 +22,16 @@ } .blog-content { + line-height: 1.8; + p { - line-height: 1.8; margin-bottom: 1.2rem; } + ul { + margin-top: 1rem; + } + h1 { font-size: 2rem; } @@ -69,10 +74,15 @@ } blockquote { - font-weight: 300; - padding: 1.2rem 1.8rem; - border-left: 8px solid $gray-300; - background: $gray-100; + margin: 2rem auto; + width: 90%; + padding-top: 2rem; + padding-bottom: 2rem; + border-top: 1px solid $gray-200; + border-bottom: 1px solid $gray-200; + text-align: center; + font-size: 1.2rem; + font-weight: 500; } } } From 190ed209747ed0cd8495402e9966a4ea992be983 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 1 Jun 2020 19:55:37 +0530 Subject: [PATCH 054/485] fix: top margin for ordered list --- frappe/public/scss/blog.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/scss/blog.scss b/frappe/public/scss/blog.scss index 999df7bde0..7ecdca3879 100644 --- a/frappe/public/scss/blog.scss +++ b/frappe/public/scss/blog.scss @@ -28,7 +28,7 @@ margin-bottom: 1.2rem; } - ul { + ul, ol { margin-top: 1rem; } From 9a997764a125ad268e2b24834821fcd83a1f414d Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 1 Jun 2020 20:03:10 +0530 Subject: [PATCH 055/485] refactor: use margin instead of padding --- frappe/website/doctype/blog_post/templates/blog_post.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/doctype/blog_post/templates/blog_post.html b/frappe/website/doctype/blog_post/templates/blog_post.html index e7e1e5db95..df0300ff23 100644 --- a/frappe/website/doctype/blog_post/templates/blog_post.html +++ b/frappe/website/doctype/blog_post/templates/blog_post.html @@ -8,7 +8,7 @@
-
+
{{ _('Blog') }} / From 315f01833ced5d61a4be9ce070e8363c11c08458 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 1 Jun 2020 20:23:28 +0530 Subject: [PATCH 056/485] fix: fonts --- frappe/public/scss/blog.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/scss/blog.scss b/frappe/public/scss/blog.scss index 7ecdca3879..16266b5da2 100644 --- a/frappe/public/scss/blog.scss +++ b/frappe/public/scss/blog.scss @@ -14,7 +14,6 @@ font-size: 16px; max-width: 800px; margin: 0px auto; - font-family: Inter, sans-serif; .blog-intro { font-size: 1.25rem; @@ -66,6 +65,7 @@ h4, h5, h6 { + font-weight: 600; margin-top: 1.5rem; } From 6f678e26cd5e063475358b81ff303a978daa421d Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 1 Jun 2020 20:27:20 +0530 Subject: [PATCH 057/485] refactor: fonts --- frappe/public/scss/blog.scss | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/frappe/public/scss/blog.scss b/frappe/public/scss/blog.scss index 16266b5da2..92a86d6c95 100644 --- a/frappe/public/scss/blog.scss +++ b/frappe/public/scss/blog.scss @@ -32,41 +32,40 @@ } h1 { + margin-top: 2rem; + font-weight: 800; font-size: 2rem; } h1.blog-header { + margin-top: 2rem; + font-weight: 800; font-size: 2.5rem; } h2 { + margin-top: 2rem; + font-weight: 700; font-size: 1.75rem; } h3 { + margin-top: 2rem; + font-weight: 600; font-size: 1.5rem; } h4 { + font-weight: 500; + margin-top: 1.5rem; font-size: 1.25rem; } h5, h6 { - font-size: 1rem; - } - - h1, - h2, - h3 { - margin-top: 2rem; - } - - h4, - h5, - h6 { - font-weight: 600; + font-weight: 500; margin-top: 1.5rem; + font-size: 1rem; } img { From 8e1830de33964a44e39ac7485f2abd810e2941b4 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 1 Jun 2020 20:46:20 +0530 Subject: [PATCH 058/485] refactor: remove featured tag --- .../blog_post/templates/blog_post.html | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/frappe/website/doctype/blog_post/templates/blog_post.html b/frappe/website/doctype/blog_post/templates/blog_post.html index df0300ff23..2bb4b6025b 100644 --- a/frappe/website/doctype/blog_post/templates/blog_post.html +++ b/frappe/website/doctype/blog_post/templates/blog_post.html @@ -18,21 +18,12 @@

{{ blog_intro }}

-
-
- {{ frappe.format_date(published_on) }} - {% if read_time %} - · - {{ read_time }} min read - {% endif %} -
-
- {%-if featured -%} -
- {{ _("Featured") }} -
- {%- endif -%} -
+
+ {{ frappe.format_date(published_on) }} + {% if read_time %} + · + {{ read_time }} min read + {% endif %}
From 5cbb72a0eedce3bf6b368a1f5aae034ce2ebb241 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 1 Jun 2020 20:46:29 +0530 Subject: [PATCH 059/485] refactor: style for hr and blockquote --- frappe/public/scss/blog.scss | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/frappe/public/scss/blog.scss b/frappe/public/scss/blog.scss index 92a86d6c95..888d699457 100644 --- a/frappe/public/scss/blog.scss +++ b/frappe/public/scss/blog.scss @@ -31,6 +31,10 @@ margin-top: 1rem; } + hr { + margin: 2rem auto; + } + h1 { margin-top: 2rem; font-weight: 800; @@ -76,9 +80,11 @@ margin: 2rem auto; width: 90%; padding-top: 2rem; - padding-bottom: 2rem; + padding-bottom: 0.8rem; + border-top: 1px solid $gray-200; border-bottom: 1px solid $gray-200; + text-align: center; font-size: 1.2rem; font-weight: 500; From fb74a095385154bac1ab64f82eedad49bc7b24a6 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 2 Jun 2020 13:08:35 +0530 Subject: [PATCH 060/485] refactor: use custom rules instead of utility classes --- frappe/public/scss/blog.scss | 58 ++++++++++++++++++- .../blog_post/templates/blog_post.html | 8 +-- .../blog_post/templates/blog_post_list.html | 2 +- .../blog_post/templates/blog_post_row.html | 8 +-- 4 files changed, 66 insertions(+), 10 deletions(-) diff --git a/frappe/public/scss/blog.scss b/frappe/public/scss/blog.scss index 888d699457..b2ddece217 100644 --- a/frappe/public/scss/blog.scss +++ b/frappe/public/scss/blog.scss @@ -1,3 +1,43 @@ +.blog-list { + display: flex; + flex-wrap: wrap; + margin-right: -15px; + margin-left: -15px; +} + +.blog-card { + margin-bottom: 3rem; + position: relative; + width: 100%; + padding-right: 15px; + padding-left: 15px; + + flex: 0 0 33.33333%; + max-width: 33.33333%; + + &.featured { + flex: 0 0 66.66667%; + max-width: 66.66667%; + } + + .card-body { + display: flex; + flex-direction: column; + justify-content: space-between; + } + + .blog-card-footer { + display: flex; + align-items: center; + margin-top: 0.5rem; + + .avatar { + margin-right: 0.5rem; + border-radius: 50%; + } + } +} + .card-img-top { width: 100%; overflow: hidden; @@ -15,6 +55,22 @@ max-width: 800px; margin: 0px auto; + .blog-content { + margin-bottom: 1rem; + + .blog-header { + margin-bottom: 3rem; + margin-top: 3rem; + } + } + + .blog-footer { + display: flex; + justify-content: space-between; + color: #8d99a6; + margin-top: 3rem; + } + .blog-intro { font-size: 1.25rem; font-weight: 300; @@ -41,7 +97,7 @@ font-size: 2rem; } - h1.blog-header { + h1.blog-title { margin-top: 2rem; font-weight: 800; font-size: 2.5rem; diff --git a/frappe/website/doctype/blog_post/templates/blog_post.html b/frappe/website/doctype/blog_post/templates/blog_post.html index 2bb4b6025b..d335cb6613 100644 --- a/frappe/website/doctype/blog_post/templates/blog_post.html +++ b/frappe/website/doctype/blog_post/templates/blog_post.html @@ -6,15 +6,15 @@ {% block page_content %}
-
+
-
+
-

{{ title }}

+

{{ title }}

{{ blog_intro }}

@@ -44,7 +44,7 @@ ]) }} {% endif %} -
+
Published on {{ frappe.format_date(published_on) }}
diff --git a/frappe/website/doctype/blog_post/templates/blog_post_list.html b/frappe/website/doctype/blog_post/templates/blog_post_list.html index a841bff627..a621c9d83a 100644 --- a/frappe/website/doctype/blog_post/templates/blog_post_list.html +++ b/frappe/website/doctype/blog_post/templates/blog_post_list.html @@ -20,7 +20,7 @@ }}
-
+
{% if not result -%}
{{ no_result_message or _("Nothing to show") }} 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 bd5b0b382b..3f0a26a067 100644 --- a/frappe/website/doctype/blog_post/templates/blog_post_row.html +++ b/frappe/website/doctype/blog_post/templates/blog_post_row.html @@ -1,10 +1,10 @@ {%- set post = doc -%} -
+
{{post.title}} - Cover Image
-
+
{%- if post.featured -%} @@ -19,8 +19,8 @@ {%- endif -%}

{{ post.intro }}

-
- +
+
{{ post.full_name }}
From 70b4c611dba3cf1f1154c7325a04695610ab4b71 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 2 Jun 2020 13:26:10 +0530 Subject: [PATCH 061/485] feat: added default cover --- frappe/public/scss/blog.scss | 38 +++++++++++++------ .../blog_post/templates/blog_post_row.html | 8 +++- 2 files changed, 33 insertions(+), 13 deletions(-) diff --git a/frappe/public/scss/blog.scss b/frappe/public/scss/blog.scss index b2ddece217..be05e5dd47 100644 --- a/frappe/public/scss/blog.scss +++ b/frappe/public/scss/blog.scss @@ -26,6 +26,32 @@ justify-content: space-between; } + .card-img-top { + width: 100%; + overflow: hidden; + height: 12rem; + width: auto; + + img { + width: 100%; + min-height: 100%; + } + + .default-cover { + height: 100%; + width: 100%; + padding: 1rem; + display: flex; + align-items: center; + justify-content: center; + background: $gray-200; + + font-size: 1.2rem; + font-weight: 500; + color: $gray-600; + } + } + .blog-card-footer { display: flex; align-items: center; @@ -38,18 +64,6 @@ } } -.card-img-top { - width: 100%; - overflow: hidden; - height: 12rem; - width: auto; - - img { - width: 100%; - min-height: 100%; - } -} - .blog-container { font-size: 16px; max-width: 800px; 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 3f0a26a067..ef706c5e59 100644 --- a/frappe/website/doctype/blog_post/templates/blog_post_row.html +++ b/frappe/website/doctype/blog_post/templates/blog_post_row.html @@ -2,7 +2,13 @@
- {{post.title}} - Cover Image + {% if post.cover_image %} + {{post.title}} - Cover Image + {% else %} +
+ {{ post.title }} +
+ {% endif %}
From 7e1d158636ab9d86a8ee4616126fbcb42c667da6 Mon Sep 17 00:00:00 2001 From: Fumin Date: Tue, 2 Jun 2020 21:00:07 +0800 Subject: [PATCH 062/485] show label for table fields All fields, except table ones, display their labels which is a natural thing to do. --- frappe/templates/print_formats/standard_macros.html | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/templates/print_formats/standard_macros.html b/frappe/templates/print_formats/standard_macros.html index f879dd7e08..d684c60a2d 100644 --- a/frappe/templates/print_formats/standard_macros.html +++ b/frappe/templates/print_formats/standard_macros.html @@ -34,6 +34,7 @@ {%- if data -%} {%- set visible_columns = get_visible_columns(doc.get(df.fieldname), table_meta, df) -%} +
From 3daf89d69c6f5bc71ec17af434681672a71c9486 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 2 Jun 2020 19:31:54 +0530 Subject: [PATCH 063/485] fix: enable pagination for blog --- frappe/public/scss/blog.scss | 4 ++++ .../blog_post/templates/blog_post_list.html | 23 +++++++++++-------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/frappe/public/scss/blog.scss b/frappe/public/scss/blog.scss index be05e5dd47..a78f54f1a7 100644 --- a/frappe/public/scss/blog.scss +++ b/frappe/public/scss/blog.scss @@ -3,6 +3,10 @@ flex-wrap: wrap; margin-right: -15px; margin-left: -15px; + + &.result { + border-bottom: none; + } } .blog-card { diff --git a/frappe/website/doctype/blog_post/templates/blog_post_list.html b/frappe/website/doctype/blog_post/templates/blog_post_list.html index a621c9d83a..625e4645cd 100644 --- a/frappe/website/doctype/blog_post/templates/blog_post_list.html +++ b/frappe/website/doctype/blog_post/templates/blog_post_list.html @@ -20,16 +20,19 @@ }}
-
- {% if not result -%} -
- {{ no_result_message or _("Nothing to show") }} -
- {% else %} - {% for item in result %} - {{ item }} - {% endfor %} - {% endif %} +
+
+ {% if not result -%} +
+ {{ no_result_message or _("Nothing to show") }} +
+ {% else %} + {% for item in result %} + {{ item }} + {% endfor %} + {% endif %} +
+
{% endblock %} From 3a0aa88f4b6d45054806819bdfdc2d5a3b6b6ef4 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Tue, 2 Jun 2020 22:06:37 +0530 Subject: [PATCH 064/485] fix: change 'show' duration options to 'hide' for consistency --- cypress/integration/control_duration.js | 8 +++--- frappe/core/doctype/docfield/docfield.json | 22 ++++++++-------- .../doctype/custom_field/custom_field.json | 26 ++++++++----------- .../customize_form_field.json | 26 ++++++++----------- .../js/frappe/form/controls/duration.js | 8 +++--- frappe/public/js/frappe/ui/filters/filters.js | 4 +-- frappe/public/js/frappe/utils/utils.js | 6 ++--- frappe/utils/data.py | 4 +-- frappe/utils/formatters.py | 4 +-- 9 files changed, 50 insertions(+), 58 deletions(-) diff --git a/cypress/integration/control_duration.js b/cypress/integration/control_duration.js index f304abd3d9..edad759216 100644 --- a/cypress/integration/control_duration.js +++ b/cypress/integration/control_duration.js @@ -4,14 +4,14 @@ context('Control Duration', () => { cy.visit('/desk#workspace/Website'); }); - function get_dialog_with_duration(show_days=1, show_seconds=1) { + function get_dialog_with_duration(hide_days=0, hide_seconds=0) { return cy.dialog({ title: 'Duration', fields: [{ 'fieldname': 'duration', 'fieldtype': 'Duration', - 'show_seconds': show_days, - 'show_days': show_seconds + 'hide_days': hide_days, + 'hide_seconds': hide_seconds }] }); } @@ -37,7 +37,7 @@ context('Control Duration', () => { }); it('should hide days or seconds according to duration options', () => { - get_dialog_with_duration(0, 0).as('dialog'); + get_dialog_with_duration(1, 1).as('dialog'); cy.get('.frappe-control[data-fieldname=duration] input').first().click(); cy.get('.duration-input[data-duration=days]').should('not.be.visible'); cy.get('.duration-input[data-duration=seconds]').should('not.be.visible'); diff --git a/frappe/core/doctype/docfield/docfield.json b/frappe/core/doctype/docfield/docfield.json index 83d3c18453..aab59a5a0a 100644 --- a/frappe/core/doctype/docfield/docfield.json +++ b/frappe/core/doctype/docfield/docfield.json @@ -13,8 +13,8 @@ "fieldname", "precision", "length", - "show_days", - "show_seconds", + "hide_days", + "hide_seconds", "reqd", "search_index", "in_list_view", @@ -453,18 +453,18 @@ "fieldtype": "Column Break" }, { - "default": "1", - "depends_on": "eval:doc.fieldtype === \"Duration\";", - "fieldname": "show_days", + "default": "0", + "depends_on": "eval:doc.fieldtype=='Duration'", + "fieldname": "hide_days", "fieldtype": "Check", - "label": "Show Days" + "label": "Hide Days" }, { - "default": "1", - "depends_on": "eval:doc.fieldtype === \"Duration\";", - "fieldname": "show_seconds", + "default": "0", + "depends_on": "eval:doc.fieldtype=='Duration'", + "fieldname": "hide_seconds", "fieldtype": "Check", - "label": "Show Seconds" + "label": "Hide Seconds" }, { "default": "0", @@ -477,7 +477,7 @@ "idx": 1, "istable": 1, "links": [], - "modified": "2020-05-15 09:06:25.224411", + "modified": "2020-02-06 09:06:25.224413", "modified_by": "Administrator", "module": "Core", "name": "DocField", diff --git a/frappe/custom/doctype/custom_field/custom_field.json b/frappe/custom/doctype/custom_field/custom_field.json index 77490c8c43..6fa7b29161 100644 --- a/frappe/custom/doctype/custom_field/custom_field.json +++ b/frappe/custom/doctype/custom_field/custom_field.json @@ -16,8 +16,8 @@ "column_break_6", "fieldtype", "precision", - "show_seconds", - "show_days", + "hide_seconds", + "hide_days", "options", "fetch_from", "fetch_if_empty", @@ -383,22 +383,18 @@ "label": "In Preview" }, { - "default": "1", - "depends_on": "eval:doc.fieldtype === \"Duration\";", - "fieldname": "show_seconds", + "default": "0", + "depends_on": "eval:doc.fieldtype=='Duration'", + "fieldname": "hide_seconds", "fieldtype": "Check", - "label": "Show Seconds", - "show_days": 1, - "show_seconds": 1 + "label": "Hide Seconds" }, { - "default": "1", - "depends_on": "eval:doc.fieldtype === \"Duration\";", - "fieldname": "show_days", + "default": "0", + "depends_on": "eval:doc.fieldtype=='Duration'", + "fieldname": "hide_days", "fieldtype": "Check", - "label": "Show Days", - "show_days": 1, - "show_seconds": 1 + "label": "Hide Days" }, { "default": "0", @@ -411,7 +407,7 @@ "icon": "fa fa-glass", "idx": 1, "links": [], - "modified": "2020-05-15 23:43:00.123572", + "modified": "2020-02-06 23:43:00.123575", "modified_by": "Administrator", "module": "Custom", "name": "Custom Field", diff --git a/frappe/custom/doctype/customize_form_field/customize_form_field.json b/frappe/custom/doctype/customize_form_field/customize_form_field.json index f422c36e61..267213517c 100644 --- a/frappe/custom/doctype/customize_form_field/customize_form_field.json +++ b/frappe/custom/doctype/customize_form_field/customize_form_field.json @@ -11,8 +11,8 @@ "label", "fieldtype", "fieldname", - "show_seconds", - "show_days", + "hide_seconds", + "hide_days", "reqd", "unique", "in_list_view", @@ -393,22 +393,18 @@ "label": "In Preview" }, { - "default": "1", - "depends_on": "eval:doc.fieldtype === \"Duration\";", - "fieldname": "show_seconds", + "default": "0", + "depends_on": "eval:doc.fieldtype=='Duration'", + "fieldname": "hide_seconds", "fieldtype": "Check", - "label": "Show Seconds", - "show_days": 1, - "show_seconds": 1 + "label": "Hide Seconds" }, { - "default": "1", - "depends_on": "eval:doc.fieldtype === \"Duration\";", - "fieldname": "show_days", + "default": "0", + "depends_on": "eval:doc.fieldtype=='Duration'", + "fieldname": "hide_days", "fieldtype": "Check", - "label": "Show Days", - "show_days": 1, - "show_seconds": 1 + "label": "Hide Days" }, { "default": "0", @@ -421,7 +417,7 @@ "idx": 1, "istable": 1, "links": [], - "modified": "2020-05-15 23:45:46.810869", + "modified": "2020-06-02 23:45:46.810868", "modified_by": "Administrator", "module": "Custom", "name": "Customize Form Field", diff --git a/frappe/public/js/frappe/form/controls/duration.js b/frappe/public/js/frappe/form/controls/duration.js index 58df8e15e6..e70afd6e65 100644 --- a/frappe/public/js/frappe/form/controls/duration.js +++ b/frappe/public/js/frappe/form/controls/duration.js @@ -13,10 +13,10 @@ frappe.ui.form.ControlDuration = frappe.ui.form.ControlData.extend({
` ); this.$wrapper.append(this.$picker); - this.build_numeric_input("days", !this.duration_options.show_days); + this.build_numeric_input("days", this.duration_options.hide_days); this.build_numeric_input("hours", false); this.build_numeric_input("minutes", false); - this.build_numeric_input("seconds", !this.duration_options.show_seconds); + this.build_numeric_input("seconds", this.duration_options.hide_seconds); this.set_duration_picker_value(this.value); this.$picker.hide(); this.bind_events(); @@ -130,10 +130,10 @@ frappe.ui.form.ControlDuration = frappe.ui.form.ControlData.extend({ if (this.inputs) { total_duration.minutes = parseInt(this.inputs.minutes.val()); total_duration.hours = parseInt(this.inputs.hours.val()); - if (this.duration_options.show_days) { + if (!this.duration_options.hide_days) { total_duration.days = parseInt(this.inputs.days.val()); } - if (this.duration_options.show_seconds) { + if (!this.duration_options.hide_seconds) { total_duration.seconds = parseInt(this.inputs.seconds.val()); } } diff --git a/frappe/public/js/frappe/ui/filters/filters.js b/frappe/public/js/frappe/ui/filters/filters.js index f8f0535b83..a775413d39 100644 --- a/frappe/public/js/frappe/ui/filters/filters.js +++ b/frappe/public/js/frappe/ui/filters/filters.js @@ -202,8 +202,8 @@ frappe.ui.FilterList = Class.extend({ value = {0:"No", 1:"Yes"}[cint(value)]; } else if (field.df.original_type === "Duration") { let duration_options = { - show_days: field.df.show_days, - show_seconds: field.df.show_seconds + hide_days: field.df.hide_days, + hide_seconds: field.df.hide_seconds }; value = frappe.utils.get_formatted_duration(value, duration_options); } diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index f4dde5804f..38c22c9c9f 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -856,7 +856,7 @@ Object.assign(frappe.utils, { minutes: Math.floor(secs % 3600 / 60), seconds: Math.floor(secs % 60) }; - if (!duration_options.show_days) { + if (duration_options.hide_days) { total_duration.hours = Math.floor(secs / 3600); total_duration.days = 0; } @@ -882,8 +882,8 @@ Object.assign(frappe.utils, { get_duration_options: function(docfield) { let duration_options = { - show_days: docfield.show_days, - show_seconds: docfield.show_seconds + hide_days: docfield.hide_days, + hide_seconds: docfield.hide_seconds }; return duration_options; } diff --git a/frappe/utils/data.py b/frappe/utils/data.py index 1a4604ffff..a046aca144 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -336,7 +336,7 @@ def format_datetime(datetime_string, format_string=None): formatted_datetime = datetime.strftime('%Y-%m-%d %H:%M:%S') return formatted_datetime -def format_duration(seconds, show_days=True): +def format_duration(seconds, hide_days=False): total_duration = { 'days': math.floor(seconds / (3600 * 24)), 'hours': math.floor(seconds % (3600 * 24) / 3600), @@ -344,7 +344,7 @@ def format_duration(seconds, show_days=True): 'seconds': math.floor(seconds % 60) } - if not show_days: + if hide_days: total_duration['hours'] = math.floor(seconds / 3600) total_duration['days'] = 0 diff --git a/frappe/utils/formatters.py b/frappe/utils/formatters.py index d7646eeb71..d68102ae9e 100644 --- a/frappe/utils/formatters.py +++ b/frappe/utils/formatters.py @@ -91,7 +91,7 @@ def format_value(value, df=None, doc=None, currency=None, translated=False): return ', '.join(values) elif df.get("fieldtype") == "Duration": - show_days = df.show_days - return format_duration(value, show_days) + hide_days = df.hide_days + return format_duration(value, hide_days) return value From a0054f99b2efc0f17577aa7ef7d0fe3d8cba7c11 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Tue, 2 Jun 2020 22:12:24 +0530 Subject: [PATCH 065/485] fix: add duration options to sql files --- frappe/custom/doctype/customize_form/customize_form.py | 4 +++- frappe/database/mariadb/framework_mariadb.sql | 2 ++ frappe/database/postgres/framework_postgres.sql | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/frappe/custom/doctype/customize_form/customize_form.py b/frappe/custom/doctype/customize_form/customize_form.py index 6a54d9c7e6..d4eeba3f93 100644 --- a/frappe/custom/doctype/customize_form/customize_form.py +++ b/frappe/custom/doctype/customize_form/customize_form.py @@ -77,7 +77,9 @@ docfield_properties = { 'allow_bulk_edit': 'Check', 'auto_repeat': 'Link', 'allow_in_quick_entry': 'Check', - 'hide_border': 'Check' + 'hide_border': 'Check', + 'hide_days': 'Check', + 'hide_seconds': 'Check' } allowed_fieldtype_change = (('Currency', 'Float', 'Percent'), ('Small Text', 'Data'), diff --git a/frappe/database/mariadb/framework_mariadb.sql b/frappe/database/mariadb/framework_mariadb.sql index bd93069a3f..af537e0612 100644 --- a/frappe/database/mariadb/framework_mariadb.sql +++ b/frappe/database/mariadb/framework_mariadb.sql @@ -64,6 +64,8 @@ CREATE TABLE `tabDocField` ( `length` int(11) NOT NULL DEFAULT 0, `translatable` int(1) NOT NULL DEFAULT 0, `hide_border` int(1) NOT NULL DEFAULT 0, + `hide_days` int(1) NOT NULL DEFAULT 0, + `hide_seconds` int(1) NOT NULL DEFAULT 0, PRIMARY KEY (`name`), KEY `parent` (`parent`), KEY `label` (`label`), diff --git a/frappe/database/postgres/framework_postgres.sql b/frappe/database/postgres/framework_postgres.sql index 76309e7347..8f77ed6230 100644 --- a/frappe/database/postgres/framework_postgres.sql +++ b/frappe/database/postgres/framework_postgres.sql @@ -64,6 +64,8 @@ CREATE TABLE "tabDocField" ( "length" bigint NOT NULL DEFAULT 0, "translatable" smallint NOT NULL DEFAULT 0, "hide_border" smallint NOT NULL DEFAULT 0, + "hide_days" smallint NOT NULL DEFAULT 0, + "hide_seconds" smallint NOT NULL DEFAULT 0, PRIMARY KEY ("name") ) ; From a0c625df1c87f895f6e787ba04ab344b0d6cea11 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Wed, 3 Jun 2020 19:20:52 +0530 Subject: [PATCH 066/485] fix: Ignore doc validations while importing docs from fixtures --- frappe/core/doctype/doctype/doctype.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index 904deb9990..6ca3cccdba 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -688,6 +688,9 @@ def validate_fields(meta): def check_link_table_options(docname, d): if frappe.flags.in_patch: return + + if frappe.flags.in_fixtures: return + if d.fieldtype in ("Link",) + table_fields: if not d.options: frappe.throw(_("{0}: Options required for Link or Table type field {1} in row {2}").format(docname, d.label, d.idx), DoctypeLinkError) @@ -908,6 +911,8 @@ def validate_fields(meta): frappe.msgprint(text_str + df_options_str, title="Invalid Data Field", raise_exception=True) def check_child_table_option(docfield): + + if frappe.flags.in_fixtures: return if docfield.fieldtype not in ['Table MultiSelect', 'Table']: return doctype = docfield.options From f4a8a5331b6f05c626b2196143bb0fc6aa213eb3 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Wed, 3 Jun 2020 19:26:55 +0530 Subject: [PATCH 067/485] fix: patch for removing old duration options --- frappe/patches.txt | 1 + frappe/patches/v13_0/remove_duration_options.py | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 frappe/patches/v13_0/remove_duration_options.py diff --git a/frappe/patches.txt b/frappe/patches.txt index fb5bf447b7..427b5f29cf 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -288,3 +288,4 @@ execute:frappe.delete_doc("DocType", "Onboarding Slide") execute:frappe.delete_doc("DocType", "Onboarding Slide Field") execute:frappe.delete_doc("DocType", "Onboarding Slide Help Link") frappe.patches.v13_0.update_date_filters_in_user_settings +frappe.patches.v13_0.remove_duration_options diff --git a/frappe/patches/v13_0/remove_duration_options.py b/frappe/patches/v13_0/remove_duration_options.py new file mode 100644 index 0000000000..65d14c6725 --- /dev/null +++ b/frappe/patches/v13_0/remove_duration_options.py @@ -0,0 +1,14 @@ +# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors +# MIT License. See license.txt + +from __future__ import unicode_literals +import frappe + +def execute(): + if frappe.db.has_column('DocField', 'show_days'): + frappe.db.sql('alter table tabDocField drop column show_days') + + if frappe.db.has_column('DocField', 'show_seconds'): + frappe.db.sql('alter table tabDocField drop column show_seconds') + + frappe.clear_cache(doctype='DocField') \ No newline at end of file From 0cc31d2fb75ac039562d11db363f0c87365c28a3 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 4 Jun 2020 12:10:09 +0530 Subject: [PATCH 068/485] style: fix minor linting issues --- frappe/public/scss/blog.scss | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/frappe/public/scss/blog.scss b/frappe/public/scss/blog.scss index a78f54f1a7..7523a9cdc0 100644 --- a/frappe/public/scss/blog.scss +++ b/frappe/public/scss/blog.scss @@ -34,7 +34,6 @@ width: 100%; overflow: hidden; height: 12rem; - width: auto; img { width: 100%; @@ -73,15 +72,6 @@ max-width: 800px; margin: 0px auto; - .blog-content { - margin-bottom: 1rem; - - .blog-header { - margin-bottom: 3rem; - margin-top: 3rem; - } - } - .blog-footer { display: flex; justify-content: space-between; @@ -95,8 +85,14 @@ } .blog-content { + margin-bottom: 1rem; line-height: 1.8; + .blog-header { + margin-bottom: 3rem; + margin-top: 3rem; + } + p { margin-bottom: 1.2rem; } From cae267723f7a4d8b1a9cd0f9f421b44d0977010c Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Thu, 4 Jun 2020 13:40:28 +0530 Subject: [PATCH 069/485] fix: Incorrect currency precision --- frappe/public/js/frappe/form/formatters.js | 8 ++++++-- frappe/utils/data.py | 9 ++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js index d178c59100..6e08255e17 100644 --- a/frappe/public/js/frappe/form/formatters.js +++ b/frappe/public/js/frappe/form/formatters.js @@ -69,8 +69,12 @@ frappe.form.formatters = { var decimals = parts.length > 1 ? parts[1] : ""; // parts.length == 2 ??? if ( decimals.length < 3 || decimals.length < precision ) { - const fraction = frappe.model.get_value(":Currency", currency, "fraction_units") || 100; // if not set, minimum 2. - precision = cstr(fraction).length - 1; + const fraction = frappe.model.get_value(":Currency", currency, "smallest_currency_fraction_value") || 100; // if not set, minimum 2. + let fraction_parts = cstr(fraction).split("."); + + if (fraction_parts.length > 1) { + precision = fraction_parts[1].length; + } } } diff --git a/frappe/utils/data.py b/frappe/utils/data.py index 9796aa3c4a..fe198b7f36 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -442,7 +442,7 @@ def remainder(numerator, denominator, precision=2): else: _remainder = numerator % denominator - return flt(_remainder, precision); + return flt(_remainder, precision) def safe_div(numerator, denominator, precision=2): """ @@ -524,8 +524,11 @@ def fmt_money(amount, precision=None, currency=None): if precision > 2: if len(decimals) < 3: if currency: - fraction = frappe.db.get_value("Currency", currency, "fraction_units", cache=True) or 100 - precision = len(cstr(fraction)) - 1 + fraction = frappe.db.get_value("Currency", currency, "smallest_currency_fraction_value", cache=True) or 100 + fraction_parts = cstr(fraction).split(".") + + if len(fraction_parts) > 1: + precision = len(fraction_parts[1]) else: precision = number_format_precision elif len(decimals) < precision: From 640d2d367f767762bd7fa85616c4c12738598593 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 4 Jun 2020 17:31:06 +0530 Subject: [PATCH 070/485] fix: parse_json instead of json.loads --- .../session_default_settings/session_default_settings.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/core/doctype/session_default_settings/session_default_settings.py b/frappe/core/doctype/session_default_settings/session_default_settings.py index 453ece2890..7b4bd19e9a 100644 --- a/frappe/core/doctype/session_default_settings/session_default_settings.py +++ b/frappe/core/doctype/session_default_settings/session_default_settings.py @@ -28,8 +28,7 @@ def get_session_default_values(): @frappe.whitelist() def set_session_default_values(default_values): - if not frappe.flags.in_test: - default_values = json.loads(default_values) + default_values = frappe.parse_json(default_values) for entry in default_values: try: frappe.defaults.set_user_default(entry, default_values.get(entry)) From 96c765bb67bd25977f4c830f3a0ac2b1c100bf9b Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 4 Jun 2020 17:48:39 +0530 Subject: [PATCH 071/485] refactor: use bootstrap classes and sass variables --- frappe/public/scss/blog.scss | 14 ++------------ .../blog_post/templates/blog_post_list.html | 2 +- .../doctype/blog_post/templates/blog_post_row.html | 2 +- .../website/website_theme/standard/standard.json | 2 +- 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/frappe/public/scss/blog.scss b/frappe/public/scss/blog.scss index 7523a9cdc0..f16e04b6df 100644 --- a/frappe/public/scss/blog.scss +++ b/frappe/public/scss/blog.scss @@ -10,19 +10,9 @@ } .blog-card { - margin-bottom: 3rem; + margin-bottom: 2rem; position: relative; width: 100%; - padding-right: 15px; - padding-left: 15px; - - flex: 0 0 33.33333%; - max-width: 33.33333%; - - &.featured { - flex: 0 0 66.66667%; - max-width: 66.66667%; - } .card-body { display: flex; @@ -75,7 +65,7 @@ .blog-footer { display: flex; justify-content: space-between; - color: #8d99a6; + color: $text-muted; margin-top: 3rem; } diff --git a/frappe/website/doctype/blog_post/templates/blog_post_list.html b/frappe/website/doctype/blog_post/templates/blog_post_list.html index 625e4645cd..2677c70f92 100644 --- a/frappe/website/doctype/blog_post/templates/blog_post_list.html +++ b/frappe/website/doctype/blog_post/templates/blog_post_list.html @@ -21,7 +21,7 @@
-
+
{% if not result -%}
{{ no_result_message or _("Nothing to show") }} 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 ef706c5e59..7daf27adc8 100644 --- a/frappe/website/doctype/blog_post/templates/blog_post_row.html +++ b/frappe/website/doctype/blog_post/templates/blog_post_row.html @@ -1,5 +1,5 @@ {%- set post = doc -%} -
+
{% if post.cover_image %} diff --git a/frappe/website/website_theme/standard/standard.json b/frappe/website/website_theme/standard/standard.json index 11527a5229..e2e3bbcf28 100644 --- a/frappe/website/website_theme/standard/standard.json +++ b/frappe/website/website_theme/standard/standard.json @@ -9,7 +9,7 @@ "doctype": "Website Theme", "font_properties": "wght:400;500;600;700;800", "idx": 28, - "modified": "2020-05-19 00:33:58.011046", + "modified": "2020-06-04 17:47:09.207101", "modified_by": "Administrator", "module": "Website", "name": "Standard", From 03c0b71df5c60b7d2926bf40d3c3c4d7681d3540 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 4 Jun 2020 17:51:36 +0530 Subject: [PATCH 072/485] refactor: translate text in blog template --- frappe/website/doctype/blog_post/templates/blog_post.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/doctype/blog_post/templates/blog_post.html b/frappe/website/doctype/blog_post/templates/blog_post.html index d335cb6613..f72f095deb 100644 --- a/frappe/website/doctype/blog_post/templates/blog_post.html +++ b/frappe/website/doctype/blog_post/templates/blog_post.html @@ -46,7 +46,7 @@ {% endif %}
- Published on {{ frappe.format_date(published_on) }} + {{ _('Published on') }} {{ frappe.format_date(published_on) }}
{% if social_links %} From 7696d57c30992b88d1c1c1123a2cfa6e4ac57e8c Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 4 Jun 2020 17:54:31 +0530 Subject: [PATCH 073/485] style: use rem instead of pixel --- frappe/public/scss/blog.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/scss/blog.scss b/frappe/public/scss/blog.scss index f16e04b6df..35f5132563 100644 --- a/frappe/public/scss/blog.scss +++ b/frappe/public/scss/blog.scss @@ -58,7 +58,7 @@ } .blog-container { - font-size: 16px; + font-size: 1rem; max-width: 800px; margin: 0px auto; From 59a1ee6a823ad6d29f4cb8951304ae67947f1941 Mon Sep 17 00:00:00 2001 From: prssanna Date: Thu, 4 Jun 2020 18:49:01 +0530 Subject: [PATCH 074/485] feat: date range in leaderboard --- frappe/desk/leaderboard.py | 13 +++-- frappe/desk/page/leaderboard/leaderboard.js | 57 ++++++++++----------- 2 files changed, 36 insertions(+), 34 deletions(-) diff --git a/frappe/desk/leaderboard.py b/frappe/desk/leaderboard.py index 1ebf32febe..e5654c853f 100644 --- a/frappe/desk/leaderboard.py +++ b/frappe/desk/leaderboard.py @@ -14,13 +14,16 @@ def get_leaderboards(): return leaderboards @frappe.whitelist() -def get_energy_point_leaderboard(from_date, company = None, field = None, limit = None): +def get_energy_point_leaderboard(date_range, company = None, field = None, limit = None): + filters = [ + ['type', '!=', 'Review'], + ] + if date_range: + date_range = frappe.parse_json(date_range) + filters.append(['creation', 'between', [date_range[0], date_range[1]]]) energy_point_users = frappe.db.get_all('Energy Point Log', fields = ['user as name', 'sum(points) as value'], - filters = [ - ['type', '!=', 'Review'], - ['creation', '>', from_date] - ], + filters = filters, group_by = 'user', order_by = 'value desc' ) diff --git a/frappe/desk/page/leaderboard/leaderboard.js b/frappe/desk/page/leaderboard/leaderboard.js index 4472a2978a..ecec7f4805 100644 --- a/frappe/desk/page/leaderboard/leaderboard.js +++ b/frappe/desk/page/leaderboard/leaderboard.js @@ -49,7 +49,7 @@ class Leaderboard { this.timespans = [ "This Week", "This Month", "This Quarter", "This Year", "Last Week", "Last Month", "Last Quarter", "Last Year", - "All Time", "Select From Date" + "All Time", "Select Date Range" ]; // for saving current selected filters @@ -113,7 +113,7 @@ class Leaderboard { return {"label": __(d), value: d }; }) ); - this.create_from_date_field(); + this.create_date_range_field(); this.type_select = this.page.add_select(__("Field"), this.options.selected_filter.map(d => { @@ -123,12 +123,12 @@ class Leaderboard { this.timespan_select.on("change", (e) => { this.options.selected_timespan = e.currentTarget.value; - if (this.options.selected_timespan === 'Select From Date') { - this.from_date_field.show(); + if (this.options.selected_timespan === 'Select Date Range') { + this.date_range_field.show(); } else { - this.from_date_field.hide(); - this.make_request(); + this.date_range_field.hide(); } + this.make_request(); }); this.type_select.on("change", (e) => { @@ -137,21 +137,21 @@ class Leaderboard { }); } - create_from_date_field() { + create_date_range_field() { let timespan_field = $(this.parent).find(`.frappe-control[data-original-title='Timespan']`); - this.from_date_field = $(`
`).insertAfter(timespan_field).hide(); + this.date_range_field = $(`
`).insertAfter(timespan_field).hide(); let date_field = frappe.ui.form.make_control({ df: { - fieldtype: 'Date', - fieldname: 'selected_from_date', - placeholder: frappe.datetime.month_start(), - default: frappe.datetime.month_start(), + fieldtype: 'DateRange', + fieldname: 'selected_date_range', + placeholder: "Date Range", + default: [frappe.datetime.month_start(), frappe.datetime.now_date()], input_class: 'input-sm', reqd: 1, change: () => { - this.selected_from_date = date_field.get_value(); - if (this.selected_from_date) this.make_request(); + this.selected_date_range = date_field.get_value(); + if (this.selected_date_range) this.make_request(); } }, parent: $(this.parent).find('.from-date-field'), @@ -225,7 +225,7 @@ class Leaderboard { frappe.call( this.leaderboard_config[this.options.selected_doctype].method, { - 'from_date': this.get_from_date(), + 'date_range': this.get_date_range(), 'company': this.options.selected_company, 'field': this.options.selected_filter_item, 'limit': this.leaderboard_limit, @@ -375,23 +375,22 @@ class Leaderboard { `); } - get_from_date() { + get_date_range() { let timespan = this.options.selected_timespan.toLowerCase(); let current_date = frappe.datetime.now_date(); - let get_from_date = { - "this week": frappe.datetime.week_start(), - "this month": frappe.datetime.month_start(), - "this quarter": frappe.datetime.quarter_start(), - "this year": frappe.datetime.year_start(), - "last week": frappe.datetime.add_days(current_date, -7), - "last month": frappe.datetime.add_months(current_date, -1), - "last quarter": frappe.datetime.add_months(current_date, -3), - "last year": frappe.datetime.add_months(current_date, -12), - "all time": "", - "select from date": this.selected_from_date || frappe.datetime.month_start() + let date_range_map = { + "this week": [frappe.datetime.week_start(), frappe.datetime.now_date()], + "this month": [frappe.datetime.month_start(), frappe.datetime.now_date()], + "this quarter": [frappe.datetime.quarter_start(), frappe.datetime.now_date()], + "this year": [frappe.datetime.year_start(), frappe.datetime.now_date()], + "last week": [frappe.datetime.add_days(current_date, -7), frappe.datetime.now_date()], + "last month": [frappe.datetime.add_months(current_date, -1), frappe.datetime.now_date()], + "last quarter": [frappe.datetime.add_months(current_date, -3), frappe.datetime.now_date()], + "last year": [frappe.datetime.add_months(current_date, -12), frappe.datetime.now_date()], + "all time": null, + "select date range": this.selected_date_range || [frappe.datetime.month_start(), frappe.datetime.now_date()] } - - return get_from_date[timespan]; + return date_range_map[timespan]; } } From 6c4296c44afc4a265c4c12ea40a69768fdaef2c8 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 4 Jun 2020 20:18:39 +0530 Subject: [PATCH 075/485] feat: add page switcher for mobile view --- .../public/js/frappe/views/desktop/desktop.js | 27 ++++++++++++-- frappe/public/less/desktop.less | 37 +++++++++++++++++++ 2 files changed, 61 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/views/desktop/desktop.js b/frappe/public/js/frappe/views/desktop/desktop.js index 51add61f07..60dbc928c9 100644 --- a/frappe/public/js/frappe/views/desktop/desktop.js +++ b/frappe/public/js/frappe/views/desktop/desktop.js @@ -26,14 +26,25 @@ export default class Desktop { } make_container() { - this.container = $(`
+ this.container = $(` +
-
+
+
+
+ +
+
+
+
`); this.container.appendTo(this.wrapper); this.sidebar = this.container.find(".desk-sidebar"); this.body = this.container.find(".desk-body"); + this.current_title = this.container.find(".current-title"); + this.mobile_list = this.container.find(".mobile-list"); + this.page_switcher = this.container.find(".page-switcher"); } fetch_desktop_settings() { @@ -73,7 +84,9 @@ export default class Desktop { this.current_page = item.name; } let $item = get_sidebar_item(item); - $item.appendTo(this.sidebar); + + $item.appendTo(this.mobile_list); + $item.clone().appendTo(this.sidebar); this.sidebar_items[item.name] = $item; }; @@ -84,6 +97,7 @@ export default class Desktop { `
${__(name)}
` ); $title.appendTo(this.sidebar); + $title.clone().appendTo(this.mobile_list); }; this.sidebar_categories.forEach(category => { @@ -94,6 +108,11 @@ export default class Desktop { }); } }); + if (frappe.is_mobile) { + this.page_switcher.on('click', () => { + this.mobile_list.toggle(); + }); + } } show_page(page) { @@ -106,6 +125,8 @@ export default class Desktop { this.sidebar_items[page].addClass("selected"); } this.current_page = page; + this.mobile_list.hide(); + this.current_title.empty().append(this.current_page); localStorage.current_desk_page = page; this.pages[page] ? this.pages[page].show() : this.make_page(page); } diff --git a/frappe/public/less/desktop.less b/frappe/public/less/desktop.less index 08dc68b9bf..7711075f36 100644 --- a/frappe/public/less/desktop.less +++ b/frappe/public/less/desktop.less @@ -3,6 +3,40 @@ .desk-container { margin-top: 20px; + .page-switcher { + border-radius: 5px; + display: none; + border: 1px solid @border-color; + background-color: @panel-bg; + padding: 8px 15px; + justify-content: space-between; + align-items: center; + margin-bottom: 10px; + } + + .mobile-list { + display: none; + border-radius: 5px; + padding: 8px 15px; + border: 1px solid @border-color; + + .sidebar-item { + font-size: 12px; + font-weight: bold; + margin-bottom: 1px; + display: flex; + padding: 10px 15px; + border-radius: 4px; + text-decoration: none; + cursor: pointer; + text-rendering: optimizelegibility; + + &.selected { + background-color: @panel-bg; + } + } + } + .desk-sidebar { width: 20rem; display: block; @@ -103,6 +137,9 @@ .desk-body { padding-left: 15px !important; } + .page-switcher { + display: flex; + } } } From 8455d93e5ba44a3f02c3940ae8d905c391135c67 Mon Sep 17 00:00:00 2001 From: prssanna Date: Thu, 4 Jun 2020 19:45:17 +0530 Subject: [PATCH 076/485] fix: better validation message if fetch from field doesn't exist --- frappe/model/base_document.py | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index 106d21eb51..604d13b830 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -504,19 +504,7 @@ class BaseDocument(object): for _df in fields_to_fetch: if self.is_new() or self.docstatus != 1 or _df.allow_on_submit: - fetch_from_fieldname = _df.fetch_from.split('.')[-1] - value = values[fetch_from_fieldname] - if _df.fieldtype == 'Small Text' or _df.fieldtype == 'Text' or _df.fieldtype == 'Data': - if fetch_from_fieldname in default_fields: - from frappe.model.meta import get_default_df - fetch_from_df = get_default_df(fetch_from_fieldname) - else: - fetch_from_df = frappe.get_meta(doctype).get_field(fetch_from_fieldname) - - fetch_from_ft = fetch_from_df.get('fieldtype') - if fetch_from_ft == 'Text Editor' and value: - value = unescape_html(strip_html(value)) - setattr(self, _df.fieldname, value) + self.set_fetch_from_value(doctype, _df, values) notify_link_count(doctype, docname) @@ -531,6 +519,27 @@ class BaseDocument(object): return invalid_links, cancelled_links + def set_fetch_from_value(self, doctype, df, values): + fetch_from_fieldname = df.fetch_from.split('.')[-1] + value = values[fetch_from_fieldname] + if df.fieldtype == 'Small Text' or df.fieldtype == 'Text' or df.fieldtype == 'Data': + if fetch_from_fieldname in default_fields: + from frappe.model.meta import get_default_df + fetch_from_df = get_default_df(fetch_from_fieldname) + else: + fetch_from_df = frappe.get_meta(doctype).get_field(fetch_from_fieldname) + + if not fetch_from_df: + frappe.throw( + _('Please check the value of Fetch From set in {}').format(df.label), + title = 'Wrong Fetch From Value' + ) + + fetch_from_ft = fetch_from_df.get('fieldtype') + if fetch_from_ft == 'Text Editor' and value: + value = unescape_html(strip_html(value)) + setattr(self, df.fieldname, value) + def _validate_selects(self): if frappe.flags.in_import: return From d899b1a9a2bb8b20c2a9e5b75bb275ccbc685e8f Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Fri, 5 Jun 2020 13:33:08 +0530 Subject: [PATCH 077/485] feat(Communication): set avg response time in parent --- .../doctype/communication/communication.py | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/frappe/core/doctype/communication/communication.py b/frappe/core/doctype/communication/communication.py index 20e4774add..e2dab3b7fc 100644 --- a/frappe/core/doctype/communication/communication.py +++ b/frappe/core/doctype/communication/communication.py @@ -448,13 +448,16 @@ def update_parent_document_on_communication(doc): # if status has a "Replied" option, then update the status for received communication if ('Replied' in options) and doc.sent_or_received=="Received": - parent.db_set("status", "Open") + parent.status = "Open" + parent.flags.ignore_mandatory = True + parent.save() apply_assignment_rule(parent) else: # update the modified date for document parent.update_modified() update_mins_to_first_communication(parent, doc) + set_avg_response_time(parent, doc) parent.run_method('notify_communication', doc) parent.notify_update() @@ -465,3 +468,25 @@ def update_mins_to_first_communication(parent, communication): if parent.meta.has_field('first_responded_on') and communication.sent_or_received == "Sent": parent.db_set('first_responded_on', first_responded_on) parent.db_set('mins_to_first_response', round(time_diff_in_seconds(first_responded_on, parent.creation) / 60), 2) + +def set_avg_response_time(parent, communication): + if parent.meta.has_field("avg_response_time") and communication.sent_or_received == "Sent": + # avg response time for all the responses + communications = frappe.get_list("Communication", filters={ + "reference_doctype": parent.doctype, + "reference_name": parent.name + }, + fields=["sent_or_received", "name", "creation"], + order_by="creation" + ) + + if len(communications): + response_times = [] + for i in range(len(communications)): + if communications[i].sent_or_received == "Sent" and communications[i-1].sent_or_received == "Received": + response_time = round(time_diff_in_seconds(communications[i].creation, communications[i-1].creation), 2) + if response_time > 0: + response_times.append(response_time) + if response_times: + avg_response_time = sum(response_times) / len(response_times) + parent.db_set("avg_response_time", avg_response_time) \ No newline at end of file From 253e73ed66db97d21f2690ad8c62bb547cbb4fdc Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 5 Jun 2020 18:23:50 +0530 Subject: [PATCH 078/485] fix(text-editor): List UI - Remove hacks for list render - Use quill styles for read-only mode and print-format to keep style consistent --- .../js/frappe/form/controls/text_editor.js | 94 +---------- frappe/public/less/print.less | 16 +- frappe/public/less/quill.less | 158 +++++++++--------- .../print_formats/standard_macros.html | 2 +- 4 files changed, 85 insertions(+), 185 deletions(-) diff --git a/frappe/public/js/frappe/form/controls/text_editor.js b/frappe/public/js/frappe/form/controls/text_editor.js index 5e73889490..3c0f7d5110 100644 --- a/frappe/public/js/frappe/form/controls/text_editor.js +++ b/frappe/public/js/frappe/form/controls/text_editor.js @@ -1,10 +1,5 @@ import Quill from 'quill'; -// replace

tag with

-const Block = Quill.import('blots/block'); -Block.tagName = 'DIV'; -Quill.register(Block, true); - const CodeBlockContainer = Quill.import('formats/code-block-container'); CodeBlockContainer.tagName = 'PRE'; Quill.register(CodeBlockContainer, true); @@ -17,7 +12,8 @@ Table.create = (value) => { node.classList.add('table'); node.classList.add('table-bordered'); return node; -} +}; + Quill.register(Table, true); // link without href @@ -28,7 +24,7 @@ class MyLink extends Link { let node = super.create(value); value = this.sanitize(value); node.setAttribute('href', value); - if(value.startsWith('/') || value.indexOf(window.location.host)) { + if (value.startsWith('/') || value.indexOf(window.location.host)) { // no href if internal link node.removeAttribute('target'); } @@ -73,7 +69,7 @@ Quill.register(CustomColor, true); frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({ make_wrapper() { this._super(); - this.$wrapper.find(".like-disabled-input").addClass('text-editor-print'); + this.$wrapper.find(".like-disabled-input").addClass('ql-editor'); }, make_input() { @@ -203,91 +199,9 @@ frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({ get_input_value() { let value = this.quill ? this.quill.root.innerHTML : ''; - // quill keeps ol as a common container for both type of lists - // and uses css for appearances, this is not semantic - // so we convert ol to ul if it is unordered - const $value = $(`
${value}
`); - $value.find('ol li[data-list=bullet]:first-child').each((i, li) => { - let $li = $(li); - let $parent = $li.parent(); - let $children = $parent.children(); - let $ul = $('
    ').append($children); - $parent.replaceWith($ul); - }); - value = this.convertLists($value.html()); return value; }, - // hack - // https://github.com/quilljs/quill/issues/979 - convertLists(richtext) { - const tempEl = window.document.createElement('div'); - tempEl.setAttribute('style', 'display: none;'); - tempEl.innerHTML = richtext; - const startLi = '::startli::'; - const endLi = '::endli::'; - - ['ul','ol'].forEach((type) => { - const startTag = `::start${type}::`; - const endTag = `::end${type}::`; - - // Grab each list, and work on it in turn - Array.from(tempEl.querySelectorAll(type)).forEach((outerListEl) => { - const listChildren = Array.from(outerListEl.children).filter((el) => el.tagName === 'LI'); - - let lastLiLevel = 0; - let currentLiLevel = 0; - let difference = 0; - - // Now work through each li in this list - for (let i = 0; i < listChildren.length; i++) { - const currentLi = listChildren[i]; - lastLiLevel = currentLiLevel; - currentLiLevel = this.getListLevel(currentLi); - difference = currentLiLevel - lastLiLevel; - - // we only need to add tags if the level is changing - if (difference > 0) { - currentLi.before((startLi + startTag).repeat(difference)); - } else if (difference < 0) { - currentLi.before((endTag + endLi).repeat(-difference)); - } - - if (i === listChildren.length - 1) { - // last li, account for the fact that it might not be at level 0 - currentLi.after((endTag + endLi).repeat(currentLiLevel)); - } - } - }); - }); - - // Get the content in the element and replace the temporary tags with new ones - let newContent = tempEl.innerHTML; - - newContent = newContent.replace(/::startul::/g, '
      '); - newContent = newContent.replace(/::endul::/g, '
    '); - newContent = newContent.replace(/::startol::/g, '
      '); - newContent = newContent.replace(/::endol::/g, '
    '); - newContent = newContent.replace(/::startli::/g, '
  • '); - newContent = newContent.replace(/::endli::/g, '
    • '); - - // remove quill classes - newContent = newContent.replace(/data-list=.bullet./g, ''); - newContent = newContent.replace(/class=.ql-indent-../g, ''); - - // ul/ol should not be inside another li - newContent = newContent.replace(/<\/li>
    • /g, '
        '); - newContent = newContent.replace(/<\/li>
        • /g, '
            '); - tempEl.remove(); - - return newContent; - }, - - getListLevel(el) { - const className = el.className || '0'; - return +className.replace(/[^\d]/g, ''); - }, - set_focus() { this.quill.focus(); } diff --git a/frappe/public/less/print.less b/frappe/public/less/print.less index 203b1237c5..813659ffd8 100644 --- a/frappe/public/less/print.less +++ b/frappe/public/less/print.less @@ -1,15 +1 @@ -.text-editor-print { - ul li { - list-style-type: none; - padding-left: 1.5em; - } - - ul li:before { - content: '\2022'; - margin-left: -1.5em; - margin-right: 0.3em; - text-align: right; - white-space: nowrap; - width: 1.2em; - } -} +@import "quill.less"; diff --git a/frappe/public/less/quill.less b/frappe/public/less/quill.less index 0a1384c11d..17351c0026 100644 --- a/frappe/public/less/quill.less +++ b/frappe/public/less/quill.less @@ -1,38 +1,47 @@ -@import "variables.less"; -@import (less) "quill/dist/quill.snow.css"; -@import (less) "quill/dist/quill.bubble.css"; -@import (less) "../js/frappe/form/controls/quill-mention/quill.mention.css"; +@import 'variables.less'; +@import (less) 'quill/dist/quill.snow.css'; +@import (less) 'quill/dist/quill.bubble.css'; +@import (less) '../js/frappe/form/controls/quill-mention/quill.mention.css'; -.ql-toolbar.ql-snow, .ql-container.ql-snow { - border-color: @border-color; - font-family: inherit; +.ql-toolbar.ql-snow, +.ql-container.ql-snow { + border-color: @border-color; + font-family: inherit; } .ql-editor { - font-family: @font-stack; - line-height: 1.6; + white-space: normal; +} - h1, h2, h3, h4, h5 { +.ql-editor { + font-family: @font-stack; + line-height: 1.6; + + h1, + h2, + h3, + h4, + h5 { margin-top: 0.5em; margin-bottom: 0.25em; } } .ql-toolbar.ql-snow { - border-top-left-radius: 4px; - border-top-right-radius: 4px; - background-color: @panel-bg; - padding-bottom: 0; + border-top-left-radius: 4px; + border-top-right-radius: 4px; + background-color: @panel-bg; + padding-bottom: 0; } .ql-container.ql-snow { - border-bottom-left-radius: 4px; - border-bottom-right-radius: 4px; + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; } .ql-snow .ql-editor { - min-height: 400px; - max-height: 600px; + min-height: 400px; + max-height: 600px; } .ql-snow .ql-picker { @@ -40,87 +49,87 @@ } .ql-snow .ql-picker-label { - outline: none; + outline: none; } .ql-formats { - margin-bottom: 8px; + margin-bottom: 8px; } .ql-bubble .ql-editor { - min-height: 100px; - max-height: 300px; - border: 1px solid @light-border-color; - border-radius: 4px; + min-height: 100px; + max-height: 300px; + border: 1px solid @light-border-color; + border-radius: 4px; } .ql-mention-list-container { - z-index: 1; + z-index: 1; } .ql-mention-list { - border-radius: 4px; + border-radius: 4px; } .ql-mention-list-item { - font-size: @text-small; - padding: 10px 12px; - height: initial; - line-height: initial; + font-size: @text-small; + padding: 10px 12px; + height: initial; + line-height: initial; - &.selected { - background-color: @btn-bg; - } + &.selected { + background-color: @btn-bg; + } } .ql-editor .mention { - height: auto; - width: auto; - border-radius: 10px; - border: 1px solid @light-border-color; - padding: 2px 3px; - background-color: @btn-bg; + height: auto; + width: auto; + border-radius: 10px; + border: 1px solid @light-border-color; + padding: 2px 3px; + background-color: @btn-bg; } // table .ql-table { - width: 66px; + width: 66px; - .ql-picker-label::before { - content: 'Table'; - } + .ql-picker-label::before { + content: 'Table'; + } - .ql-picker-options { - [data-value='insert-table']::before { - content: 'Insert Table'; - } - [data-value='insert-row-above']::before { - content: 'Insert Row Above'; - } - [data-value='insert-row-below']::before { - content: 'Insert Row Below'; - } - [data-value='insert-column-right']::before { - content: 'Insert Column Right'; - } - [data-value='insert-column-left']::before { - content: 'Insert Column Left'; - } - [data-value='delete-row']::before { - content: 'Delete Row'; - } - [data-value='delete-column']::before { - content: 'Delete Column'; - } - [data-value='delete-table']::before { - content: 'Delete Table'; - } - } + .ql-picker-options { + [data-value='insert-table']::before { + content: 'Insert Table'; + } + [data-value='insert-row-above']::before { + content: 'Insert Row Above'; + } + [data-value='insert-row-below']::before { + content: 'Insert Row Below'; + } + [data-value='insert-column-right']::before { + content: 'Insert Column Right'; + } + [data-value='insert-column-left']::before { + content: 'Insert Column Left'; + } + [data-value='delete-row']::before { + content: 'Delete Row'; + } + [data-value='delete-column']::before { + content: 'Delete Column'; + } + [data-value='delete-table']::before { + content: 'Delete Table'; + } + } } .ql-editor td { - border: 1px solid @border-color; + border: 1px solid @border-color; } .ql-snow .ql-editor blockquote { @@ -132,12 +141,3 @@ .ql-editor ol { padding-left: 2.5em; } - -.ql-editor li[data-list=ordered] { - list-style-type: decimal; - padding-left: 0; - - &::before { - content: none; - } -} diff --git a/frappe/templates/print_formats/standard_macros.html b/frappe/templates/print_formats/standard_macros.html index f879dd7e08..07ef577aa7 100644 --- a/frappe/templates/print_formats/standard_macros.html +++ b/frappe/templates/print_formats/standard_macros.html @@ -99,7 +99,7 @@ data-fieldname="{{ df.fieldname }}" data-fieldtype="{{ df.fieldtype }}" {%- if df.fieldtype=="Code" %} 
            {{ doc.get(df.fieldname) }}
            {% else -%} - {%- if df.fieldtype=="Text Editor" -%}
            {%- endif -%} + {%- if df.fieldtype=="Text Editor" -%}
            {%- endif -%} {{ doc.get_formatted(df.fieldname, parent_doc or doc, translated=df.translatable) }} {%- if df.fieldtype=="Text Editor" -%}
            {%- endif -%} {% endif -%} From 323aacdedd65ecc99c5a833374c813f9b02ab663 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Fri, 5 Jun 2020 19:11:50 +0530 Subject: [PATCH 079/485] fix: Set in_import flag to false after import --- frappe/core/doctype/data_import_beta/data_import_beta.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/core/doctype/data_import_beta/data_import_beta.py b/frappe/core/doctype/data_import_beta/data_import_beta.py index 912d9e48cf..3c6885360b 100644 --- a/frappe/core/doctype/data_import_beta/data_import_beta.py +++ b/frappe/core/doctype/data_import_beta/data_import_beta.py @@ -85,6 +85,8 @@ def start_import(data_import): frappe.db.rollback() data_import.db_set("status", "Error") frappe.log_error(title=data_import.name) + finally: + frappe.flags.in_import = False frappe.publish_realtime("data_import_refresh", {"data_import": data_import.name}) From abc3d96829ecae343527c73358b19b390c14014b Mon Sep 17 00:00:00 2001 From: Richard Case Date: Fri, 5 Jun 2020 20:25:50 +0000 Subject: [PATCH 080/485] feat: Add canonical head link for SEO --- frappe/templates/base.html | 2 ++ frappe/website/context.py | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/frappe/templates/base.html b/frappe/templates/base.html index 5688ce4fc3..a2c171a651 100644 --- a/frappe/templates/base.html +++ b/frappe/templates/base.html @@ -20,6 +20,8 @@ > {% endblock %} + + {%- block head -%} {% if head_html is defined -%} {{ head_html or "" }} diff --git a/frappe/website/context.py b/frappe/website/context.py index 5663199545..8b2ebd7768 100644 --- a/frappe/website/context.py +++ b/frappe/website/context.py @@ -20,11 +20,13 @@ def get_context(path, args=None): # for (remove leading slash) # path could be overriden in render.resolve_from_map context["path"] = frappe.local.request.path.strip('/ ') + scheme = frappe.local.request.scheme else: context["path"] = path + scheme = 'http' + context.canonical = scheme + '://' + frappe.local.site + '/' + context.path context.route = context.path - context = build_context(context) # set using frappe.respond_as_web_page From 692b69a3e3c92d827b1785c1607e6028229ebe3f Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Sat, 6 Jun 2020 10:46:59 +0530 Subject: [PATCH 081/485] fix: RTL style for text-editor --- frappe/public/css/desk-rtl.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/frappe/public/css/desk-rtl.css b/frappe/public/css/desk-rtl.css index 31321be17d..a38f6864ff 100644 --- a/frappe/public/css/desk-rtl.css +++ b/frappe/public/css/desk-rtl.css @@ -110,4 +110,9 @@ ul.tree-children { } .section-header { direction: ltr; +} + +.ql-editor { + direction: rtl; + text-align: right; } \ No newline at end of file From 74db2ef88bdd535802cbd9a4fe09bd727ef024f2 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Sat, 6 Jun 2020 10:47:23 +0530 Subject: [PATCH 082/485] fix: Update quill editor --- package.json | 3 +- yarn.lock | 352 ++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 308 insertions(+), 47 deletions(-) diff --git a/package.json b/package.json index 477c7a4857..a13be7a84d 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "moment": "^2.20.1", "moment-timezone": "^0.5.28", "quagga": "^0.12.1", - "quill": "2.0.0-dev.2", + "quill": "2.0.0-dev.4", "qz-tray": "^2.0.8", "redis": "^2.8.0", "showdown": "^1.9.1", @@ -54,6 +54,7 @@ "chalk": "^2.3.2", "cypress": "3", "cypress-file-upload": "^3.1.0", + "graphlib": "^2.1.8", "less": "^3.11.1", "node-sass": "^4.13.1", "rollup": "^1.2.2", diff --git a/yarn.lock b/yarn.lock index d858972218..3c5d2b3b91 100644 --- a/yarn.lock +++ b/yarn.lock @@ -252,18 +252,6 @@ "@types/events" "*" "@types/node" "*" -"@types/bunyan@*": - version "1.8.6" - resolved "https://registry.yarnpkg.com/@types/bunyan/-/bunyan-1.8.6.tgz#6527641cca30bedec5feb9ab527b7803b8000582" - integrity sha512-YiozPOOsS6bIuz31ilYqR5SlLif4TBWsousN2aCWLi5233nZSX19tFbcQUPdR7xJ8ypPyxkCGNxg0CIV5n9qxQ== - dependencies: - "@types/node" "*" - -"@types/color-name@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" - integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== - "@types/debug@^4.1.4": version "4.1.5" resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd" @@ -544,6 +532,11 @@ arr-union@^3.1.0: resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= +array-filter@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83" + integrity sha1-uveeYubvTCpMC4MSMtr/7CUfnYM= + array-find-index@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" @@ -628,6 +621,13 @@ atob@^2.1.1: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== +available-typed-arrays@^1.0.0, available-typed-arrays@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz#6b098ca9d8039079ee3f77f7b783c4480ba513f5" + integrity sha512-XWX3OX8Onv97LMk/ftVyBibpGwY5a8SmuxZPzeOxqmuEqUCOM9ZE+uIaD1VNJ5QnvU2UQusvmKbuM1FR8QWGfQ== + dependencies: + array-filter "^1.0.0" + awesomplete@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/awesomplete/-/awesomplete-1.1.5.tgz#1b2b5dd106d3955595619c03da472a1dc0faf0af" @@ -1052,7 +1052,7 @@ cliui@^5.0.0: strip-ansi "^5.2.0" wrap-ansi "^5.1.0" -clone@^2.1.1, clone@^2.1.2: +clone@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18= @@ -1599,6 +1599,26 @@ deep-equal@^1.0.1: resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5" integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU= +deep-equal@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.0.3.tgz#cad1c15277ad78a5c01c49c2dee0f54de8a6a7b0" + integrity sha512-Spqdl4H+ky45I9ByyJtXteOm9CaIrPmnIPmOhrkKGNYWeDgCvJ8jNYVCTjChxW4FqGuZnLHADc8EKRMX6+CgvA== + dependencies: + es-abstract "^1.17.5" + es-get-iterator "^1.1.0" + is-arguments "^1.0.4" + is-date-object "^1.0.2" + is-regex "^1.0.5" + isarray "^2.0.5" + object-is "^1.1.2" + object-keys "^1.1.1" + object.assign "^4.1.0" + regexp.prototype.flags "^1.3.0" + side-channel "^1.0.2" + which-boxed-primitive "^1.0.1" + which-collection "^1.0.1" + which-typed-array "^1.1.2" + deep-extend@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" @@ -1861,6 +1881,36 @@ es-abstract@^1.12.0, es-abstract@^1.5.1: is-regex "^1.0.4" object-keys "^1.0.12" +es-abstract@^1.17.0-next.1, es-abstract@^1.17.4, es-abstract@^1.17.5: + version "1.17.5" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9" + integrity sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg== + dependencies: + es-to-primitive "^1.2.1" + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + is-callable "^1.1.5" + is-regex "^1.0.5" + object-inspect "^1.7.0" + object-keys "^1.1.1" + object.assign "^4.1.0" + string.prototype.trimleft "^2.1.1" + string.prototype.trimright "^2.1.1" + +es-get-iterator@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.0.tgz#bb98ad9d6d63b31aacdc8f89d5d0ee57bcb5b4c8" + integrity sha512-UfrmHuWQlNMTs35e1ypnvikg6jCz3SK8v8ImvmDsh36fCVUR1MqoFDiyn0/k52C8NqO3YsO8Oe0azeesNuqSsQ== + dependencies: + es-abstract "^1.17.4" + has-symbols "^1.0.1" + is-arguments "^1.0.4" + is-map "^2.0.1" + is-set "^2.0.1" + is-string "^1.0.5" + isarray "^2.0.5" + es-to-primitive@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377" @@ -1870,6 +1920,15 @@ es-to-primitive@^1.2.0: is-date-object "^1.0.1" is-symbol "^1.0.2" +es-to-primitive@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" + integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== + dependencies: + is-callable "^1.1.4" + is-date-object "^1.0.1" + is-symbol "^1.0.2" + es6-promise@^4.0.3: version "4.2.8" resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a" @@ -1956,10 +2015,10 @@ eventemitter2@4.1.2: resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-4.1.2.tgz#0e1a8477af821a6ef3995b311bf74c23a5247f15" integrity sha1-DhqEd6+CGm7zmVsxG/dMI6UkfxU= -eventemitter3@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163" - integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA== +eventemitter3@^4.0.0: + version "4.0.4" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.4.tgz#b5463ace635a083d018bdc7c917b4c5f10a85384" + integrity sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ== execa@0.10.0: version "0.10.0" @@ -2083,7 +2142,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2: assign-symbols "^1.0.0" is-extendable "^1.0.1" -extend@^3.0.0, extend@^3.0.1, extend@^3.0.2, extend@~3.0.2: +extend@^3.0.0, extend@^3.0.2, extend@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== @@ -2141,10 +2200,10 @@ fast-deep-equal@^3.1.1: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4" integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA== -fast-diff@1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.1.2.tgz#4b62c42b8e03de3f848460b639079920695d0154" - integrity sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig== +fast-diff@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" + integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== fast-json-stable-stringify@^2.0.0: version "2.1.0" @@ -2238,6 +2297,11 @@ for-in@^1.0.2: resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= +foreach@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99" + integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k= + forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" @@ -2543,6 +2607,13 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6: resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== +graphlib@^2.1.8: + version "2.1.8" + resolved "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.8.tgz#5761d414737870084c92ec7b5dbcb0592c9d35da" + integrity sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A== + dependencies: + lodash "^4.17.15" + har-schema@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" @@ -2597,6 +2668,11 @@ has-symbols@^1.0.0: resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44" integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q= +has-symbols@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" + integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== + has-unicode@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" @@ -2887,6 +2963,11 @@ is-accessor-descriptor@^1.0.0: dependencies: kind-of "^6.0.0" +is-arguments@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3" + integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA== + is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" @@ -2897,6 +2978,16 @@ is-arrayish@^0.3.1: resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== +is-bigint@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.0.tgz#73da8c33208d00f130e9b5e15d23eac9215601c4" + integrity sha512-t5mGUXC/xRheCK431ylNiSkGGpBp8bHENBcENTkDT6ppwPzEVxNGZRvgvmOEfbWkFhA7D2GEuE2mmQTr78sl2g== + +is-boolean-object@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.1.tgz#10edc0900dd127697a92f6f9807c7617d68ac48e" + integrity sha512-TqZuVwa/sppcrhUCAYkGBk7w0yxfQQnxq28fjkO53tnK9FQXmdwz2JS5+GjsWQ6RByES1K40nI+yDic5c9/aAQ== + is-buffer@^1.0.2, is-buffer@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" @@ -2907,6 +2998,11 @@ is-callable@^1.1.4: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA== +is-callable@^1.1.5: + version "1.2.0" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz#83336560b54a38e35e3a2df7afd0454d691468bb" + integrity sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw== + is-ci@1.2.1, is-ci@^1.0.10: version "1.2.1" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c" @@ -2945,6 +3041,11 @@ is-date-object@^1.0.1: resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16" integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY= +is-date-object@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e" + integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g== + is-descriptor@^0.1.0: version "0.1.6" resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" @@ -3022,6 +3123,11 @@ is-installed-globally@0.1.0, is-installed-globally@^0.1.0: global-dirs "^0.1.0" is-path-inside "^1.0.0" +is-map@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.1.tgz#520dafc4307bb8ebc33b813de5ce7c9400d644a1" + integrity sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw== + is-module@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" @@ -3032,6 +3138,11 @@ is-npm@^1.0.0: resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4" integrity sha1-8vtjpl5JBbQGyGBydloaTceTufQ= +is-number-object@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197" + integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw== + is-number@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" @@ -3080,6 +3191,13 @@ is-regex@^1.0.4: dependencies: has "^1.0.1" +is-regex@^1.0.5: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.0.tgz#ece38e389e490df0dc21caea2bd596f987f767ff" + integrity sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw== + dependencies: + has-symbols "^1.0.1" + is-resolvable@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" @@ -3090,6 +3208,11 @@ is-retry-allowed@^1.0.0: resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4" integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg== +is-set@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.1.tgz#d1604afdab1724986d30091575f54945da7e5f43" + integrity sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA== + is-ssh@^1.3.0: version "1.3.1" resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.3.1.tgz#f349a8cadd24e65298037a522cf7520f2e81a0f3" @@ -3102,6 +3225,11 @@ is-stream@^1.0.0, is-stream@^1.1.0: resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= +is-string@^1.0.4, is-string@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6" + integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ== + is-svg@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-3.0.0.tgz#9321dbd29c212e5ca99c4fa9794c714bcafa2f75" @@ -3116,6 +3244,16 @@ is-symbol@^1.0.2: dependencies: has-symbols "^1.0.0" +is-typed-array@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.3.tgz#a4ff5a5e672e1a55f99c7f54e59597af5c1df04d" + integrity sha512-BSYUBOK/HJibQ30wWkWold5txYwMUXQct9YHAQJr8fSwvZoiglcqB0pd7vEN23+Tsi9IUEjztdOSzl4qLVYGTQ== + dependencies: + available-typed-arrays "^1.0.0" + es-abstract "^1.17.4" + foreach "^2.0.5" + has-symbols "^1.0.1" + is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" @@ -3131,6 +3269,16 @@ is-valid-glob@^1.0.0: resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa" integrity sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao= +is-weakmap@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2" + integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA== + +is-weakset@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.1.tgz#e9a0af88dbd751589f5e50d80f4c98b780884f83" + integrity sha512-pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw== + is-windows@^1.0.1, is-windows@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" @@ -3158,6 +3306,11 @@ isarray@2.0.1: resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e" integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4= +isarray@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" + integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw== + isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -3529,7 +3682,7 @@ lodash.uniq@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@4.17.15, lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10: +lodash@4.17.15, lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10: version "4.17.15" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== @@ -4037,6 +4190,24 @@ object-hash@^2.0.3: resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.0.3.tgz#d12db044e03cd2ca3d77c0570d87225b02e1e6ea" integrity sha512-JPKn0GMu+Fa3zt3Bmr66JhokJU5BaNBIh4ZeTlaCBzrBsOeXzwcKKAK1tbLiPKgvwmPXsDvvLHoWh5Bm7ofIYg== +object-inspect@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67" + integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw== + +object-is@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.2.tgz#c5d2e87ff9e119f78b7a088441519e2eec1573b6" + integrity sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" + +object-keys@^1.0.11, object-keys@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" + integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== + object-keys@^1.0.12: version "1.1.0" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz#11bd22348dd2e096a045ab06f6c85bcc340fa032" @@ -4049,6 +4220,16 @@ object-visit@^1.0.0: dependencies: isobject "^3.0.0" +object.assign@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da" + integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w== + dependencies: + define-properties "^1.1.2" + function-bind "^1.1.1" + has-symbols "^1.0.0" + object-keys "^1.0.11" + object.getownpropertydescriptors@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16" @@ -4247,9 +4428,10 @@ pako@~1.0.2: resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw== -parchment@quilljs/parchment#487850f7eb030a6c4e750ba809e58b09444e0bdb: - version "2.0.0-dev" - resolved "https://codeload.github.com/quilljs/parchment/tar.gz/487850f7eb030a6c4e750ba809e58b09444e0bdb" +parchment@2.0.0-dev.2: + version "2.0.0-dev.2" + resolved "https://registry.yarnpkg.com/parchment/-/parchment-2.0.0-dev.2.tgz#9d6fe57b3721317bd1c481ea38ffa9b287d496b8" + integrity sha512-4fgRny4pPISoML08Zp7poi52Dff3E2G1ORTi2D/acJ/RiROdDAMDB6VcQNfBcmehrX5Wixp6dxh6JjLyE5yUNQ== parse-data-uri@^0.2.0: version "0.2.0" @@ -4803,11 +4985,6 @@ prettier@^1.19.1: resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== -pretty-hrtime@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1" - integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE= - process-nextick-args@~1.0.6: version "1.0.7" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" @@ -4938,26 +5115,26 @@ querystring@0.2.0, querystring@^0.2.0: resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= -quill-delta@^3.6.2: - version "3.6.3" - resolved "https://registry.yarnpkg.com/quill-delta/-/quill-delta-3.6.3.tgz#b19fd2b89412301c60e1ff213d8d860eac0f1032" - integrity sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg== +quill-delta@4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/quill-delta/-/quill-delta-4.2.1.tgz#ad4f191cdf3be5079c5dc3991b9603a5cc0db69a" + integrity sha512-Y2nksOj6Q+4hizre8n0dml76vLNGK4/y86EoI1d7rv6EL1bx7DPDYRmqQMPu1UqFQO/uQuVHQ3fOmm4ZSzWrfA== dependencies: deep-equal "^1.0.1" extend "^3.0.2" - fast-diff "1.1.2" + fast-diff "1.2.0" -quill@2.0.0-dev.2: - version "2.0.0-dev.2" - resolved "https://registry.yarnpkg.com/quill/-/quill-2.0.0-dev.2.tgz#0f8bc962da28e3ebbb856f246200e7d32e39fc9f" - integrity sha512-jqP2ar0EaPZLLyeYmyJ01l07+l3NKjUiq79i7OQiYv7Rm3wHTaejgq2oIqmXUCZjGQd2f5jlFUABkf8quZVcIw== +quill@2.0.0-dev.4: + version "2.0.0-dev.4" + resolved "https://registry.yarnpkg.com/quill/-/quill-2.0.0-dev.4.tgz#130e38efe7a16b3766d767d750c8aacc038945e7" + integrity sha512-9WmMVCEIhf3lDdhzl+i+GBDeDl0BFi65waC4Im8Y4HudEJ9kEEb1lciAz9A8pcDmLMjiMbvz84lNt/U5OBS8Vg== dependencies: - clone "^2.1.1" - deep-equal "^1.0.1" - eventemitter3 "^3.1.0" - extend "^3.0.1" - parchment quilljs/parchment#487850f7eb030a6c4e750ba809e58b09444e0bdb - quill-delta "^3.6.2" + clone "^2.1.2" + deep-equal "^2.0.2" + eventemitter3 "^4.0.0" + extend "^3.0.2" + parchment "2.0.0-dev.2" + quill-delta "4.2.1" qz-tray@^2.0.8: version "2.0.8" @@ -5135,6 +5312,14 @@ regex-not@^1.0.0, regex-not@^1.0.2: extend-shallow "^3.0.2" safe-regex "^1.1.0" +regexp.prototype.flags@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75" + integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" + regexpu-core@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b" @@ -5615,6 +5800,14 @@ showdown@^1.9.1: dependencies: yargs "^14.2" +side-channel@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz#df5d1abadb4e4bf4af1cd8852bf132d2f7876947" + integrity sha512-7rL9YlPHg7Ancea1S96Pa8/QWb4BtXL/TZvS6B8XFetGBeuhAsfmUspK6DokBeZ64+Kj9TCNRD/30pVz1BvQNA== + dependencies: + es-abstract "^1.17.0-next.1" + object-inspect "^1.7.0" + signal-exit@^3.0.0: version "3.0.3" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" @@ -6188,6 +6381,40 @@ string-width@^3.0.0, string-width@^3.1.0: is-fullwidth-code-point "^2.0.0" strip-ansi "^5.1.0" +string.prototype.trimend@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913" + integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" + +string.prototype.trimleft@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc" + integrity sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" + string.prototype.trimstart "^1.0.0" + +string.prototype.trimright@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz#c76f1cef30f21bbad8afeb8db1511496cfb0f2a3" + integrity sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" + string.prototype.trimend "^1.0.0" + +string.prototype.trimstart@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54" + integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" + string_decoder@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" @@ -6760,6 +6987,27 @@ vue@^2.6.11: resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.11.tgz#76594d877d4b12234406e84e35275c6d514125c5" integrity sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ== +which-boxed-primitive@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.1.tgz#cbe8f838ebe91ba2471bb69e9edbda67ab5a5ec1" + integrity sha512-7BT4TwISdDGBgaemWU0N0OU7FeAEJ9Oo2P1PHRm/FCWoEi2VLWC9b6xvxAA3C/NMpxg3HXVgi0sMmGbNUbNepQ== + dependencies: + is-bigint "^1.0.0" + is-boolean-object "^1.0.0" + is-number-object "^1.0.3" + is-string "^1.0.4" + is-symbol "^1.0.2" + +which-collection@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906" + integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A== + dependencies: + is-map "^2.0.1" + is-set "^2.0.1" + is-weakmap "^2.0.1" + is-weakset "^2.0.1" + which-module@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" @@ -6770,6 +7018,18 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= +which-typed-array@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.2.tgz#e5f98e56bda93e3dac196b01d47c1156679c00b2" + integrity sha512-KT6okrd1tE6JdZAy3o2VhMoYPh3+J6EMZLyrxBQsZflI1QCZIxMrIYLkosd8Twf+YfknVIHmYQPgJt238p8dnQ== + dependencies: + available-typed-arrays "^1.0.2" + es-abstract "^1.17.5" + foreach "^2.0.5" + function-bind "^1.1.1" + has-symbols "^1.0.1" + is-typed-array "^1.1.3" + which@1, which@^1.2.14, which@^1.2.9: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" From 3c69d17ae11c92f6a8b7cbd14ed8dc40b736bec7 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Sat, 6 Jun 2020 10:48:23 +0530 Subject: [PATCH 083/485] fix: Code control bug this.$expand_button --- frappe/public/js/frappe/form/controls/code.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/code.js b/frappe/public/js/frappe/form/controls/code.js index 60825c82ad..726a83db72 100644 --- a/frappe/public/js/frappe/form/controls/code.js +++ b/frappe/public/js/frappe/form/controls/code.js @@ -39,7 +39,7 @@ frappe.ui.form.ControlCode = frappe.ui.form.ControlText.extend({ toggle_label() { const button_label = this.expanded ? __('Collapse') : __('Expand'); - this.$expand_button.text(button_label); + this.$expand_button && this.$expand_button.text(button_label); }, set_language() { From 8150d65084ceca5c857bf4e912d60cfe2988b477 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Sat, 6 Jun 2020 10:49:31 +0530 Subject: [PATCH 084/485] fix: Remove linkify to retain spaces in text-editor --- frappe/utils/html_utils.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/frappe/utils/html_utils.py b/frappe/utils/html_utils.py index c740252b5c..302813645e 100644 --- a/frappe/utils/html_utils.py +++ b/frappe/utils/html_utils.py @@ -68,13 +68,10 @@ def sanitize_html(html, linkify=False): styles = bleach_whitelist.all_styles strip_comments = False - # retuns html with escaped tags, escaped orphan >, <, etc. + # returns html with escaped tags, escaped orphan >, <, etc. escaped_html = bleach.clean(html, tags=tags, attributes=attributes, styles=styles, strip_comments=strip_comments, protocols=['cid', 'http', 'https', 'mailto']) - if linkify: - escaped_html = bleach.linkify(escaped_html, callbacks=[]) - return escaped_html def is_json(text): From e4151fb679ee18c24c125f60636f21129d1d5194 Mon Sep 17 00:00:00 2001 From: prssanna Date: Sun, 7 Jun 2020 14:22:37 +0530 Subject: [PATCH 085/485] fix: disable scroll to top for list view --- frappe/public/js/frappe/form/form.js | 1 - frappe/public/js/frappe/list/list_view.js | 2 ++ frappe/public/js/frappe/utils/utils.js | 5 +++++ frappe/public/js/frappe/views/container.js | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index 369e4a56d4..e2aab7e519 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -340,7 +340,6 @@ frappe.ui.form.Form = class FrappeForm { switch_doc(docname) { // record switch if(this.docname != docname && (!this.meta.in_dialog || this.in_form) && !this.meta.istable) { - frappe.utils.scroll_to(0); if (this.print_preview) { this.print_preview.hide(); } diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index c282d43d9b..d6473bdb0c 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -29,6 +29,8 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { } show() { + this.parent.disable_scroll_to_top = true; + if (!this.has_permissions()) { frappe.set_route(''); frappe.msgprint(__(`Not permitted to view ${this.doctype}`)); diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index f4dde5804f..67a7d00a6d 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -149,6 +149,11 @@ Object.assign(frappe.utils, { } }, + get_scroll_position: function(element, additional_offset) { + let header_offset = $(".navbar").height() + $(".page-head").height(); + let scroll_top = $(element).offset().top - header_offset - cint(additional_offset); + return scroll_top; + }, filter_dict: function(dict, filters) { var ret = []; if(typeof filters=='string') { diff --git a/frappe/public/js/frappe/views/container.js b/frappe/public/js/frappe/views/container.js index 8e67792079..889063e24b 100644 --- a/frappe/public/js/frappe/views/container.js +++ b/frappe/public/js/frappe/views/container.js @@ -84,7 +84,7 @@ frappe.views.Container = Class.extend({ this.page._route = window.location.hash; $(this.page).trigger('show'); - frappe.utils.scroll_to(0); + !this.page.disable_scroll_to_top && frappe.utils.scroll_to(0); frappe.breadcrumbs.update(); return this.page; From 23b037ab55119f0dd121f259673629329d286d4c Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 8 Jun 2020 12:33:49 +0530 Subject: [PATCH 086/485] fix: hidden chart show on refresh --- frappe/public/js/frappe/views/reports/report_view.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js index bc4129935e..0791a0e6ad 100644 --- a/frappe/public/js/frappe/views/reports/report_view.js +++ b/frappe/public/js/frappe/views/reports/report_view.js @@ -186,7 +186,6 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { if (this.group_by) { this.$charts_wrapper.addClass('hidden'); } else if (this.chart) { - this.$charts_wrapper.removeClass('hidden'); this.refresh_charts(); } @@ -518,7 +517,8 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { } refresh_charts() { - if (!this.chart) return; + if (!this.chart || !this.chart_args) return; + this.$charts_wrapper.removeClass('hidden'); const { x_axis, y_axes, chart_type } = this.chart_args; this.build_chart_args(x_axis, y_axes, chart_type); this.chart.update(this.chart_args); From b3afc48932b9cac80591b19590213e3459c16328 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 8 Jun 2020 12:56:46 +0530 Subject: [PATCH 087/485] fix: don't send total row in checked items --- frappe/public/js/frappe/views/reports/report_view.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js index bc4129935e..a77cfa9880 100644 --- a/frappe/public/js/frappe/views/reports/report_view.js +++ b/frappe/public/js/frappe/views/reports/report_view.js @@ -1095,8 +1095,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { get_checked_items(only_docnames) { const indexes = this.datatable.rowmanager.getCheckedRows(); - const items = indexes.filter(i => i != undefined) - .map(i => this.data[i]); + const items = indexes.map(i => this.data[i]).filter(i => i != undefined) if (only_docnames) { return items.map(d => d.name); From 06eaa61180f7b7d15bba07186345366773527e01 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 8 Jun 2020 13:09:51 +0530 Subject: [PATCH 088/485] style: add missing semi colon --- frappe/public/js/frappe/views/reports/report_view.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js index a77cfa9880..ee3c1574e5 100644 --- a/frappe/public/js/frappe/views/reports/report_view.js +++ b/frappe/public/js/frappe/views/reports/report_view.js @@ -1095,7 +1095,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { get_checked_items(only_docnames) { const indexes = this.datatable.rowmanager.getCheckedRows(); - const items = indexes.map(i => this.data[i]).filter(i => i != undefined) + const items = indexes.map(i => this.data[i]).filter(i => i != undefined); if (only_docnames) { return items.map(d => d.name); From afa82f6ce2a742759d05c89270dcbd1ed37c2fbb Mon Sep 17 00:00:00 2001 From: Richard Case Date: Mon, 8 Jun 2020 06:17:02 +0000 Subject: [PATCH 089/485] fix: metatags for social media SEO --- frappe/website/context.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/frappe/website/context.py b/frappe/website/context.py index 8b2ebd7768..1759382d1b 100644 --- a/frappe/website/context.py +++ b/frappe/website/context.py @@ -238,14 +238,13 @@ def add_metatags(context): image = tags.get('image', context.image or None) if image: - tags["og:image"] = tags["twitter:image:src"] = tags["image"] = frappe.utils.get_url(image) + tags["og:image"] = tags["twitter:image"] = tags["image"] = frappe.utils.get_url(image) tags['twitter:card'] = "summary_large_image" if context.author or tags.get('author'): tags['author'] = context.author or tags.get('author') - if context.path: - tags['og:url'] = tags['url'] = frappe.utils.get_url(context.path) + tags['og:url'] = tags['url'] = frappe.utils.get_url(context.path) if context.published_on: tags['datePublished'] = context.published_on From 837de30669a5408769e1ded5def28668e1ef9d74 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 8 Jun 2020 15:37:07 +0530 Subject: [PATCH 090/485] refactor: all onboarding cards are dismissable --- .../doctype/module_onboarding/module_onboarding.json | 10 +--------- frappe/public/js/frappe/widgets/onboarding_widget.js | 2 -- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/frappe/desk/doctype/module_onboarding/module_onboarding.json b/frappe/desk/doctype/module_onboarding/module_onboarding.json index 0667ddf6ad..02a18b9c2d 100644 --- a/frappe/desk/doctype/module_onboarding/module_onboarding.json +++ b/frappe/desk/doctype/module_onboarding/module_onboarding.json @@ -13,7 +13,6 @@ "column_break_4", "success_message", "documentation_url", - "user_can_dismiss", "is_complete", "section_break_6", "steps" @@ -53,13 +52,6 @@ "label": "Success Message", "reqd": 1 }, - { - "default": "1", - "description": "Allow users to dismiss onboarding temporarily for a day", - "fieldname": "user_can_dismiss", - "fieldtype": "Check", - "label": "User Can Dismiss " - }, { "fieldname": "documentation_url", "fieldtype": "Data", @@ -90,7 +82,7 @@ } ], "links": [], - "modified": "2020-05-18 19:42:39.738869", + "modified": "2020-06-08 15:36:04.701049", "modified_by": "Administrator", "module": "Desk", "name": "Module Onboarding", diff --git a/frappe/public/js/frappe/widgets/onboarding_widget.js b/frappe/public/js/frappe/widgets/onboarding_widget.js index 5d6de572ce..e2b6681f9b 100644 --- a/frappe/public/js/frappe/widgets/onboarding_widget.js +++ b/frappe/public/js/frappe/widgets/onboarding_widget.js @@ -444,8 +444,6 @@ export default class OnboardingWidget extends Widget { set_actions() { this.action_area.empty(); - if (!this.user_can_dismiss) return; - const dismiss = $( `
            Dismiss
            ` ); From e2403b511876eaf7f9354b7a23783032c4c5ca82 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 8 Jun 2020 15:37:25 +0530 Subject: [PATCH 091/485] refactor: remove grid and use default typography --- .../js/frappe/widgets/onboarding_widget.js | 6 --- frappe/public/less/desktop.less | 44 ------------------- 2 files changed, 50 deletions(-) diff --git a/frappe/public/js/frappe/widgets/onboarding_widget.js b/frappe/public/js/frappe/widgets/onboarding_widget.js index e2b6681f9b..55a30093b9 100644 --- a/frappe/public/js/frappe/widgets/onboarding_widget.js +++ b/frappe/public/js/frappe/widgets/onboarding_widget.js @@ -7,12 +7,6 @@ export default class OnboardingWidget extends Widget { } make_body() { - this.body.addClass("grid"); - if (this.steps.length < 5) { - this.body.addClass(`grid-rows-${this.steps.length}`); - } else if (this.steps.length >= 5) { - this.body.addClass("grid-rows-5"); - } this.steps.forEach((step) => { this.add_step(step); }); diff --git a/frappe/public/less/desktop.less b/frappe/public/less/desktop.less index b66a0ad8fc..ef89f1c17f 100644 --- a/frappe/public/less/desktop.less +++ b/frappe/public/less/desktop.less @@ -369,12 +369,7 @@ .widget-head { display: flex; - .widget-title { - font-size: 20px; - } - .widget-subtitle { - font-size: 16px; margin-top: 5px; color: @text-muted; } @@ -388,48 +383,9 @@ .widget-body { margin-top: 20px; - padding-right: 200px; - - @media (max-width: 970px) { - padding-right: 0; - } - - &.grid { - display: grid; - grid-template-columns: 1fr 1fr; - grid-auto-flow: column; - - &.grid-rows-2 { - grid-template-rows: repeat(3, 1fr); - } - - &.grid-rows-3 { - grid-template-rows: repeat(3, 1fr); - } - - &.grid-rows-4 { - grid-template-rows: repeat(4, 1fr); - } - - &.grid-rows-5 { - grid-template-rows: repeat(5, 1fr); - } - - @media (max-width: 768px) { - grid-template-columns: 1fr; - &.grid-rows-2, - &.grid-rows-3, - &.grid-rows-4, - &.grid-rows-5 { - grid-template-columns: 1fr; - grid-auto-flow: row; - } - } - } .onboarding-step { margin-bottom: 8px; - font-size: 16px; letter-spacing: 0.015em; i { From 41c7f84fd2ec5f0bf7b43e7760582823a327dad7 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 8 Jun 2020 16:59:32 +0530 Subject: [PATCH 092/485] fix: Page builder styling fixes - Narrower container for xl screens - Add larger 2xl breakpoint - Softer nav and footer links - Softer card hover border - Smaller hero subtitle on mobile --- frappe/public/scss/page-builder.scss | 7 ++++++- frappe/public/scss/variables.scss | 9 +++++++++ frappe/public/scss/website.scss | 29 ++++++++++++++-------------- 3 files changed, 30 insertions(+), 15 deletions(-) diff --git a/frappe/public/scss/page-builder.scss b/frappe/public/scss/page-builder.scss index 01ffbfbf4e..a2a20508ad 100644 --- a/frappe/public/scss/page-builder.scss +++ b/frappe/public/scss/page-builder.scss @@ -3,6 +3,11 @@ font-weight: 400; color: $gray-600; max-width: 42rem; + font-size: 1rem; + + @include media-breakpoint-up(sm) { + font-size: 1.25rem; + } } .section-description { @@ -92,7 +97,7 @@ @include transition(); &:hover { - border-color: $gray-600; + border-color: $gray-500; } .card-title { diff --git a/frappe/public/scss/variables.scss b/frappe/public/scss/variables.scss index 43e4bb5641..1339af29a9 100644 --- a/frappe/public/scss/variables.scss +++ b/frappe/public/scss/variables.scss @@ -51,6 +51,15 @@ $dropdown-border-radius: 0.375rem !default; $dropdown-item-padding-y: 0.5rem !default; $dropdown-item-padding-x: 0.5rem !default; +$grid-breakpoints: ( + xs: 0, + sm: 576px, + md: 768px, + lg: 992px, + xl: 1200px, + 2xl: 1440px +) !default; + @import '~bootstrap/scss/functions'; @import '~bootstrap/scss/variables'; @import "~bootstrap/scss/mixins"; diff --git a/frappe/public/scss/website.scss b/frappe/public/scss/website.scss index c0f81d07e4..2004bf6ead 100644 --- a/frappe/public/scss/website.scss +++ b/frappe/public/scss/website.scss @@ -16,26 +16,26 @@ @include media-breakpoint-up(sm) { .container { - padding-left: 1rem; - padding-right: 1rem; - } -} - -@include media-breakpoint-up(md) { - .container { - padding-left: 1rem; - padding-right: 1rem; + padding-left: 0; + padding-right: 0; } } @include media-breakpoint-up(lg) { .container { - padding-left: 1rem; - padding-right: 1rem; + padding-left: 2.5rem; + padding-right: 2.5rem; } } @include media-breakpoint-up(xl) { + .container { + padding-left: 5rem; + padding-right: 5rem; + } +} + +@include media-breakpoint-up(2xl) { .container { padding-left: 1.5rem; padding-right: 1.5rem; @@ -47,7 +47,7 @@ } .navbar-light .navbar-nav .nav-link { - color: $gray-900; + color: $gray-700; font-size: $font-size-sm; font-weight: 500; @@ -151,7 +151,7 @@ a.card { .footer-link, .footer-child-item a { font-weight: 500; - color: $gray-900; + color: $gray-700; &:hover { color: $primary; @@ -160,8 +160,9 @@ a.card { } .footer-col-left, .footer-col-right { - padding-top: 1rem; + padding-top: 0.8rem; padding-bottom: 1rem; + line-height: 2; } .footer-col-right { From 8bf3c30d4da50b80f4846868780e8a13a7804756 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Mon, 8 Jun 2020 18:04:17 +0530 Subject: [PATCH 093/485] fix: set duration options in patch --- frappe/patches.txt | 2 +- .../patches/v13_0/remove_duration_options.py | 14 ---------- .../patches/v13_0/update_duration_options.py | 28 +++++++++++++++++++ 3 files changed, 29 insertions(+), 15 deletions(-) delete mode 100644 frappe/patches/v13_0/remove_duration_options.py create mode 100644 frappe/patches/v13_0/update_duration_options.py diff --git a/frappe/patches.txt b/frappe/patches.txt index 427b5f29cf..582b369343 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -288,4 +288,4 @@ execute:frappe.delete_doc("DocType", "Onboarding Slide") execute:frappe.delete_doc("DocType", "Onboarding Slide Field") execute:frappe.delete_doc("DocType", "Onboarding Slide Help Link") frappe.patches.v13_0.update_date_filters_in_user_settings -frappe.patches.v13_0.remove_duration_options +frappe.patches.v13_0.update_duration_options diff --git a/frappe/patches/v13_0/remove_duration_options.py b/frappe/patches/v13_0/remove_duration_options.py deleted file mode 100644 index 65d14c6725..0000000000 --- a/frappe/patches/v13_0/remove_duration_options.py +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors -# MIT License. See license.txt - -from __future__ import unicode_literals -import frappe - -def execute(): - if frappe.db.has_column('DocField', 'show_days'): - frappe.db.sql('alter table tabDocField drop column show_days') - - if frappe.db.has_column('DocField', 'show_seconds'): - frappe.db.sql('alter table tabDocField drop column show_seconds') - - frappe.clear_cache(doctype='DocField') \ No newline at end of file diff --git a/frappe/patches/v13_0/update_duration_options.py b/frappe/patches/v13_0/update_duration_options.py new file mode 100644 index 0000000000..60eef8fc93 --- /dev/null +++ b/frappe/patches/v13_0/update_duration_options.py @@ -0,0 +1,28 @@ +# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors +# MIT License. See license.txt + +from __future__ import unicode_literals +import frappe + +def execute(): + frappe.reload_doc('core', 'doctype', 'DocField') + + if frappe.db.has_column('DocField', 'show_days'): + frappe.db.sql(""" + UPDATE + tabDocField + SET + hide_days = 1 WHERE show_days = 0 + """) + frappe.db.sql_ddl('alter table tabDocField drop column show_days') + + if frappe.db.has_column('DocField', 'show_seconds'): + frappe.db.sql(""" + UPDATE + tabDocField + SET + hide_seconds = 1 WHERE show_seconds = 0 + """) + frappe.db.sql_ddl('alter table tabDocField drop column show_seconds') + + frappe.clear_cache(doctype='DocField') \ No newline at end of file From 44fc9c57e21fb4f8ce9ac342e8425bd7804611f3 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 8 Jun 2020 18:55:58 +0530 Subject: [PATCH 094/485] fix: Set source only if raw content --- frappe/website/render.py | 6 +++--- frappe/website/router.py | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/frappe/website/render.py b/frappe/website/render.py index f137a28eaa..d5269ed1cb 100644 --- a/frappe/website/render.py +++ b/frappe/website/render.py @@ -214,13 +214,13 @@ def build_page(path): context = get_context(path) - if context.template: + if context.source: + html = frappe.render_template(context.source, context) + elif context.template: if path.endswith('min.js'): html = frappe.get_jloader().get_source(frappe.get_jenv(), context.template)[0] else: html = frappe.get_template(context.template).render(context) - elif context.source: - html = frappe.render_template(context.source, context) if '{index}' in html: html = html.replace('{index}', get_toc(context.route)) diff --git a/frappe/website/router.py b/frappe/website/router.py index 2989d54f5f..976bd9f3de 100644 --- a/frappe/website/router.py +++ b/frappe/website/router.py @@ -278,9 +278,10 @@ def setup_source(page_info): if not page_info.base_template: page_info.base_template = get_base_template(page_info.route) - # if only content if page_info.template.endswith('.html') or page_info.template.endswith('.md'): - html = source + # set the source only if it contains raw content + if '{%- extends' not in source and '{% extends' not in source: + html = source # load css/js files js, css = '', '' From 53c1845ae51f38de957ec1eea4705782d3e1c150 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 8 Jun 2020 18:56:30 +0530 Subject: [PATCH 095/485] fix: Blog styles - Use markdown styles for blog content --- frappe/public/scss/blog.scss | 77 ++----------------- .../blog_post/templates/blog_post.html | 22 +++--- .../blog_post/templates/blog_post_list.html | 4 +- 3 files changed, 20 insertions(+), 83 deletions(-) diff --git a/frappe/public/scss/blog.scss b/frappe/public/scss/blog.scss index 35f5132563..81d0e5e15f 100644 --- a/frappe/public/scss/blog.scss +++ b/frappe/public/scss/blog.scss @@ -62,6 +62,11 @@ max-width: 800px; margin: 0px auto; + .blog-title { + margin-top: 1rem; + font-size: 2.5rem; + } + .blog-footer { display: flex; justify-content: space-between; @@ -70,84 +75,16 @@ } .blog-intro { - font-size: 1.25rem; - font-weight: 300; + font-size: 1.125rem; + font-weight: 400; } .blog-content { margin-bottom: 1rem; - line-height: 1.8; .blog-header { margin-bottom: 3rem; margin-top: 3rem; } - - p { - margin-bottom: 1.2rem; - } - - ul, ol { - margin-top: 1rem; - } - - hr { - margin: 2rem auto; - } - - h1 { - margin-top: 2rem; - font-weight: 800; - font-size: 2rem; - } - - h1.blog-title { - margin-top: 2rem; - font-weight: 800; - font-size: 2.5rem; - } - - h2 { - margin-top: 2rem; - font-weight: 700; - font-size: 1.75rem; - } - - h3 { - margin-top: 2rem; - font-weight: 600; - font-size: 1.5rem; - } - - h4 { - font-weight: 500; - margin-top: 1.5rem; - font-size: 1.25rem; - } - - h5, - h6 { - font-weight: 500; - margin-top: 1.5rem; - font-size: 1rem; - } - - img { - border-radius: $border-radius; - } - - blockquote { - margin: 2rem auto; - width: 90%; - padding-top: 2rem; - padding-bottom: 0.8rem; - - border-top: 1px solid $gray-200; - border-bottom: 1px solid $gray-200; - - text-align: center; - font-size: 1.2rem; - font-weight: 500; - } } } diff --git a/frappe/website/doctype/blog_post/templates/blog_post.html b/frappe/website/doctype/blog_post/templates/blog_post.html index f72f095deb..d199f741d9 100644 --- a/frappe/website/doctype/blog_post/templates/blog_post.html +++ b/frappe/website/doctype/blog_post/templates/blog_post.html @@ -19,19 +19,19 @@ {{ blog_intro }}

            - {{ frappe.format_date(published_on) }} - {% if read_time %} - · - {{ read_time }} min read - {% endif %} + + {%- if read_time -%} +  · + {{ read_time }} min read + {%- endif -%}
            -
            +
            {{ content }}
            - {% if enable_cta %} + {%- if enable_cta -%} {{ web_blocks([ { 'template': "Section With Small CTA", @@ -43,10 +43,10 @@ } ]) }} - {% endif %} + {%- endif -%}
            - {{ _('Published on') }} {{ frappe.format_date(published_on) }} + {{ _('Published on') }}
            {% if social_links %} @@ -63,7 +63,7 @@ {% endif %} {% if not disable_comments %} -
            +
            {% include 'templates/includes/comments/comments.html' %}
            {% endif %} @@ -72,4 +72,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/frappe/website/doctype/blog_post/templates/blog_post_list.html b/frappe/website/doctype/blog_post/templates/blog_post_list.html index 2677c70f92..8df47b7187 100644 --- a/frappe/website/doctype/blog_post/templates/blog_post_list.html +++ b/frappe/website/doctype/blog_post/templates/blog_post_list.html @@ -8,8 +8,8 @@ { 'template': "Hero", 'values': { - 'title': blog_title, - 'subtitle': blog_introduction, + 'title': blog_title or _("Blog"), + 'subtitle': blog_introduction or '', }, 'add_container': 0, 'add_top_padding': 0, From 9a4fe0f0c35d97b125a183e4483fbb47112807e7 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 8 Jun 2020 18:56:46 +0530 Subject: [PATCH 096/485] fix: Add anchored headings only on doc content --- frappe/website/js/website.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/js/website.js b/frappe/website/js/website.js index 935c614652..c95345770d 100644 --- a/frappe/website/js/website.js +++ b/frappe/website/js/website.js @@ -323,7 +323,7 @@ $.extend(frappe, { $('.switch-to-desk').removeClass('hidden'); }, add_link_to_headings: function() { - $('.from-markdown').find('h2, h3, h4, h5, h6').each((i, $heading) => { + $('.doc-content .from-markdown').find('h2, h3, h4, h5, h6').each((i, $heading) => { let id = $heading.id; let $a = $('') .prop('href', '#' + id) From c0e94e7e38a0f73ebc1efbdc99e8307d4aee036d Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 8 Jun 2020 19:05:18 +0530 Subject: [PATCH 097/485] fix: Add anchored headings only on doc content --- frappe/website/js/website.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/js/website.js b/frappe/website/js/website.js index 935c614652..c95345770d 100644 --- a/frappe/website/js/website.js +++ b/frappe/website/js/website.js @@ -323,7 +323,7 @@ $.extend(frappe, { $('.switch-to-desk').removeClass('hidden'); }, add_link_to_headings: function() { - $('.from-markdown').find('h2, h3, h4, h5, h6').each((i, $heading) => { + $('.doc-content .from-markdown').find('h2, h3, h4, h5, h6').each((i, $heading) => { let id = $heading.id; let $a = $('') .prop('href', '#' + id) From ed5d657a628ab36fb5311f50d20bfc147e9d5c91 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 8 Jun 2020 19:05:44 +0530 Subject: [PATCH 098/485] fix: Smaller blog title and hr above content --- frappe/public/scss/blog.scss | 6 +++++- frappe/website/doctype/blog_post/templates/blog_post.html | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/frappe/public/scss/blog.scss b/frappe/public/scss/blog.scss index 81d0e5e15f..046158f23b 100644 --- a/frappe/public/scss/blog.scss +++ b/frappe/public/scss/blog.scss @@ -64,7 +64,11 @@ .blog-title { margin-top: 1rem; - font-size: 2.5rem; + + @include media-breakpoint-up(xl) { + line-height: 1; + font-size: $font-size-4xl; + } } .blog-footer { diff --git a/frappe/website/doctype/blog_post/templates/blog_post.html b/frappe/website/doctype/blog_post/templates/blog_post.html index d199f741d9..dd3e59c3c1 100644 --- a/frappe/website/doctype/blog_post/templates/blog_post.html +++ b/frappe/website/doctype/blog_post/templates/blog_post.html @@ -26,6 +26,7 @@ {%- endif -%}
            +
            {{ content }}
            From c31dc9ae225a41dc45926361b94f0d3d69019c60 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 8 Jun 2020 19:18:10 +0530 Subject: [PATCH 099/485] test: fix blog test --- frappe/website/doctype/blog_post/test_blog_post.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/doctype/blog_post/test_blog_post.py b/frappe/website/doctype/blog_post/test_blog_post.py index aecc813e9d..15634a7caf 100644 --- a/frappe/website/doctype/blog_post/test_blog_post.py +++ b/frappe/website/doctype/blog_post/test_blog_post.py @@ -19,7 +19,7 @@ class TestBlogPost(unittest.TestCase): self.assertTrue(response.status_code, 200) html = response.get_data().decode() - self.assertTrue('
            ' in html) + self.assertTrue('
            ' in html) def test_generator_not_found(self): pages = frappe.get_all('Blog Post', fields=['name', 'route'], From b3c1e1fc58a58b53d1e4a2b512a54506d2e36524 Mon Sep 17 00:00:00 2001 From: prssanna Date: Tue, 9 Jun 2020 16:32:14 +0530 Subject: [PATCH 100/485] fix: remove unused function --- frappe/public/js/frappe/utils/utils.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index 67a7d00a6d..f4dde5804f 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -149,11 +149,6 @@ Object.assign(frappe.utils, { } }, - get_scroll_position: function(element, additional_offset) { - let header_offset = $(".navbar").height() + $(".page-head").height(); - let scroll_top = $(element).offset().top - header_offset - cint(additional_offset); - return scroll_top; - }, filter_dict: function(dict, filters) { var ret = []; if(typeof filters=='string') { From 529a2eb8086952f7cc6d4462bed16b8e5270f68f Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 9 Jun 2020 17:50:41 +0530 Subject: [PATCH 101/485] fix: condition for rendering source --- frappe/website/router.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/website/router.py b/frappe/website/router.py index 976bd9f3de..b291671a4a 100644 --- a/frappe/website/router.py +++ b/frappe/website/router.py @@ -278,10 +278,10 @@ def setup_source(page_info): if not page_info.base_template: page_info.base_template = get_base_template(page_info.route) - if page_info.template.endswith('.html') or page_info.template.endswith('.md'): + if page_info.template.endswith(('.html', '.md', )) and \ + '{%- extends' not in source and '{% extends' not in source: # set the source only if it contains raw content - if '{%- extends' not in source and '{% extends' not in source: - html = source + html = source # load css/js files js, css = '', '' From df1d3be9fbf91c22ef1326a930a1fe2c5bf3dc31 Mon Sep 17 00:00:00 2001 From: Vishal Dhayagude Date: Tue, 9 Jun 2020 18:28:27 +0530 Subject: [PATCH 102/485] fix(web_form) : web form file attachment link to specific doctype (#222) --- frappe/public/js/frappe/web_form/web_form.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/frappe/public/js/frappe/web_form/web_form.js b/frappe/public/js/frappe/web_form/web_form.js index 4dc1a50bc4..8cde4c9ba5 100644 --- a/frappe/public/js/frappe/web_form/web_form.js +++ b/frappe/public/js/frappe/web_form/web_form.js @@ -139,6 +139,16 @@ export default class WebForm extends frappe.ui.FieldGroup { this.handle_success(response.message); frappe.web_form.events.trigger('after_save'); this.after_save && this.after_save(); + // args doctype and docname added to link doctype in file manager + frappe.call({ + type: 'POST', + method: "frappe.handler.upload_file", + args: { + file_url: response.message.attachment, + doctype: response.message.doctype, + docname: response.message.name + } + }); } }, always: function() { From 3db3e073aac135d711e4632db71728dd11cbee2f Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 9 Jun 2020 19:15:53 +0530 Subject: [PATCH 103/485] feat: remove flaky test for grid-pagination --- cypress/integration/grid_pagination.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cypress/integration/grid_pagination.js b/cypress/integration/grid_pagination.js index f03384cb93..b383f30bb8 100644 --- a/cypress/integration/grid_pagination.js +++ b/cypress/integration/grid_pagination.js @@ -40,12 +40,12 @@ context('Grid Pagination', () => { cy.get('@table').find('.current-page-number').should('contain', '20'); cy.get('@table').find('.total-page-number').should('contain', '20'); }); - it('deletes all rows', ()=> { - cy.visit('/desk#Form/Contact/Test Contact'); - cy.get('.frappe-control[data-fieldname="phone_nos"]').as('table'); - cy.get('@table').find('.grid-heading-row .grid-row-check').click({force: true}); - cy.get('@table').find('button.grid-remove-all-rows').click(); - cy.get('.modal-dialog .btn-primary').contains('Yes').click(); - cy.get('@table').find('.grid-body .grid-row').should('have.length', 0); - }); + // it('deletes all rows', ()=> { + // cy.visit('/desk#Form/Contact/Test Contact'); + // cy.get('.frappe-control[data-fieldname="phone_nos"]').as('table'); + // cy.get('@table').find('.grid-heading-row .grid-row-check').click({force: true}); + // cy.get('@table').find('button.grid-remove-all-rows').click(); + // cy.get('.modal-dialog .btn-primary').contains('Yes').click(); + // cy.get('@table').find('.grid-body .grid-row').should('have.length', 0); + // }); }); \ No newline at end of file From 07920c85f2f8319873f2ea407070efbfaea170b5 Mon Sep 17 00:00:00 2001 From: Andrew McLeod Date: Tue, 9 Jun 2020 15:29:23 +0100 Subject: [PATCH 104/485] fix: colours missing from indicator.js The indicator colours for workflow states are incomplete, and only provide the stated colour options for four of the named styles. There are seven Workflow State color options, if you include the empty option, which currently displays as darkgrey. On the Workflow State form, the styles are defined as: "Style represents the button color: Success - Green, Danger - Red, Inverse - Black, Primary - Dark Blue, Info - Light Blue, Warning - Orange" In indicator.js, only four of these - Success, Warning, Danger and Primary are allocated to colours, despite the colours being available. Adding black for Inverse and light-blue for Info fixes this bug. Any non-matching colour will continue to be rendered in dark grey (which can be chosen by selecting the Empty option). --- frappe/public/js/frappe/model/indicator.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/public/js/frappe/model/indicator.js b/frappe/public/js/frappe/model/indicator.js index 028dbde472..c7290e05d5 100644 --- a/frappe/public/js/frappe/model/indicator.js +++ b/frappe/public/js/frappe/model/indicator.js @@ -41,6 +41,8 @@ frappe.get_indicator = function(doc, doctype) { "Warning": "orange", "Danger": "red", "Primary": "blue", + "Inverse": "black", + "Info": "light-blue", }[locals["Workflow State"][value].style]; } if(!colour) colour = "darkgrey"; From aa5b526fa7be22112e84f199774d8da0055f11f4 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Tue, 9 Jun 2020 20:11:38 +0530 Subject: [PATCH 105/485] fix(web_form): set only_select for Link fields in child table --- frappe/public/js/frappe/web_form/webform_script.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/frappe/public/js/frappe/web_form/webform_script.js b/frappe/public/js/frappe/web_form/webform_script.js index 53d9701774..c3211de99f 100644 --- a/frappe/public/js/frappe/web_form/webform_script.js +++ b/frappe/public/js/frappe/web_form/webform_script.js @@ -95,6 +95,11 @@ frappe.ready(function() { }; df.fields = form_data[df.fieldname]; + $.each(df.fields || [], function(_i, field) { + if (field.fieldtype === "Link") { + field.only_select = true; + } + }); if (df.fieldtype === "Attach") { df.is_private = true; From b34c14cde31ab394806043c5e7dd305095a7153a Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Tue, 9 Jun 2020 23:19:11 +0530 Subject: [PATCH 106/485] fix: run handle_hold_time method in parent --- .../doctype/communication/communication.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/frappe/core/doctype/communication/communication.py b/frappe/core/doctype/communication/communication.py index e2dab3b7fc..232d485f36 100644 --- a/frappe/core/doctype/communication/communication.py +++ b/frappe/core/doctype/communication/communication.py @@ -444,13 +444,12 @@ def update_parent_document_on_communication(doc): status_field = parent.meta.get_field("status") if status_field: - options = (status_field.options or '').splitlines() + options = (status_field.options or "").splitlines() # if status has a "Replied" option, then update the status for received communication - if ('Replied' in options) and doc.sent_or_received=="Received": - parent.status = "Open" - parent.flags.ignore_mandatory = True - parent.save() + if ("Replied" in options) and doc.sent_or_received == "Received": + parent.db_set("status", "Open") + parent.run_method("handle_hold_time", "Replied") apply_assignment_rule(parent) else: # update the modified date for document @@ -458,16 +457,16 @@ def update_parent_document_on_communication(doc): update_mins_to_first_communication(parent, doc) set_avg_response_time(parent, doc) - parent.run_method('notify_communication', doc) + parent.run_method("notify_communication", doc) parent.notify_update() def update_mins_to_first_communication(parent, communication): - if parent.meta.has_field('mins_to_first_response') and not parent.get('mins_to_first_response'): + if parent.meta.has_field("mins_to_first_response") and not parent.get("mins_to_first_response"): if is_system_user(communication.sender): first_responded_on = communication.creation - if parent.meta.has_field('first_responded_on') and communication.sent_or_received == "Sent": - parent.db_set('first_responded_on', first_responded_on) - parent.db_set('mins_to_first_response', round(time_diff_in_seconds(first_responded_on, parent.creation) / 60), 2) + if parent.meta.has_field("first_responded_on") and communication.sent_or_received == "Sent": + parent.db_set("first_responded_on", first_responded_on) + parent.db_set("mins_to_first_response", round(time_diff_in_seconds(first_responded_on, parent.creation) / 60), 2) def set_avg_response_time(parent, communication): if parent.meta.has_field("avg_response_time") and communication.sent_or_received == "Sent": From 5710d107e1aa6f1734e82cc39d3a57e1d0289493 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Wed, 10 Jun 2020 01:45:23 +0530 Subject: [PATCH 107/485] chore: Update website links --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 860958087e..7545249610 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

            - + frappe

            @@ -33,8 +33,8 @@ Full-stack web application framework that uses Python and MariaDB on the server side and a tightly integrated client side library. Built for [ERPNext](https://erpnext.com) ### Table of Contents -* [Installation](#installation) -* [Documentation](https://frappe.io/docs) +* [Installation](https://frappeframework.com/docs/user/en/installation) +* [Documentation](https://frappeframework.com/docs) * [License](#license) ### Installation @@ -49,7 +49,7 @@ Full-stack web application framework that uses Python and MariaDB on the server ### Website For details and documentation, see the website -[https://frappe.io](https://frappe.io) +[https://frappeframework.com](https://frappeframework.com) ### License This repository has been released under the [MIT License](LICENSE). From cfa7afb08cb467b2c06a3cc366c7f760ba4afff1 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 10 Jun 2020 11:32:44 +0530 Subject: [PATCH 108/485] fix(doctor): update broken command behaviour --- frappe/commands/__init__.py | 6 ++++-- frappe/commands/scheduler.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/frappe/commands/__init__.py b/frappe/commands/__init__.py index 42f4440547..b7294fff77 100644 --- a/frappe/commands/__init__.py +++ b/frappe/commands/__init__.py @@ -43,12 +43,14 @@ def pass_context(f): return click.pass_context(_func) -def get_site(context): +def get_site(context, raise_err=True): try: site = context.sites[0] return site except (IndexError, TypeError): - raise frappe.SiteNotSpecifiedError + if raise_err: + raise frappe.SiteNotSpecifiedError + return None def popen(command, *args, **kwargs): output = kwargs.get('output', True) diff --git a/frappe/commands/scheduler.py b/frappe/commands/scheduler.py index 511fac6e0d..bd9c9d2cb0 100755 --- a/frappe/commands/scheduler.py +++ b/frappe/commands/scheduler.py @@ -126,7 +126,7 @@ def doctor(context, site=None): "Get diagnostic info about background workers" from frappe.utils.doctor import doctor as _doctor if not site: - site = get_site(context) + site = get_site(context, raise_err=False) return _doctor(site=site) @click.command('show-pending-jobs') From 695826ac49a59f54c7e3a90e495d08601c3e899d Mon Sep 17 00:00:00 2001 From: Prssanna Desai Date: Wed, 10 Jun 2020 11:41:00 +0530 Subject: [PATCH 109/485] fix: use in to check value Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> --- frappe/model/base_document.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index 604d13b830..02e53665a7 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -522,7 +522,7 @@ class BaseDocument(object): def set_fetch_from_value(self, doctype, df, values): fetch_from_fieldname = df.fetch_from.split('.')[-1] value = values[fetch_from_fieldname] - if df.fieldtype == 'Small Text' or df.fieldtype == 'Text' or df.fieldtype == 'Data': + if df.fieldtype in ['Small Text', 'Text', 'Data']: if fetch_from_fieldname in default_fields: from frappe.model.meta import get_default_df fetch_from_df = get_default_df(fetch_from_fieldname) From 0cc5e2522a7a7a315eb9e093b41edd43a69a7f15 Mon Sep 17 00:00:00 2001 From: Prssanna Desai Date: Wed, 10 Jun 2020 11:41:14 +0530 Subject: [PATCH 110/485] fix: use frappe.bold Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> --- frappe/model/base_document.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index 02e53665a7..d7028870f4 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -531,8 +531,8 @@ class BaseDocument(object): if not fetch_from_df: frappe.throw( - _('Please check the value of Fetch From set in {}').format(df.label), - title = 'Wrong Fetch From Value' + _('Please check the value of "Fetch From" set for field {0}').format(frappe.bold(df.label)), + title = _('Wrong Fetch From value') ) fetch_from_ft = fetch_from_df.get('fieldtype') From ef9327c99fe1a4fcea4870de9a5082ba2c13b1e4 Mon Sep 17 00:00:00 2001 From: "Chinmay D. Pai" Date: Wed, 10 Jun 2020 13:23:39 +0530 Subject: [PATCH 111/485] fix: return 0 if no users are found if no users are present in the system, get_total_users returns None instead of 0 causing comparison issues Signed-off-by: Chinmay D. Pai --- frappe/core/doctype/user/user.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index 0c5ebc3ede..69ef617c15 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -841,11 +841,11 @@ def user_query(doctype, txt, searchfield, start, page_len, filters): def get_total_users(): """Returns total no. of system users""" - return frappe.db.sql('''SELECT SUM(`simultaneous_sessions`) + return cint(frappe.db.sql('''SELECT SUM(`simultaneous_sessions`) FROM `tabUser` WHERE `enabled` = 1 AND `user_type` = 'System User' - AND `name` NOT IN ({})'''.format(", ".join(["%s"]*len(STANDARD_USERS))), STANDARD_USERS)[0][0] + AND `name` NOT IN ({})'''.format(", ".join(["%s"]*len(STANDARD_USERS))), STANDARD_USERS)[0][0]) def get_system_users(exclude_users=None, limit=None): if not exclude_users: From 0a62864c6fee5d0dada0f7bffea786da37a3d54d Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 10 Jun 2020 13:31:37 +0530 Subject: [PATCH 112/485] fix: button layout for hero --- frappe/website/web_template/hero/hero.html | 6 +++--- .../hero_with_right_image/hero_with_right_image.html | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frappe/website/web_template/hero/hero.html b/frappe/website/web_template/hero/hero.html index 66d24a9936..b1f758bce4 100644 --- a/frappe/website/web_template/hero/hero.html +++ b/frappe/website/web_template/hero/hero.html @@ -8,14 +8,14 @@

            {%- endif -%} {%- if primary_action or secondary_action -%} -
            +
            {%- if primary_action -%} - + {{ primary_action_label }} {%- endif -%} {%- if secondary_action -%} - + {{ secondary_action_label }} {%- endif -%} diff --git a/frappe/website/web_template/hero_with_right_image/hero_with_right_image.html b/frappe/website/web_template/hero_with_right_image/hero_with_right_image.html index d0c42b87c7..9ea1952aa0 100644 --- a/frappe/website/web_template/hero_with_right_image/hero_with_right_image.html +++ b/frappe/website/web_template/hero_with_right_image/hero_with_right_image.html @@ -9,14 +9,14 @@ {{ subtitle }}

            {%- endif -%} -
            +
            {%- if primary_action -%} - + {{ primary_action_label }} {%- endif -%} {%- if secondary_action -%} - + {{ secondary_action_label }} {%- endif -%} From fa14e474137bd40ba60c8260acfa5c0b38266b35 Mon Sep 17 00:00:00 2001 From: Chinmay Pai Date: Wed, 10 Jun 2020 14:15:53 +0530 Subject: [PATCH 113/485] chore: use flt instead of cint --- frappe/core/doctype/user/user.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index 69ef617c15..7b9266ff64 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals, print_function import frappe from frappe.model.document import Document -from frappe.utils import cint, has_gravatar, format_datetime, now_datetime, get_formatted_email, today +from frappe.utils import cint, flt, has_gravatar, format_datetime, now_datetime, get_formatted_email, today from frappe import throw, msgprint, _ from frappe.utils.password import update_password as _update_password from frappe.desk.notifications import clear_notifications @@ -841,7 +841,7 @@ def user_query(doctype, txt, searchfield, start, page_len, filters): def get_total_users(): """Returns total no. of system users""" - return cint(frappe.db.sql('''SELECT SUM(`simultaneous_sessions`) + return flt(frappe.db.sql('''SELECT SUM(`simultaneous_sessions`) FROM `tabUser` WHERE `enabled` = 1 AND `user_type` = 'System User' From db5888e2f9f849d3a5e7248bbcc98c772e59e403 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Wed, 10 Jun 2020 14:36:31 +0530 Subject: [PATCH 114/485] fix: Consider fraction units for precision --- frappe/public/js/frappe/form/formatters.js | 8 ++++---- frappe/utils/data.py | 7 ++----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js index 6e08255e17..61e373ad7a 100644 --- a/frappe/public/js/frappe/form/formatters.js +++ b/frappe/public/js/frappe/form/formatters.js @@ -69,11 +69,11 @@ frappe.form.formatters = { var decimals = parts.length > 1 ? parts[1] : ""; // parts.length == 2 ??? if ( decimals.length < 3 || decimals.length < precision ) { - const fraction = frappe.model.get_value(":Currency", currency, "smallest_currency_fraction_value") || 100; // if not set, minimum 2. - let fraction_parts = cstr(fraction).split("."); + const fraction = frappe.model.get_value(":Currency", currency, "fraction_units") || 100; // if not set, minimum 2. + precision = cstr(fraction).length - 1; - if (fraction_parts.length > 1) { - precision = fraction_parts[1].length; + if (decimals.length < cstr(fraction).length) { + precision = cstr(fraction).length - 1; } } } diff --git a/frappe/utils/data.py b/frappe/utils/data.py index fe198b7f36..04dde4e178 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -524,11 +524,8 @@ def fmt_money(amount, precision=None, currency=None): if precision > 2: if len(decimals) < 3: if currency: - fraction = frappe.db.get_value("Currency", currency, "smallest_currency_fraction_value", cache=True) or 100 - fraction_parts = cstr(fraction).split(".") - - if len(fraction_parts) > 1: - precision = len(fraction_parts[1]) + fraction = frappe.db.get_value("Currency", currency, "fraction_units", cache=True) or 100 + precision = len(cstr(fraction)) - 1 else: precision = number_format_precision elif len(decimals) < precision: From 737781c0da68dfc8c9f503bcf73435df80efe4ac Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Wed, 10 Jun 2020 14:47:45 +0530 Subject: [PATCH 115/485] fix: Condition --- frappe/public/js/frappe/form/formatters.js | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js index 61e373ad7a..0d3bf980d8 100644 --- a/frappe/public/js/frappe/form/formatters.js +++ b/frappe/public/js/frappe/form/formatters.js @@ -70,7 +70,6 @@ frappe.form.formatters = { if ( decimals.length < 3 || decimals.length < precision ) { const fraction = frappe.model.get_value(":Currency", currency, "fraction_units") || 100; // if not set, minimum 2. - precision = cstr(fraction).length - 1; if (decimals.length < cstr(fraction).length) { precision = cstr(fraction).length - 1; From 1ba65acb1fc441794b1e19826d463a36a09555e9 Mon Sep 17 00:00:00 2001 From: Himanshu Date: Wed, 10 Jun 2020 15:09:59 +0530 Subject: [PATCH 116/485] fix: Add label for Text Editor --- frappe/templates/print_formats/standard_macros.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/templates/print_formats/standard_macros.html b/frappe/templates/print_formats/standard_macros.html index d684c60a2d..a94032efbe 100644 --- a/frappe/templates/print_formats/standard_macros.html +++ b/frappe/templates/print_formats/standard_macros.html @@ -34,8 +34,8 @@ {%- if data -%} {%- set visible_columns = get_visible_columns(doc.get(df.fieldname), table_meta, df) -%} -
            +
@@ -96,7 +96,7 @@ data-fieldname="{{ df.fieldname }}" data-fieldtype="{{ df.fieldtype }}" {%- macro render_text_field(df, doc) -%} {%- if doc.get(df.fieldname) != None -%}
- {%- if df.fieldtype in ("Text", "Code", "Long Text") %}{%- endif %} + {%- if df.fieldtype in ("Text", "Code", "Long Text", "Text Editor") %}{%- endif %} {%- if df.fieldtype=="Code" %} 
{{ doc.get(df.fieldname) }}
{% else -%} From 6cbd5b6adcc143c04fb1bd3b0f3fde9200a8c2d6 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 10 Jun 2020 16:46:28 +0530 Subject: [PATCH 117/485] fix: catch exceptions when sending notification --- .../email/doctype/notification/notification.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/frappe/email/doctype/notification/notification.py b/frappe/email/doctype/notification/notification.py index 8e53b50fa2..fc16a05311 100644 --- a/frappe/email/doctype/notification/notification.py +++ b/frappe/email/doctype/notification/notification.py @@ -119,15 +119,17 @@ def get_context(context): if self.is_standard: self.load_standard_properties(context) + try: + if self.channel == 'Email': + self.send_an_email(doc, context) - if self.channel == 'Email': - self.send_an_email(doc, context) + if self.channel == 'Slack': + self.send_a_slack_msg(doc, context) - if self.channel == 'Slack': - self.send_a_slack_msg(doc, context) - - if self.channel == 'System Notification' or self.send_system_notification: - self.create_system_notification(doc, context) + if self.channel == 'System Notification' or self.send_system_notification: + self.create_system_notification(doc, context) + except: + frappe.log_error(title='Notificaiton Sending Failed', message=frappe.get_traceback()) if self.set_property_after_alert: allow_update = True @@ -167,6 +169,7 @@ def get_context(context): enqueue_create_notification(users, notification_doc) def send_an_email(self, doc, context): + frappe.throw("Cannot send this email. You have crossed the sending limit of 5000 emails for this month.") from email.utils import formataddr subject = self.subject if "{" in subject: From 8ba041565b76459c237b93fe178d7a1a4e46a1cf Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 10 Jun 2020 19:36:57 +0530 Subject: [PATCH 118/485] fix: show login dropdown if already logged on --- frappe/templates/includes/navbar/navbar_login.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/templates/includes/navbar/navbar_login.html b/frappe/templates/includes/navbar/navbar_login.html index 4e2c6dc93b..2a58efe039 100644 --- a/frappe/templates/includes/navbar/navbar_login.html +++ b/frappe/templates/includes/navbar/navbar_login.html @@ -1,5 +1,5 @@ -{% if not only_static and not hide_login %} +{% if not only_static %} {% if frappe.session.user != 'Guest' %}
- - - - {% for col in columns %} - {% if col.name && col._id !== "_check" %} + + + + {% for col in columns %} + {% if col.name && col._id !== "_check" %} - {% endif %} - {% endfor %} - - - - - {% for row in data %} - - {% for col in columns %} - {% if col.name && col._id !== "_check" %} + {% endif %} + {% endfor %} + + + + + {% for row in data %} + + {% for col in columns %} + {% if col.name && col._id !== "_check" %} - {% var value = col.fieldname ? row[col.fieldname] : row[col.id]; %} + {% var value = col.fieldname ? row[col.fieldname] : row[col.id]; %} - - {% endif %} - {% endfor %} - - {% endfor %} - + + {% endif %} + {% endfor %} + + {% endfor %} +
{{ __(col.name) }}
- - {{ - col.formatter - ? col.formatter(row._index, col._index, value, col, row, true) - : col.format - ? col.format(value, row, col, data) - : col.docfield - ? frappe.format(value, col.docfield) - : value - }} - -
+ + {% format_data = row.is_total_row ? data[0] : row %} + {{ + col.formatter + ? col.formatter(row._index, col._index, value, col, format_data, true) + : col.format + ? col.format(value, row, col, format_data) + : col.docfield + ? frappe.format(value, col.docfield) + : value + }} + +
diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 98fc62b19e..8b2e7f9b9d 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -1158,6 +1158,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { if (this.raw_data.add_total_row) { let totalRow = this.datatable.bodyRenderer.getTotalRow().reduce((row, cell) => { row[cell.column.id] = cell.content; + row.is_total_row = true; return row; }, {}); From 1bdb91402db1867ac5d37bbe15e885cf7213770b Mon Sep 17 00:00:00 2001 From: prssanna Date: Mon, 15 Jun 2020 19:34:11 +0530 Subject: [PATCH 170/485] fix: include name of user who removed the assignment --- frappe/desk/form/assign_to.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/desk/form/assign_to.py b/frappe/desk/form/assign_to.py index a916cbca82..5740842a6a 100644 --- a/frappe/desk/form/assign_to.py +++ b/frappe/desk/form/assign_to.py @@ -178,7 +178,8 @@ def notify_assignment(assigned_by, owner, doc_type, doc_name, action='CLOSE', description_html = "
{0}
".format(description) if description else None if action=='CLOSE': - subject = _('Your assignment on {0} {1} has been removed').format(frappe.bold(doc_type), get_title_html(title)) + subject = _('Your assignment on {0} {1} has been removed by {2}') + .format(frappe.bold(doc_type), get_title_html(title), frappe.bold(user_name)) else: user_name = frappe.bold(user_name) document_type = frappe.bold(doc_type) From 35430c6a8bce2b870580f101cff57df5c3df43d3 Mon Sep 17 00:00:00 2001 From: prssanna Date: Mon, 15 Jun 2020 19:35:04 +0530 Subject: [PATCH 171/485] fix: update header for assignment email --- frappe/desk/doctype/notification_log/notification_log.py | 2 +- frappe/desk/form/assign_to.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/desk/doctype/notification_log/notification_log.py b/frappe/desk/doctype/notification_log/notification_log.py index 211b3ae5e6..90c663ef19 100644 --- a/frappe/desk/doctype/notification_log/notification_log.py +++ b/frappe/desk/doctype/notification_log/notification_log.py @@ -103,7 +103,7 @@ def get_email_header(doc): return { 'Default': _('New Notification'), 'Mention': _('New Mention'), - 'Assignment': _('New Assignment'), + 'Assignment': _('Assignment Update'), 'Share': _('New Document Shared'), 'Energy Point': _('Energy Point Update'), }[doc.type or 'Default'] diff --git a/frappe/desk/form/assign_to.py b/frappe/desk/form/assign_to.py index 5740842a6a..26b2bd2835 100644 --- a/frappe/desk/form/assign_to.py +++ b/frappe/desk/form/assign_to.py @@ -178,7 +178,7 @@ def notify_assignment(assigned_by, owner, doc_type, doc_name, action='CLOSE', description_html = "
{0}
".format(description) if description else None if action=='CLOSE': - subject = _('Your assignment on {0} {1} has been removed by {2}') + subject = _('Your assignment on {0} {1} has been removed by {2}')\ .format(frappe.bold(doc_type), get_title_html(title), frappe.bold(user_name)) else: user_name = frappe.bold(user_name) From e12364bb02165776ecf00945955293cca1f0b289 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Mon, 15 Jun 2020 20:09:55 +0530 Subject: [PATCH 172/485] fix: travis for patch --- frappe/model/document.py | 2 ++ frappe/patches.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/model/document.py b/frappe/model/document.py index 7c283b84ce..24450f0cc6 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -1059,6 +1059,8 @@ class Document(BaseDocument): def save_version(self): """Save version info""" + if not self._doc_before_save and frappe.flags.in_patch: return + version = frappe.new_doc('Version') if not self._doc_before_save: version.for_insert(self) diff --git a/frappe/patches.txt b/frappe/patches.txt index 582b369343..0ef6a92490 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -1,4 +1,5 @@ frappe.patches.v12_0.remove_deprecated_fields_from_doctype #3 +execute:frappe.reload_doc('core', 'doctype', 'version') #2017-04-01 execute:frappe.db.sql("""update `tabPatch Log` set patch=replace(patch, '.4_0.', '.v4_0.')""") #2014-05-12 frappe.patches.v5_0.convert_to_barracuda_and_utf8mb4 execute:frappe.utils.global_search.setup_global_search_table() @@ -16,7 +17,6 @@ execute:frappe.reload_doc('core', 'doctype', 'docperm') #2018-05-29 execute:frappe.reload_doc('core', 'doctype', 'comment') frappe.patches.v8_0.drop_is_custom_from_docperm execute:frappe.reload_doc('core', 'doctype', 'module_def') #2017-09-22 -execute:frappe.reload_doc('core', 'doctype', 'version') #2017-04-01 execute:frappe.reload_doc('email', 'doctype', 'document_follow') execute:frappe.reload_doc('core', 'doctype', 'communication_link') #2019-10-02 execute:frappe.reload_doc('core', 'doctype', 'communication') #2019-10-02 From 0f78ba2216460a8810a1125295ec46294d68e4e5 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Mon, 15 Jun 2020 21:54:23 +0530 Subject: [PATCH 173/485] fix: Query report failure (#10701) --- frappe/public/js/frappe/views/reports/query_report.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 8b2e7f9b9d..75f1f443b2 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -269,7 +269,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { frappe.xcall('frappe.desk.query_report.get_script', { report_name: this.report_name }).then(r => { - frappe.dom.eval(r.message.script || ''); + frappe.dom.eval(r.script || ''); frappe.after_ajax(() => { this.report_settings = this.get_local_report_settings(); this.report_settings.html_format = r.message.html_format; From 69098ae28070a40f5e8b75f554cb8b78aa3e25fd Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 15 Jun 2020 22:17:37 +0530 Subject: [PATCH 174/485] refactor: get default desk page from allowed workspaces in boot --- frappe/public/js/frappe/views/desktop/desktop.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/desktop/desktop.js b/frappe/public/js/frappe/views/desktop/desktop.js index 60dbc928c9..73be7f1bbc 100644 --- a/frappe/public/js/frappe/views/desktop/desktop.js +++ b/frappe/public/js/frappe/views/desktop/desktop.js @@ -134,11 +134,13 @@ export default class Desktop { get_page_to_show() { const default_page = this.desktop_settings ? this.desktop_settings["Modules"][0].name - : "Website"; + : frappe.boot.allowed_workspaces[0].name; + let page = frappe.get_route()[1] || localStorage.current_desk_page || default_page; + return page; } From d42ac30759696ddb4c52ddc9539a70bb21d251e9 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Mon, 15 Jun 2020 22:26:53 +0530 Subject: [PATCH 175/485] fix: Query report failure (#10705) --- frappe/public/js/frappe/views/reports/query_report.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 75f1f443b2..ee0dfb2964 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -268,12 +268,12 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { } else { frappe.xcall('frappe.desk.query_report.get_script', { report_name: this.report_name - }).then(r => { - frappe.dom.eval(r.script || ''); + }).then(settings => { + frappe.dom.eval(settings.script || ''); frappe.after_ajax(() => { this.report_settings = this.get_local_report_settings(); - this.report_settings.html_format = r.message.html_format; - this.report_settings.execution_time = r.message.execution_time || 0; + this.report_settings.html_format = settings.html_format; + this.report_settings.execution_time = settings.execution_time || 0; frappe.query_reports[this.report_name] = this.report_settings; resolve(); }); From c161e4d6f29400121108bf7f27210fed5fd95e9e Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Tue, 16 Jun 2020 01:33:32 +0530 Subject: [PATCH 176/485] fix: travis --- frappe/patches.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/patches.txt b/frappe/patches.txt index 0ef6a92490..582b369343 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -1,5 +1,4 @@ frappe.patches.v12_0.remove_deprecated_fields_from_doctype #3 -execute:frappe.reload_doc('core', 'doctype', 'version') #2017-04-01 execute:frappe.db.sql("""update `tabPatch Log` set patch=replace(patch, '.4_0.', '.v4_0.')""") #2014-05-12 frappe.patches.v5_0.convert_to_barracuda_and_utf8mb4 execute:frappe.utils.global_search.setup_global_search_table() @@ -17,6 +16,7 @@ execute:frappe.reload_doc('core', 'doctype', 'docperm') #2018-05-29 execute:frappe.reload_doc('core', 'doctype', 'comment') frappe.patches.v8_0.drop_is_custom_from_docperm execute:frappe.reload_doc('core', 'doctype', 'module_def') #2017-09-22 +execute:frappe.reload_doc('core', 'doctype', 'version') #2017-04-01 execute:frappe.reload_doc('email', 'doctype', 'document_follow') execute:frappe.reload_doc('core', 'doctype', 'communication_link') #2019-10-02 execute:frappe.reload_doc('core', 'doctype', 'communication') #2019-10-02 From c881eb7e45f93af28dae41fe9e942bca5d2469bc Mon Sep 17 00:00:00 2001 From: Alirio Castro Date: Mon, 15 Jun 2020 20:15:56 -0400 Subject: [PATCH 177/485] fix: pass silent as an arg to frappe.request.call --- frappe/public/js/frappe/request.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/frappe/public/js/frappe/request.js b/frappe/public/js/frappe/request.js index ea4de99249..9cf2e1b367 100644 --- a/frappe/public/js/frappe/request.js +++ b/frappe/public/js/frappe/request.js @@ -101,6 +101,11 @@ frappe.call = function(opts) { error_handlers: opts.error_handlers || {}, // show_spinner: !opts.no_spinner, async: opts.async, + /* + this property is evaluated in frappe.request.cleanup, however there is not way to pass this argument, and it is very important + to avoid the msgprint dialog when you are calling and get an unknown exception, mostly when you are calling in batches + */ + silent: opts.silent, url, }); } From 2acb8321a92e8e5a7b386e260bbd979f248f0b43 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 16 Jun 2020 10:50:41 +0530 Subject: [PATCH 178/485] fix: Remove unused code --- frappe/public/js/frappe/views/reports/query_report.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index ee0dfb2964..f82956adac 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -453,8 +453,6 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { filters.prepared_report_name = query_params.prepared_report_name; } - let possible_filters = frappe.query_report[this.report_name].filters; - return new Promise(resolve => { this.last_ajax = frappe.call({ method: 'frappe.desk.query_report.run', From aa6495e0dab72f9ae55a86206a94e1d265d60411 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 16 Jun 2020 13:32:06 +0000 Subject: [PATCH 179/485] chore: minor changes to language Co-authored-by: gavin --- frappe/commands/site.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/commands/site.py b/frappe/commands/site.py index 2df99c2d3e..55ac05bd71 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -414,7 +414,7 @@ def remove_from_installed_apps(context, app): @click.argument('app') @click.option('--yes', '-y', help='To bypass confirmation prompt for uninstalling the app', is_flag=True, default=False, multiple=True) @click.option('--dry-run', help='List all doctypes that will be deleted', is_flag=True, default=False) -@click.option('--no-backup', help='Do not backup the site DB', is_flag=True, default=False ) +@click.option('--no-backup', help='Do not backup the site', is_flag=True, default=False) @pass_context def uninstall(context, app, dry_run=False, yes=False, no_backup=False): "Remove app and linked modules from site" From 3ec76fb7e0ece4ceadb4efeb2d5375506dc41b56 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 16 Jun 2020 21:46:22 +0530 Subject: [PATCH 180/485] fix: stringify objects before sending --- frappe/website/js/website.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/frappe/website/js/website.js b/frappe/website/js/website.js index c95345770d..8b82723aab 100644 --- a/frappe/website/js/website.js +++ b/frappe/website/js/website.js @@ -112,6 +112,12 @@ $.extend(frappe, { opts.args.cmd = opts.method; } + $.each(opts.args, function(key, val) { + if(typeof val != "string" || val !== null) { + opts.args[key] = JSON.stringify(val); + } + }); + if(!opts.no_spinner) { //NProgress.start(); } From 595f37bf105d8fe3bc7694e45b95fc5d07495a94 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 17 Jun 2020 11:33:16 +0530 Subject: [PATCH 181/485] style: space after if --- frappe/website/js/website.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/js/website.js b/frappe/website/js/website.js index 8b82723aab..c91d00def9 100644 --- a/frappe/website/js/website.js +++ b/frappe/website/js/website.js @@ -113,7 +113,7 @@ $.extend(frappe, { } $.each(opts.args, function(key, val) { - if(typeof val != "string" || val !== null) { + if (typeof val != "string" || val !== null) { opts.args[key] = JSON.stringify(val); } }); From 5f113ffd768431991f87cea1f5f804a25a1777d3 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 17 Jun 2020 13:19:22 +0530 Subject: [PATCH 182/485] fix: Use rename doc instead of manually moving the data --- frappe/patches/v13_0/replace_old_data_import.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/frappe/patches/v13_0/replace_old_data_import.py b/frappe/patches/v13_0/replace_old_data_import.py index ebc84397a6..05d50efc45 100644 --- a/frappe/patches/v13_0/replace_old_data_import.py +++ b/frappe/patches/v13_0/replace_old_data_import.py @@ -6,9 +6,7 @@ import frappe def execute(): - frappe.db.sql( - """INSERT INTO `tabData Import Legacy` SELECT * FROM `tabData Import`""" - ) + frappe.rename_doc('DocType', 'Data Import', 'Data Import Legacy') frappe.db.commit() frappe.db.sql("DROP TABLE IF EXISTS `tabData Import`") frappe.reload_doc("core", "doctype", "data_import") From a3ab33f4dab828e70b8be6cfc5f91ac1e752757e Mon Sep 17 00:00:00 2001 From: Anupam K Date: Wed, 17 Jun 2020 13:44:51 +0530 Subject: [PATCH 183/485] sider fix --- frappe/public/js/frappe/views/calendar/calendar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/calendar/calendar.js b/frappe/public/js/frappe/views/calendar/calendar.js index 0c451225e0..30aa209f81 100644 --- a/frappe/public/js/frappe/views/calendar/calendar.js +++ b/frappe/public/js/frappe/views/calendar/calendar.js @@ -78,7 +78,7 @@ frappe.views.CalendarView = class CalendarView extends frappe.views.ListView { start: doc.start_date_field, end: doc.end_date_field, title: doc.subject_field - } + }; field_map.allDay = doc.all_day ? 0 : 1; Object.assign(options, { field_map: field_map }); resolve(options); From c7b09e7b69275d6ed44c59b80319ee6604e92e6e Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 17 Jun 2020 08:21:03 +0000 Subject: [PATCH 184/485] fix: minor styling fixes for onboarding subtitle (#10717) --- frappe/public/less/desktop.less | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/public/less/desktop.less b/frappe/public/less/desktop.less index bfbd843152..3e3b59ddf8 100644 --- a/frappe/public/less/desktop.less +++ b/frappe/public/less/desktop.less @@ -408,6 +408,8 @@ .widget-subtitle { margin-top: 5px; + font-size: 14px; + font-weight: 400; color: @text-muted; } From 443edf209abeaedfa5105308188b7d6704d186f7 Mon Sep 17 00:00:00 2001 From: Anupam K Date: Wed, 17 Jun 2020 14:02:30 +0530 Subject: [PATCH 185/485] calendar view fix --- .../public/js/frappe/views/calendar/calendar.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/frappe/public/js/frappe/views/calendar/calendar.js b/frappe/public/js/frappe/views/calendar/calendar.js index 30aa209f81..e2e7852ee4 100644 --- a/frappe/public/js/frappe/views/calendar/calendar.js +++ b/frappe/public/js/frappe/views/calendar/calendar.js @@ -73,14 +73,15 @@ frappe.views.CalendarView = class CalendarView extends frappe.views.ListView { } else { frappe.model.with_doc('Calendar View', calendar_name, () => { const doc = frappe.get_doc('Calendar View', calendar_name); - let field_map = { - id: "name", - start: doc.start_date_field, - end: doc.end_date_field, - title: doc.subject_field - }; - field_map.allDay = doc.all_day ? 0 : 1; - Object.assign(options, { field_map: field_map }); + Object.assign(options, { + field_map: { + id: "name", + start: doc.start_date_field, + end: doc.end_date_field, + title: doc.subject_field, + allDay = doc.all_day ? 1 : 0 + } + }); resolve(options); }); } From 16f5e48fcbc38aca76cbc5ef531491dfd15d0707 Mon Sep 17 00:00:00 2001 From: Himanshu Date: Wed, 17 Jun 2020 14:12:44 +0530 Subject: [PATCH 186/485] Update calendar.js --- frappe/public/js/frappe/views/calendar/calendar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/calendar/calendar.js b/frappe/public/js/frappe/views/calendar/calendar.js index e2e7852ee4..e053da0263 100644 --- a/frappe/public/js/frappe/views/calendar/calendar.js +++ b/frappe/public/js/frappe/views/calendar/calendar.js @@ -79,7 +79,7 @@ frappe.views.CalendarView = class CalendarView extends frappe.views.ListView { start: doc.start_date_field, end: doc.end_date_field, title: doc.subject_field, - allDay = doc.all_day ? 1 : 0 + allDay: doc.all_day ? 1 : 0 } }); resolve(options); From 4c6b58da2699189e6992707254f7a95f5c7df64a Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 17 Jun 2020 09:06:47 +0000 Subject: [PATCH 187/485] fix: update condition that stringified everything (#10718) --- frappe/website/js/website.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/website/js/website.js b/frappe/website/js/website.js index c91d00def9..6ea1f2e380 100644 --- a/frappe/website/js/website.js +++ b/frappe/website/js/website.js @@ -113,7 +113,8 @@ $.extend(frappe, { } $.each(opts.args, function(key, val) { - if (typeof val != "string" || val !== null) { + if (typeof val != "string" && val !== null) { + console.log(JSON.stringify(val)) opts.args[key] = JSON.stringify(val); } }); From 5f119b33eafbacbe83770b3c28e956ea46dfa8b4 Mon Sep 17 00:00:00 2001 From: Prssanna Desai Date: Wed, 17 Jun 2020 15:07:20 +0530 Subject: [PATCH 188/485] fix: fetch todos with status not equal to cancelled in assigned to sidebar filter (#10714) (cherry picked from commit d682a64ebd3d2cd3d307ff06ceca7a729412dda7) --- frappe/desk/listview.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/listview.py b/frappe/desk/listview.py index 1bce14fb2d..1d10a13930 100644 --- a/frappe/desk/listview.py +++ b/frappe/desk/listview.py @@ -35,7 +35,7 @@ def get_group_by_count(doctype, current_filters, field): from `tabToDo`, `tabUser` where - `tabToDo`.status='Open' and + `tabToDo`.status!='Cancelled' and `tabToDo`.owner = `tabUser`.name and `tabUser`.user_type = 'System User' {subquery_condition} From e5a87aa421303433c9a476d80e4fcda39e82d813 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 17 Jun 2020 14:07:30 +0000 Subject: [PATCH 189/485] style: remove stray console.log (#10722) --- frappe/website/js/website.js | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/website/js/website.js b/frappe/website/js/website.js index 6ea1f2e380..b52a3fef63 100644 --- a/frappe/website/js/website.js +++ b/frappe/website/js/website.js @@ -114,7 +114,6 @@ $.extend(frappe, { $.each(opts.args, function(key, val) { if (typeof val != "string" && val !== null) { - console.log(JSON.stringify(val)) opts.args[key] = JSON.stringify(val); } }); From 50c6541cd7ccc50357e9b5cada8361ed8db8db95 Mon Sep 17 00:00:00 2001 From: gavin Date: Thu, 18 Jun 2020 09:38:47 +0530 Subject: [PATCH 190/485] fix: Don't pass errored subprocess build An error like ```subprocess.CalledProcessError: Command '['git', 'diff', '--name-only', '95e5cd97d24d9ce809b8287443e9be230a230179...16f5e48fcbc38aca76cbc5ef531491dfd15d0707']' returned non-zero exit status 128.``` exits with code 1 and exits the build and sets the build as successful --- .travis/roulette.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis/roulette.py b/.travis/roulette.py index ce6c08be7c..4d83137199 100644 --- a/.travis/roulette.py +++ b/.travis/roulette.py @@ -27,8 +27,11 @@ if __name__ == "__main__": commit_range = os.environ.get("TRAVIS_COMMIT_RANGE") print("Build Type: {}".format(build_type)) print("Commit Range: {}".format(commit_range)) - - files_changed = get_output("git diff --name-only {}".format(commit_range), shell=False) + + try: + files_changed = get_output("git diff --name-only {}".format(commit_range), shell=False) + except Exception: + sys.exit(2) if "fatal" not in files_changed: files_list = files_changed.split() From 38f590c1c60975ca5fdc2b1f2141557026446efa Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 18 Jun 2020 12:19:59 +0530 Subject: [PATCH 191/485] fix: Style breadcrumb container using class --- frappe/public/scss/doc.scss | 10 ++++++++++ frappe/public/scss/website.scss | 4 ++++ frappe/templates/includes/breadcrumbs.html | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/frappe/public/scss/doc.scss b/frappe/public/scss/doc.scss index 1eb3422042..13a59ba45b 100644 --- a/frappe/public/scss/doc.scss +++ b/frappe/public/scss/doc.scss @@ -276,3 +276,13 @@ $navbar-height-lg: 4.5rem; padding-top: 1rem; text-align: right; } + +.doc-content .breadcrumb-container { + padding-left: 0; + padding-right: 0; + margin-top: 3rem; + + .breadcrumb { + margin-bottom: 0; + } +} \ No newline at end of file diff --git a/frappe/public/scss/website.scss b/frappe/public/scss/website.scss index 5164fb2eba..e7fb0b3f00 100644 --- a/frappe/public/scss/website.scss +++ b/frappe/public/scss/website.scss @@ -110,6 +110,10 @@ color: $light; } +.breadcrumb-container { + margin-top: 1rem; +} + .breadcrumb { padding-left: 0; padding-right: 0; diff --git a/frappe/templates/includes/breadcrumbs.html b/frappe/templates/includes/breadcrumbs.html index 4cb3ef5c0c..e281c4b111 100644 --- a/frappe/templates/includes/breadcrumbs.html +++ b/frappe/templates/includes/breadcrumbs.html @@ -1,5 +1,5 @@ {%- if not no_breadcrumbs and parents -%} -
+
- {{ main_content() }} +
+ {% block page_container %} +
+
+ {%- if add_breadcrumbs -%} + {% include "templates/includes/breadcrumbs.html" %} + {%- endif -%} + {%- block page_content -%}{%- endblock -%} +
+
+ {% endblock %} +
+ {% block page_toc %} + {% if page_toc_html %}
On this page
{{ page_toc_html }}
+ {% endif %} + {% endblock %}
From ec060e0aa3d779a39a8e1667c3366e3de3fadb1b Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 18 Jun 2020 12:23:54 +0530 Subject: [PATCH 195/485] fix: Remove redundant macro --- frappe/templates/web.html | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/frappe/templates/web.html b/frappe/templates/web.html index 2e7aea6b53..e014ef7ace 100644 --- a/frappe/templates/web.html +++ b/frappe/templates/web.html @@ -1,10 +1,6 @@ {% extends base_template_path %} {% block hero %}{% endblock %} -{% macro page_content() %} -{%- block page_content -%}{%- endblock -%} -{% endmacro %} - {% block content %} {% macro main_content() %} @@ -31,7 +27,7 @@
- {{ page_content() }} + {%- block page_content -%}{%- endblock -%}
From 0b84f21675ad856894adc220e8f8bdbb139ef002 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 18 Jun 2020 13:09:02 +0530 Subject: [PATCH 196/485] fix: Breadcrumb alignment with sidebar --- frappe/public/scss/sidebar.scss | 1 + frappe/public/scss/website.scss | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/public/scss/sidebar.scss b/frappe/public/scss/sidebar.scss index 4dc8e64631..d3442c2344 100644 --- a/frappe/public/scss/sidebar.scss +++ b/frappe/public/scss/sidebar.scss @@ -37,6 +37,7 @@ h6 { font-size: $font-size-sm; margin-bottom: 0.75rem; + line-height: 1.5; } > ul { diff --git a/frappe/public/scss/website.scss b/frappe/public/scss/website.scss index 9e69e8aa27..e03c502784 100644 --- a/frappe/public/scss/website.scss +++ b/frappe/public/scss/website.scss @@ -115,8 +115,8 @@ } .breadcrumb { - padding-left: 0; - padding-right: 0; + padding: 0; + font-size: $font-size-sm; background-color: white; } From 6bc71d47d2aaad8b0714cbb1e73baf70b555dd86 Mon Sep 17 00:00:00 2001 From: vishdha Date: Mon, 15 Jun 2020 17:17:17 +0530 Subject: [PATCH 197/485] fix: on primary action callback close msgprint --- frappe/public/js/frappe/ui/messages.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/frappe/public/js/frappe/ui/messages.js b/frappe/public/js/frappe/ui/messages.js index ab20feeedd..85d7e6755a 100644 --- a/frappe/public/js/frappe/ui/messages.js +++ b/frappe/public/js/frappe/ui/messages.js @@ -167,6 +167,22 @@ frappe.msgprint = function(msg, title, is_minimizable) { method: data.primary_action.server_action, args: { args: data.primary_action.args + }, + freeze: true, + callback: (r) => { + frappe.run_serially([ + () => { + if (data.primary_action.hide_on_success) { + frappe.hide_msgprint(); + } + }, + () => frappe.timeout(.1), + () => { + if (r && r.message) { + frappe.msgprint(r.message, title="Success"); + } + } + ]); } }); } From 03ef14b231f0205ed37d2c98d114bf0548428716 Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 20 May 2020 18:03:49 +0530 Subject: [PATCH 198/485] fix: include docname in notification email --- .../desk/doctype/notification_log/notification_log.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/frappe/desk/doctype/notification_log/notification_log.py b/frappe/desk/doctype/notification_log/notification_log.py index 90c663ef19..007173e7a6 100644 --- a/frappe/desk/doctype/notification_log/notification_log.py +++ b/frappe/desk/doctype/notification_log/notification_log.py @@ -83,13 +83,14 @@ def send_notification_email(doc): doc_link = get_url_to_form(doc.document_type, doc.document_name) header = get_email_header(doc) email_subject = strip_html(doc.subject) + body_content = get_email_body_content(doc) frappe.sendmail( recipients = doc.for_user, subject = email_subject, template = "new_notification", args = { - 'body_content': doc.subject, + 'body_content': body_content, 'description': doc.email_content, 'document_type': doc.document_type, 'document_name': doc.document_name, @@ -99,6 +100,13 @@ def send_notification_email(doc): now=frappe.flags.in_test ) +def get_email_body_content(doc): + #include document name in email content + title_html = get_title_html(get_title(doc.document_type, doc.document_name)) + subject_parts = doc.subject.partition(title_html) + body_content = "{0}{1} ({2}){3}".format(subject_parts[0], subject_parts[1], doc.document_name, subject_parts[2]) + return body_content + def get_email_header(doc): return { 'Default': _('New Notification'), From 42a7ee190aeffce1402a9babdf676fe8496e1ebb Mon Sep 17 00:00:00 2001 From: prssanna Date: Tue, 26 May 2020 12:09:02 +0530 Subject: [PATCH 199/485] fix: fix notification email template --- frappe/templates/emails/new_notification.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/templates/emails/new_notification.html b/frappe/templates/emails/new_notification.html index fb1fc98901..4eea49a712 100644 --- a/frappe/templates/emails/new_notification.html +++ b/frappe/templates/emails/new_notification.html @@ -8,6 +8,5 @@ {% endif %}
- {{ _("Login and view in Browser") }} + {{ _("Open Document") }}
- From 92391c10e6e3fd2c96db027e985d98a9018fe387 Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 27 May 2020 11:27:07 +0530 Subject: [PATCH 200/485] fix: include docname in email header --- .../notification_log/notification_log.py | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/frappe/desk/doctype/notification_log/notification_log.py b/frappe/desk/doctype/notification_log/notification_log.py index 007173e7a6..12f2c41274 100644 --- a/frappe/desk/doctype/notification_log/notification_log.py +++ b/frappe/desk/doctype/notification_log/notification_log.py @@ -83,14 +83,13 @@ def send_notification_email(doc): doc_link = get_url_to_form(doc.document_type, doc.document_name) header = get_email_header(doc) email_subject = strip_html(doc.subject) - body_content = get_email_body_content(doc) frappe.sendmail( recipients = doc.for_user, subject = email_subject, template = "new_notification", args = { - 'body_content': body_content, + 'body_content': doc.subject, 'description': doc.email_content, 'document_type': doc.document_type, 'document_name': doc.document_name, @@ -100,22 +99,17 @@ def send_notification_email(doc): now=frappe.flags.in_test ) -def get_email_body_content(doc): - #include document name in email content - title_html = get_title_html(get_title(doc.document_type, doc.document_name)) - subject_parts = doc.subject.partition(title_html) - body_content = "{0}{1} ({2}){3}".format(subject_parts[0], subject_parts[1], doc.document_name, subject_parts[2]) - return body_content - def get_email_header(doc): - return { + docname = doc.document_name + header_map = { 'Default': _('New Notification'), - 'Mention': _('New Mention'), - 'Assignment': _('Assignment Update'), - 'Share': _('New Document Shared'), - 'Energy Point': _('Energy Point Update'), - }[doc.type or 'Default'] + 'Mention': _('New Mention on {0}').format(docname), + 'Assignment': _('Assignment Update on {0}').format(docname), + 'Share': _('New Document Shared {0}').format(docname), + 'Energy Point': _('Energy Point Update on {0}').format(docname), + } + return header_map[doc.type or 'Default'] @frappe.whitelist() def mark_all_as_read(): From 1afdc6b9922a1236d474a3008fcd14ab0687f930 Mon Sep 17 00:00:00 2001 From: prssanna Date: Thu, 14 May 2020 11:50:42 +0530 Subject: [PATCH 201/485] feat: show users that are currently typing on the form --- .../js/frappe/form/sidebar/form_sidebar.js | 10 +- .../frappe/form/sidebar/form_sidebar_users.js | 87 +++++++++++++++ .../js/frappe/form/sidebar/form_viewers.js | 80 -------------- .../frappe/form/templates/form_sidebar.html | 4 + frappe/public/js/frappe/socketio_client.js | 17 ++- .../public/js/frappe/views/communication.js | 8 ++ frappe/public/js/frappe/views/formview.js | 8 +- socketio.js | 102 +++++++++++++----- 8 files changed, 204 insertions(+), 112 deletions(-) create mode 100644 frappe/public/js/frappe/form/sidebar/form_sidebar_users.js delete mode 100644 frappe/public/js/frappe/form/sidebar/form_viewers.js diff --git a/frappe/public/js/frappe/form/sidebar/form_sidebar.js b/frappe/public/js/frappe/form/sidebar/form_sidebar.js index a145e47149..34b5fb3535 100644 --- a/frappe/public/js/frappe/form/sidebar/form_sidebar.js +++ b/frappe/public/js/frappe/form/sidebar/form_sidebar.js @@ -6,7 +6,7 @@ import './share'; import './review'; import './document_follow'; import './user_image'; -import './form_viewers'; +import './form_sidebar_users'; frappe.ui.form.Sidebar = Class.extend({ init: function(opts) { @@ -28,7 +28,7 @@ frappe.ui.form.Sidebar = Class.extend({ this.make_attachments(); this.make_review(); this.make_shared(); - this.make_viewers(); + this.make_sidebar_users(); this.make_tags(); this.make_like(); @@ -177,10 +177,10 @@ frappe.ui.form.Sidebar = Class.extend({ parent: this.sidebar.find(".form-shared") }); }, - make_viewers: function() { - this.frm.viewers = new frappe.ui.form.Viewers({ + make_sidebar_users: function() { + this.frm.viewers = new frappe.ui.form.SidebarUsers({ frm: this.frm, - parent: this.sidebar.find(".form-viewers") + $wrapper: this.sidebar, }); }, add_user_action: function(label, click) { diff --git a/frappe/public/js/frappe/form/sidebar/form_sidebar_users.js b/frappe/public/js/frappe/form/sidebar/form_sidebar_users.js new file mode 100644 index 0000000000..16f0f32376 --- /dev/null +++ b/frappe/public/js/frappe/form/sidebar/form_sidebar_users.js @@ -0,0 +1,87 @@ +frappe.ui.form.SidebarUsers = Class.extend({ + init: function(opts) { + $.extend(this, opts); + }, + get_users: function(type) { + let docinfo = this.frm.get_docinfo(); + return docinfo ? docinfo[type] || null: null; + }, + refresh: function(data_updated, type) { + this.parent = type == 'viewers'? this.$wrapper.find('.form-viewers'): this.$wrapper.find('.form-typers'); + this.parent.empty(); + + const users = this.get_users(type); + users && this.show_in_sidebar(users, type, data_updated); + }, + show_in_sidebar: function(users, type, show_alert) { + let sidebar_users = []; + let new_users = []; + let current_users = []; + + const message = type == 'viewers' ? 'viewing this document': 'typing...'; + + users.current.forEach(username => { + if (username === frappe.session.user) { + // current user + return; + } + + var user_info = frappe.user_info(username); + sidebar_users.push({ + image: user_info.image, + fullname: user_info.fullname, + abbr: user_info.abbr, + color: user_info.color, + title: __("{0} is currently {1}", [user_info.fullname, message]) + }); + + if (users.new.indexOf(username) !== -1) { + new_users.push(user_info.fullname); + } + + current_users.push(user_info.fullname); + }); + + if (sidebar_users.length) { + this.parent.parent().removeClass('hidden'); + this.parent.append(frappe.render_template('users_in_sidebar', {'users': sidebar_users})); + } else { + this.parent.parent().addClass('hidden'); + } + + // For typers always show the alert + // For viewers show the alert to new user viewing this document + const alert_users = type == 'viewers' ? new_users : current_users; + show_alert && this.show_alert(alert_users, message); + }, + show_alert(users, message) { + if (users.length) { + if (users.length===1) { + frappe.show_alert(__('{0} is currently {1}', [users[0], message])); + } else { + frappe.show_alert(__('{0} are currently {1}', [frappe.utils.comma_and(users), message])); + } + + } + } +}); + +frappe.ui.form.set_users = function(data, type) { + const doctype = data.doctype; + const docname = data.docname; + const docinfo = frappe.model.get_docinfo(doctype, docname); + + const past_users = ((docinfo && docinfo[type]) || {}).past || []; + const users = data.users || []; + const new_users = users.filter(user => !past_users.includes(user)); + + frappe.model.set_docinfo(doctype, docname, type, { + past: past_users.concat(new_users), + new: new_users, + current: users + }); + + if (cur_frm && cur_frm.doc && cur_frm.doc.doctype===doctype && cur_frm.doc.name==docname) { + cur_frm.viewers.refresh(true, type); + } +} \ No newline at end of file diff --git a/frappe/public/js/frappe/form/sidebar/form_viewers.js b/frappe/public/js/frappe/form/sidebar/form_viewers.js deleted file mode 100644 index 72f4984e94..0000000000 --- a/frappe/public/js/frappe/form/sidebar/form_viewers.js +++ /dev/null @@ -1,80 +0,0 @@ - - -frappe.ui.form.Viewers = Class.extend({ - init: function(opts) { - $.extend(this, opts); - }, - get_viewers: function() { - let docinfo = this.frm.get_docinfo(); - if (docinfo) { - return docinfo.viewers || {}; - } else { - return {}; - } - }, - refresh: function(data_updated) { - this.parent.empty(); - - var viewers = this.get_viewers(); - - var users = []; - var new_users = []; - for (var i=0, l=(viewers.current || []).length; i < l; i++) { - var username = viewers.current[i]; - if (username===frappe.session.user) { - // current user - continue; - } - - var user_info = frappe.user_info(username); - users.push({ - image: user_info.image, - fullname: user_info.fullname, - abbr: user_info.abbr, - color: user_info.color, - title: __("{0} is currently viewing this document", [user_info.fullname]) - }); - - if (viewers.new.indexOf(username)!==-1) { - new_users.push(user_info.fullname); - } - } - - if (users.length) { - this.parent.parent().removeClass("hidden"); - this.parent.append(frappe.render_template("users_in_sidebar", {"users": users})); - } else { - this.parent.parent().addClass("hidden"); - } - - if (data_updated && new_users.length) { - // new user viewing this document, who wasn't viewing in the past - if (new_users.length===1) { - frappe.show_alert(__("{0} is currently viewing this document", [new_users[0]])); - } else { - frappe.show_alert(__("{0} are currently viewing this document", [frappe.utils.comma_and(new_users)])); - } - - } - } -}); - -frappe.ui.form.set_viewers = function(data) { - var doctype = data.doctype; - var docname = data.docname; - var docinfo = frappe.model.get_docinfo(doctype, docname); - var past_viewers = ((docinfo && docinfo.viewers) || {}).past || []; - var viewers = data.viewers || []; - - var new_viewers = viewers.filter(viewer => !past_viewers.includes(viewer)); - - frappe.model.set_docinfo(doctype, docname, "viewers", { - past: past_viewers.concat(new_viewers), - new: new_viewers, - current: viewers - }); - - if (cur_frm && cur_frm.doc && cur_frm.doc.doctype===doctype && cur_frm.doc.name==docname) { - cur_frm.viewers.refresh(true); - } -} diff --git a/frappe/public/js/frappe/form/templates/form_sidebar.html b/frappe/public/js/frappe/form/templates/form_sidebar.html index c3f2de9c7e..77bff50461 100644 --- a/frappe/public/js/frappe/form/templates/form_sidebar.html +++ b/frappe/public/js/frappe/form/templates/form_sidebar.html @@ -78,6 +78,10 @@
  • {%= __("Currently Viewing") %}
  • +
      +
    • {%= __("Currently Typing") %}
      • +
    • +
    diff --git a/frappe/public/js/frappe/socketio_client.js b/frappe/public/js/frappe/socketio_client.js index 1411b6289d..52162f31c7 100644 --- a/frappe/public/js/frappe/socketio_client.js +++ b/frappe/public/js/frappe/socketio_client.js @@ -89,6 +89,14 @@ frappe.socketio = { frappe.socketio.doc_close(frm.doctype, frm.docname); }); + $(document).on('form-typing', function(e, frm) { + frappe.socketio.form_typing(frm.doctype, frm.docname); + }); + + $(document).on('form-stopped-typing', function(e, frm) { + frappe.socketio.form_stopped_typing(frm.doctype, frm.docname); + }); + window.onbeforeunload = function() { if (!cur_frm || cur_frm.is_new()) { return; @@ -162,7 +170,14 @@ frappe.socketio = { // notify that the user has closed this doc frappe.socketio.socket.emit('doc_close', doctype, docname); }, - + form_typing: function(doctype, docname) { + // notifiy that the user is typing on the doc + frappe.socketio.socket.emit('doc_typing', doctype, docname); + }, + form_stopped_typing: function(doctype, docname) { + // notifiy that the user has stopped typing + frappe.socketio.socket.emit('doc_typing_stopped', doctype, docname); + }, setup_listeners: function() { frappe.socketio.socket.on('task_status_change', function(data) { frappe.socketio.process_response(data, data.status.toLowerCase()); diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js index ba290417f5..8dad5d9121 100755 --- a/frappe/public/js/frappe/views/communication.js +++ b/frappe/public/js/frappe/views/communication.js @@ -66,6 +66,10 @@ frappe.views.CommunicationComposer = Class.extend({ }) this.prepare(); this.dialog.show(); + + if (this.frm) { + $(document).trigger('form-typing', [this.frm]); + } }, get_fields: function() { @@ -262,6 +266,10 @@ frappe.views.CommunicationComposer = Class.extend({ subject: me.dialog.get_value("subject"), content: me.dialog.get_value("content"), }); + + if (me.frm) { + $(document).trigger("form-stopped-typing", [me.frm]); + } } this.dialog.on_page_show = function() { diff --git a/frappe/public/js/frappe/views/formview.js b/frappe/public/js/frappe/views/formview.js index 033569a03c..7440ab198d 100644 --- a/frappe/public/js/frappe/views/formview.js +++ b/frappe/public/js/frappe/views/formview.js @@ -37,7 +37,13 @@ frappe.views.FormFactory = class FormFactory extends frappe.views.Factory { }); frappe.realtime.on("doc_viewers", function(data) { - frappe.ui.form.set_viewers(data); + // set users that currently viewing the form + frappe.ui.form.set_users(data, 'viewers'); + }); + + frappe.realtime.on("doc_typers", function(data) { + // set users that currently typing on the form + frappe.ui.form.set_users(data, 'typers'); }); } diff --git a/socketio.js b/socketio.js index 95e8414914..d93579928e 100644 --- a/socketio.js +++ b/socketio.js @@ -141,7 +141,6 @@ io.on('connection', function (socket) { }); socket.on('doc_open', function (doctype, docname) { - // show who is currently viewing the form can_subscribe_doc({ socket: socket, sid: sid, @@ -151,11 +150,25 @@ io.on('connection', function (socket) { var room = get_open_doc_room(socket, doctype, docname); socket.join(room); - send_viewers({ - socket: socket, - doctype: doctype, - docname: docname, - }); + // show who is currently viewing the form + send_users( + { + socket: socket, + doctype: doctype, + docname: docname, + }, + 'view' + ); + + // show who is currently typing on the form + send_users( + { + socket: socket, + doctype: doctype, + docname: docname, + }, + 'type' + ) } }); }); @@ -164,11 +177,44 @@ io.on('connection', function (socket) { // remove this user from the list of 'who is currently viewing the form' var room = get_open_doc_room(socket, doctype, docname); socket.leave(room); - send_viewers({ - socket: socket, - doctype: doctype, - docname: docname, - }); + send_users( + { + socket: socket, + doctype: doctype, + docname: docname, + }, + 'view' + ); + }); + + socket.on('doc_typing', function (doctype, docname) { + // show users that are currently typing on the form + const room = get_typing_room(socket, doctype, docname); + socket.join(room); + + send_users( + { + socket: socket, + doctype: doctype, + docname: docname, + }, + 'type' + ); + }); + + socket.on('doc_typing_stopped', function (doctype, docname) { + // remove this user from the list of users currently typing on the form' + const room = get_typing_room(socket, doctype, docname); + socket.leave(room); + + send_users( + { + socket: socket, + doctype: doctype, + docname: docname, + }, + 'type' + ); }); socket.on('upload-accept-slice', (data) => { @@ -246,6 +292,10 @@ function get_open_doc_room(socket, doctype, docname) { return get_site_name(socket) + ':open_doc:' + doctype + '/' + docname; } +function get_typing_room(socket, doctype, docname) { + return get_site_name(socket) + ':typing:' + doctype + '/' + docname; +} + function get_user_room(socket, user) { return get_site_name(socket) + ':user:' + user; } @@ -325,36 +375,38 @@ function can_subscribe_doc(args) { }); } -function send_viewers(args) { - // send to doc room, 'users currently viewing this document' + +function send_users(args, action) { if (!(args && args.doctype && args.docname)) { return; } - // open doc room - var room = get_open_doc_room(args.socket, args.doctype, args.docname); + const open_doc_room = get_open_doc_room(args.socket, args.doctype, args.docname); - var socketio_room = io.sockets.adapter.rooms[room] || {}; + const room = action == 'view' ? open_doc_room: get_typing_room(args.socket, args.doctype, args.docname); + const socketio_room = io.sockets.adapter.rooms[room] || {}; // for compatibility with both v1.3.7 and 1.4.4 - var clients_dict = ("sockets" in socketio_room) ? socketio_room.sockets : socketio_room; + const clients_dict = ('sockets' in socketio_room) ? socketio_room.sockets : socketio_room; // socket ids connected to this room - var clients = Object.keys(clients_dict || {}); + const clients = Object.keys(clients_dict || {}); - var viewers = []; - for (var i in io.sockets.sockets) { - var s = io.sockets.sockets[i]; + let users = []; + for (let i in io.sockets.sockets) { + const s = io.sockets.sockets[i]; if (clients.indexOf(s.id) !== -1) { // this socket is connected to the room - viewers.push(s.user); + users.push(s.user); } } + const emit_event = action == 'view' ? 'doc_viewers' : 'doc_typers'; + // notify - io.to(room).emit("doc_viewers", { + io.to(open_doc_room).emit(emit_event, { doctype: args.doctype, docname: args.docname, - viewers: viewers + users: users }); -} \ No newline at end of file +} From 3ec8f85746dd25f7359e7819eb9858496cffa08e Mon Sep 17 00:00:00 2001 From: prssanna Date: Thu, 14 May 2020 12:11:20 +0530 Subject: [PATCH 202/485] fix: trigger stopped typing on doc close --- frappe/public/js/frappe/socketio_client.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frappe/public/js/frappe/socketio_client.js b/frappe/public/js/frappe/socketio_client.js index 52162f31c7..fdc3f8619c 100644 --- a/frappe/public/js/frappe/socketio_client.js +++ b/frappe/public/js/frappe/socketio_client.js @@ -169,6 +169,9 @@ frappe.socketio = { doc_close: function(doctype, docname) { // notify that the user has closed this doc frappe.socketio.socket.emit('doc_close', doctype, docname); + + // if the doc is closed the user has also stopped typing + frappe.socketio.socket.emit('doc_typing_stopped', doctype, docname); }, form_typing: function(doctype, docname) { // notifiy that the user is typing on the doc From fa3c6096c5bf156f9400fc0fc874aeedbf2e7ebd Mon Sep 17 00:00:00 2001 From: prssanna Date: Thu, 14 May 2020 12:26:24 +0530 Subject: [PATCH 203/485] style: missing semicolons --- frappe/public/js/frappe/form/sidebar/form_sidebar_users.js | 2 +- socketio.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/form/sidebar/form_sidebar_users.js b/frappe/public/js/frappe/form/sidebar/form_sidebar_users.js index 16f0f32376..2bfb9ff7e6 100644 --- a/frappe/public/js/frappe/form/sidebar/form_sidebar_users.js +++ b/frappe/public/js/frappe/form/sidebar/form_sidebar_users.js @@ -84,4 +84,4 @@ frappe.ui.form.set_users = function(data, type) { if (cur_frm && cur_frm.doc && cur_frm.doc.doctype===doctype && cur_frm.doc.name==docname) { cur_frm.viewers.refresh(true, type); } -} \ No newline at end of file +}; \ No newline at end of file diff --git a/socketio.js b/socketio.js index d93579928e..90a9956340 100644 --- a/socketio.js +++ b/socketio.js @@ -168,7 +168,7 @@ io.on('connection', function (socket) { docname: docname, }, 'type' - ) + ); } }); }); From b9aad1715514e152304e622b988120dd51fcfdde Mon Sep 17 00:00:00 2001 From: prssanna Date: Thu, 14 May 2020 13:17:13 +0530 Subject: [PATCH 204/485] fix: change message --- frappe/public/js/frappe/form/sidebar/form_sidebar_users.js | 2 +- frappe/public/js/frappe/form/templates/form_sidebar.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/form/sidebar/form_sidebar_users.js b/frappe/public/js/frappe/form/sidebar/form_sidebar_users.js index 2bfb9ff7e6..3165592944 100644 --- a/frappe/public/js/frappe/form/sidebar/form_sidebar_users.js +++ b/frappe/public/js/frappe/form/sidebar/form_sidebar_users.js @@ -18,7 +18,7 @@ frappe.ui.form.SidebarUsers = Class.extend({ let new_users = []; let current_users = []; - const message = type == 'viewers' ? 'viewing this document': 'typing...'; + const message = type == 'viewers' ? 'viewing this document': 'composing an email'; users.current.forEach(username => { if (username === frappe.session.user) { diff --git a/frappe/public/js/frappe/form/templates/form_sidebar.html b/frappe/public/js/frappe/form/templates/form_sidebar.html index 77bff50461..296eb160bd 100644 --- a/frappe/public/js/frappe/form/templates/form_sidebar.html +++ b/frappe/public/js/frappe/form/templates/form_sidebar.html @@ -79,7 +79,7 @@
    • -
    • {%= __("Currently Typing") %}
      • +
    • {%= __("Currently Replying") %}
    {% endblock %} {% block page_sidebar %} {% include "templates/includes/web_sidebar.html" %} {% endblock %} diff --git a/frappe/www/contact.html b/frappe/www/contact.html index 5433ccf253..91f14985b2 100644 --- a/frappe/www/contact.html +++ b/frappe/www/contact.html @@ -1,6 +1,7 @@ {% extends "templates/web.html" %} -{% block title %}{{ heading or "Contact Us"}}{% endblock %} +{% set title = heading or "Contact Us" %} +{% block header %}

    {{ heading or "Contact Us" }}

    {% endblock %} {% block page_content %}