From d056beb0ef6c736807c1ef2efe50a257c6bbe9ec Mon Sep 17 00:00:00 2001 From: hrwx Date: Tue, 3 Aug 2021 15:55:32 +0530 Subject: [PATCH 001/176] feat: show title links in Link Fields --- cypress/integration/control_link.js | 41 +++++- frappe/boot.py | 7 + frappe/core/doctype/doctype/doctype.json | 9 +- .../customize_form/customize_form.json | 9 +- .../doctype/customize_form/customize_form.py | 3 +- frappe/database/mariadb/framework_mariadb.sql | 1 + .../database/postgres/framework_postgres.sql | 1 + frappe/desk/form/load.py | 54 ++++++- frappe/desk/search.py | 47 ++++++- frappe/public/js/controls.bundle.js | 1 + frappe/public/js/frappe/form/controls/link.js | 133 +++++++++++++++--- .../frappe/form/controls/table_multiselect.js | 7 +- frappe/public/js/frappe/form/formatters.js | 13 +- frappe/public/js/frappe/form/save.js | 51 ++++--- frappe/public/js/frappe/link_title.js | 34 +++++ frappe/public/js/frappe/request.js | 5 + frappe/public/js/frappe/ui/filters/filter.js | 12 +- frappe/www/printview.py | 33 +++++ 18 files changed, 402 insertions(+), 59 deletions(-) create mode 100644 frappe/public/js/frappe/link_title.js diff --git a/cypress/integration/control_link.js b/cypress/integration/control_link.js index 8f9257e9c4..e691150925 100644 --- a/cypress/integration/control_link.js +++ b/cypress/integration/control_link.js @@ -65,16 +65,49 @@ context('Control Link', () => { cy.intercept('POST', '/api/method/frappe.desk.search.search_link').as('search_link'); cy.get('@todos').then(todos => { - cy.get('.frappe-control[data-fieldname=link] input').as('input'); - cy.get('@input').focus(); + cy.get('.frappe-control[data-fieldname=link] input').focus().as('input'); + cy.wait('@search_link'); + cy.get('@input').type(todos[0]); cy.wait('@search_link'); - cy.get('@input').type(todos[0]).blur(); + cy.get('.frappe-control[data-fieldname=link] ul').should('be.visible'); + cy.get('.frappe-control[data-fieldname=link] input').type('{enter}', { delay: 100 }); cy.wait('@validate_link'); cy.get('@input').focus(); cy.get('.frappe-control[data-fieldname=link] .link-btn') .should('be.visible') .click(); - cy.location('pathname').should('eq', `/app/todo/${todos[0]}`); + cy.location('hash').should('eq', `#Form/ToDo/${todos[0]}`); + }); + }); + + it('show title field in link', () => { + get_dialog_with_link().as('dialog'); + + cy.server(); + cy.insert_doc("Property Setter", { + property: "show_title_field_in_link", + doc_type: "ToDo", + value: 1, + doctype_or_field: "DocType" + }, true); + cy.route('POST', '/api/method/frappe.desk.search.search_link').as('search_link'); + + cy.get('.frappe-control[data-fieldname=link] input').focus().as('input'); + cy.wait('@search_link'); + cy.get('@input').type('todo for link'); + cy.wait('@search_link'); + cy.get('.frappe-control[data-fieldname=link] ul').should('be.visible'); + cy.get('.frappe-control[data-fieldname=link] input').type('{enter}', { delay: 100 }); + cy.get('.frappe-control[data-fieldname=link] input').blur(); + cy.get('@dialog').then(dialog => { + cy.get('@todos').then(todos => { + let field = dialog.get_field('link'); + let value = field.get_value(); + let label = field.get_label_value(); + + expect(value).to.eq(todos[0]); + expect(label).to.eq('this is a test todo for link'); + }); }); }); }); diff --git a/frappe/boot.py b/frappe/boot.py index 0589e32ac8..8f02b67934 100644 --- a/frappe/boot.py +++ b/frappe/boot.py @@ -87,6 +87,7 @@ def get_bootinfo(): bootinfo.additional_filters_config = get_additional_filters_from_hooks() bootinfo.desk_settings = get_desk_settings() bootinfo.app_logo_url = get_app_logo() + bootinfo.doctypes_with_show_link_field_title = doctypes_with_show_link_field_title() return bootinfo @@ -324,3 +325,9 @@ def get_desk_settings(): def get_notification_settings(): return frappe.get_cached_doc('Notification Settings', frappe.session.user) + +def doctypes_with_show_link_field_title(): + dts = frappe.get_all("DocType", {"show_title_field_in_link": 1}) + custom_dts = frappe.get_all("Property Setter", {"field_name": "show_title_field_in_link", "value": 1}) + + return [d.name for d in dts + custom_dts if d] \ No newline at end of file diff --git a/frappe/core/doctype/doctype/doctype.json b/frappe/core/doctype/doctype/doctype.json index 6a427f71e1..3024fb32a2 100644 --- a/frappe/core/doctype/doctype/doctype.json +++ b/frappe/core/doctype/doctype/doctype.json @@ -45,6 +45,7 @@ "allow_auto_repeat", "view_settings", "title_field", + "show_title_field_in_link", "search_fields", "default_print_format", "sort_field", @@ -554,6 +555,12 @@ "fieldname": "website_search_field", "fieldtype": "Data", "label": "Website Search Field" + }, + { + "default": "0", + "fieldname": "show_title_field_in_link", + "fieldtype": "Check", + "label": "Show Title in Link and Table MultiSelect Field" } ], "icon": "fa fa-bolt", @@ -635,7 +642,7 @@ "link_fieldname": "reference_doctype" } ], - "modified": "2021-06-17 23:31:44.974199", + "modified": "2021-08-03 13:41:50.319555", "modified_by": "Administrator", "module": "Core", "name": "DocType", diff --git a/frappe/custom/doctype/customize_form/customize_form.json b/frappe/custom/doctype/customize_form/customize_form.json index c2940a92e3..cdcac1582a 100644 --- a/frappe/custom/doctype/customize_form/customize_form.json +++ b/frappe/custom/doctype/customize_form/customize_form.json @@ -27,6 +27,7 @@ "autoname", "view_settings_section", "title_field", + "show_title_field_in_link", "image_field", "default_print_format", "column_break_29", @@ -280,6 +281,12 @@ "fieldname": "autoname", "fieldtype": "Data", "label": "Auto Name" + }, + { + "default": "0", + "fieldname": "show_title_field_in_link", + "fieldtype": "Check", + "label": "Show Title in Link and Table MultiSelect Field" } ], "hide_toolbar": 1, @@ -288,7 +295,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2021-06-21 19:01:06.920663", + "modified": "2021-08-03 13:43:27.938781", "modified_by": "Administrator", "module": "Custom", "name": "Customize Form", diff --git a/frappe/custom/doctype/customize_form/customize_form.py b/frappe/custom/doctype/customize_form/customize_form.py index 8de194fb00..1866f4d368 100644 --- a/frappe/custom/doctype/customize_form/customize_form.py +++ b/frappe/custom/doctype/customize_form/customize_form.py @@ -495,7 +495,8 @@ doctype_properties = { 'email_append_to': 'Check', 'subject_field': 'Data', 'sender_field': 'Data', - 'autoname': 'Data' + 'autoname': 'Data', + 'show_title_field_in_link': 'Check' } docfield_properties = { diff --git a/frappe/database/mariadb/framework_mariadb.sql b/frappe/database/mariadb/framework_mariadb.sql index f8841e9417..a74ece8478 100644 --- a/frappe/database/mariadb/framework_mariadb.sql +++ b/frappe/database/mariadb/framework_mariadb.sql @@ -224,6 +224,7 @@ CREATE TABLE `tabDocType` ( `email_append_to` int(1) NOT NULL DEFAULT 0, `subject_field` varchar(255) DEFAULT NULL, `sender_field` varchar(255) DEFAULT NULL, + `show_title_field_in_link` int(1) NOT NULL DEFAULT 0, PRIMARY KEY (`name`), KEY `parent` (`parent`) ) ENGINE=InnoDB ROW_FORMAT=COMPRESSED CHARACTER SET=utf8mb4 COLLATE=utf8mb4_unicode_ci; diff --git a/frappe/database/postgres/framework_postgres.sql b/frappe/database/postgres/framework_postgres.sql index a4e94aa326..f65a832bc6 100644 --- a/frappe/database/postgres/framework_postgres.sql +++ b/frappe/database/postgres/framework_postgres.sql @@ -229,6 +229,7 @@ CREATE TABLE "tabDocType" ( "email_append_to" smallint NOT NULL DEFAULT 0, "subject_field" varchar(255) DEFAULT NULL, "sender_field" varchar(255) DEFAULT NULL, + "show_title_field_in_link" smallint NOT NULL DEFAULT 0, PRIMARY KEY ("name") ) ; diff --git a/frappe/desk/form/load.py b/frappe/desk/form/load.py index a62bfd01d0..994a50f938 100644 --- a/frappe/desk/form/load.py +++ b/frappe/desk/form/load.py @@ -48,7 +48,7 @@ def getdoc(doctype, name, user=None): raise doc.add_seen() - + set_link_titles(doc) frappe.response.docs.append(doc) @frappe.whitelist(allow_guest=True) @@ -310,3 +310,55 @@ def get_additional_timeline_content(doctype, docname): contents.extend(frappe.get_attr(method)(doctype, docname) or []) return contents + +def set_link_titles(doc): + meta = frappe.get_meta(doc.doctype) + link_titles = {} + link_titles.update(get_title_values_for_link_and_dynamic_link_fields(meta, doc)) + link_titles.update(get_title_values_for_table_and_multiselect_fields(meta, doc)) + + send_link_titles(link_titles) + +def get_title_values_for_link_and_dynamic_link_fields(meta, doc, link_fields=None): + link_titles = {} + + if not link_fields: + link_fields = meta.get_link_fields() + meta.get_dynamic_link_fields() + + for field in link_fields: + if not doc.get(field.fieldname): + continue + + doctype = field.options if field.fieldtype == "Link" else doc.get(field.options) + + meta = frappe.get_meta(doctype) + if not meta or not (meta.title_field and meta.show_title_field_in_link): + continue + + link_title = frappe.get_cached_value(doctype, doc.get(field.fieldname), meta.title_field) + link_titles.update({doctype + "::" + doc.get(field.fieldname): link_title}) + + return link_titles + +def get_title_values_for_table_and_multiselect_fields(meta, doc, table_fields=None): + link_titles = {} + + if not table_fields: + table_fields = meta.get_table_fields() + + for field in table_fields: + if not doc.get(field.fieldname): + continue + + _meta = frappe.get_meta(field.options) + for value in doc.get(field.fieldname): + link_titles.update(get_title_values_for_link_and_dynamic_link_fields(_meta, value)) + + return link_titles + +def send_link_titles(link_titles): + """Append link titles dict in `frappe.local.response`.""" + if "_link_titles" not in frappe.local.response: + frappe.local.response["_link_titles"] = {} + + frappe.local.response["_link_titles"].update(link_titles) diff --git a/frappe/desk/search.py b/frappe/desk/search.py index f9b65fc98e..a64d6efec4 100644 --- a/frappe/desk/search.py +++ b/frappe/desk/search.py @@ -49,8 +49,11 @@ def sanitize_searchfield(searchfield): # this is called by the Link Field @frappe.whitelist() def search_link(doctype, txt, query=None, filters=None, page_length=20, searchfield=None, reference_doctype=None, ignore_user_permissions=False): - search_widget(doctype, txt.strip(), query, searchfield=searchfield, page_length=page_length, filters=filters, reference_doctype=reference_doctype, ignore_user_permissions=ignore_user_permissions) - frappe.response['results'] = build_for_autosuggest(frappe.response["values"]) + search_widget(doctype, txt.strip(), query, searchfield=searchfield, page_length=page_length, filters=filters, + reference_doctype=reference_doctype, ignore_user_permissions=ignore_user_permissions) + + frappe.response["results"] = build_for_autosuggest(frappe.response["values"], doctype=doctype, + is_query=True if query else False) del frappe.response["values"] # this is called by the search box @@ -138,6 +141,11 @@ def search_widget(doctype, txt, query=None, searchfield=None, start=0, fields = list(set(fields + json.loads(filter_fields))) formatted_fields = ['`tab%s`.`%s`' % (meta.name, f.strip()) for f in fields] + title_field_query = get_title_field_query(meta) + + # Insert title field query after name + formatted_fields.insert(1, title_field_query) + # find relevance as location of search term from the beginning of string `name`. used for sorting results. formatted_fields.append("""locate({_txt}, `tab{doctype}`.`name`) as `_relevance`""".format( _txt=frappe.db.escape((txt or "").replace("%", "").replace("@", "")), doctype=doctype)) @@ -205,10 +213,32 @@ def get_std_fields_list(meta, key): return sflist -def build_for_autosuggest(res): +def get_title_field_query(meta): + title_field = meta.title_field if meta.title_field else None + show_title_field_in_link = meta.show_title_field_in_link if meta.show_title_field_in_link else None + field = "NULL as `label`" + + if title_field and show_title_field_in_link: + field = "`tab{0}`.{1} as `label`".format(meta.name, title_field) + + return field + +def build_for_autosuggest(res, doctype, is_query): results = [] for r in res: - out = {"value": r[0], "description": ", ".join(unique(cstr(d) for d in r if d)[1:])} + r = list(r) + if is_query or doctype in (frappe.get_hooks().standard_queries or {}): + out = { + "value": r[0], + "description": ", ".join(unique(cstr(d) for d in r[1:] if d)) + } + else: + out = { + "value": r[0], + "label": r[1], + "description": ", ".join(unique(cstr(d) for d in r[2:] if d)) + } + results.append(out) return results @@ -271,3 +301,12 @@ def get_user_groups(): return frappe.get_all('User Group', fields=['name as id', 'name as value'], update={ 'is_group': True }) + +@frappe.whitelist() +def get_link_title(doctype, docname): + meta = frappe.get_meta(doctype) + + if meta.title_field and meta.show_title_field_in_link: + return frappe.get_cached_value(doctype, docname, meta.title_field) + + return docname \ No newline at end of file diff --git a/frappe/public/js/controls.bundle.js b/frappe/public/js/controls.bundle.js index 30b5d43905..b08cbb336d 100644 --- a/frappe/public/js/controls.bundle.js +++ b/frappe/public/js/controls.bundle.js @@ -16,3 +16,4 @@ import "air-datepicker/dist/js/i18n/datepicker.sk.js"; import "air-datepicker/dist/js/i18n/datepicker.zh.js"; import "./frappe/ui/capture.js"; import "./frappe/form/controls/control.js"; +import "./frappe/link_title.js"; diff --git a/frappe/public/js/frappe/form/controls/link.js b/frappe/public/js/frappe/form/controls/link.js index 83f3f8dd70..82481d5303 100644 --- a/frappe/public/js/frappe/form/controls/link.js +++ b/frappe/public/js/frappe/form/controls/link.js @@ -29,12 +29,14 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat setTimeout(function() { if(me.$input.val() && me.get_options()) { let doctype = me.get_options(); - let name = me.$input.val(); + let name = me.get_input_value(); me.$link.toggle(true); me.$link_open.attr('href', frappe.utils.get_form_link(doctype, name)); } if(!me.$input.val()) { + me.reset_value(); + me.reset_fetch_values(me.df, me.docname); me.$input.val("").trigger("input"); } }, 500); @@ -69,6 +71,76 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat this.$input_area.find(".link-btn").remove(); } } + set_formatted_input(value) { + super.set_formatted_input(); + if (!value) return; + let doctype = this.get_options(); + this.set_data_value(frappe.get_link_title(doctype, value) || value, value); + } + set_data_value(link_display, value) { + if (!this.$input) { + return; + } + + this.$input.val(__(link_display)); + this.data_value = value; + } + parse_validate_and_set_in_model(value, label, e) { + if (this.parse) value = this.parse(value, label); + if (label) { + this.label = label; + frappe.add_link_title(this.doctype, value, label); + } + + return this.validate_and_set_in_model(value, e); + } + validate_and_set_in_model(value, e) { + var me = this; + if (this.inside_change_event) { + return Promise.resolve(); + } + this.inside_change_event = true; + var set = function(value) { + me.inside_change_event = false; + return frappe.run_serially([ + () => me.set_model_value(value), + () => { + me.set_mandatory && me.set_mandatory(value); + + if (me.df.change || me.df.onchange) { + // onchange event specified in df + frappe.set_link_title(me); + return (me.df.change || me.df.onchange).apply(me, [e]); + } + } + ]); + }; + + value = this.validate(value); + if (value && value.then) { + // got a promise + return value.then((value) => set(value)); + } else { + // all clear + return set(value); + } + } + get_input_value() { + return (this.$input && this.data_value && this.$input.val()) ? this.data_value : ""; + } + get_label_value() { + return this.$input ? this.$input.val() : ""; + } + set_input_label(label) { + this.$input && this.$input.val(__(label)); + } + reset_value() { + if (!this.$input) { + return; + } + this.$input.val(""); + this.data_value = null; + } open_advanced_search() { var doctype = this.get_options(); if(!doctype) return; @@ -98,7 +170,7 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat } // partially entered name field - frappe.route_options.name_field = this.get_value(); + frappe.route_options.name_field = this.get_label_value(); // reference to calling link frappe._from_link = this; @@ -120,6 +192,11 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat maxItems: 99, autoFirst: true, list: [], + replace: function (suggestion) { + // Override Awesomeplete replace function as it is used to set the input value + // https://github.com/LeaVerou/awesomplete/issues/17104#issuecomment-359185403 + this.input.value = suggestion.label || suggestion.value; + }, data: function (item) { return { label: item.label || item.value, @@ -236,9 +313,11 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat me.selected = false; return; } - var value = me.get_input_value(); - if(value!==me.last_value) { - me.parse_validate_and_set_in_model(value); + let value = me.get_input_value(); + let label = me.get_label_value(); + + if (value !== me.last_value || me.label !== label) { + me.parse_validate_and_set_in_model(value, label); } }); @@ -258,14 +337,15 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat // prevent selection on tab var TABKEY = 9; - if(e.keyCode === TABKEY) { + if (e.keyCode === TABKEY) { e.preventDefault(); me.awesomplete.close(); return false; } - if(item.action) { + if (item.action) { item.value = ""; + item.label = ""; item.action.apply(me); } @@ -277,13 +357,14 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat frappe.boot.user.last_selected_values[me.df.options] = item.value; } - me.parse_validate_and_set_in_model(item.value); + me.parse_validate_and_set_in_model(item.value, item.label); }); this.$input.on("awesomplete-selectcomplete", function(e) { - var o = e.originalEvent; - if(o.text.value.indexOf("__link_option") !== -1) { - me.$input.val(""); + let o = e.originalEvent; + if (o.text.value.indexOf("__link_option") !== -1) { + me.reset_value(); + me.reset_fetch_values(me.df, me.docname); } }); } @@ -452,10 +533,13 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat this.docname, value); } validate_link_and_fetch(df, doctype, docname, value) { - if(value) { + let me = this; + + if (value) { return new Promise((resolve) => { - var fetch = ''; - if(this.frm && this.frm.fetch_dict[df.fieldname]) { + let fetch = ''; + + if (this.frm && this.frm.fetch_dict[df.fieldname]) { fetch = this.frm.fetch_dict[df.fieldname].columns.join(', '); } // if default and no fetch, no need to validate @@ -465,10 +549,14 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat this.fetch_and_validate_link(resolve, df, doctype, docname, value, fetch); }); + } else { + me.reset_value(); + me.reset_fetch_values(df, docname); } } - fetch_and_validate_link(resolve, df, doctype, docname, value, fetch) { + let me = this; + frappe.call({ method: 'frappe.desk.form.utils.validate_link', type: "GET", @@ -485,18 +573,27 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat } resolve(r.valid_value); } else { + me.reset_value(); + me.reset_fetch_values(df, docname); resolve(""); } } }); } - set_fetch_values(df, docname, fetch_values) { - var fl = this.frm.fetch_dict[df.fieldname].fields; - for(var i=0; i < fl.length; i++) { + let fl = this.frm.fetch_dict[df.fieldname].fields; + + for (var i=0; i < fl.length; i++) { frappe.model.set_value(df.parent, docname, fl[i], fetch_values[i], df.fieldtype); } } + reset_fetch_values(df, docname) { + let fields = this.frm && this.frm.fetch_dict && this.frm.fetch_dict[df.fieldname] ? this.frm.fetch_dict[df.fieldname].fields : []; + + fields.forEach(field => { + frappe.model.set_value(df.parent, docname, field, null, df.fieldtype); + }); + } }; if (Awesomplete) { diff --git a/frappe/public/js/frappe/form/controls/table_multiselect.js b/frappe/public/js/frappe/form/controls/table_multiselect.js index 15dfd9649e..f74e0837ff 100644 --- a/frappe/public/js/frappe/form/controls/table_multiselect.js +++ b/frappe/public/js/frappe/form/controls/table_multiselect.js @@ -62,6 +62,7 @@ frappe.ui.form.ControlTableMultiSelect = class ControlTableMultiSelect extends f [link_field.fieldname]: value }); } + frappe.add_link_title(link_field.options, value, label); } this._rows_list = this.rows.map(row => row[link_field.fieldname]); return this.rows; @@ -126,10 +127,12 @@ frappe.ui.form.ControlTableMultiSelect = class ControlTableMultiSelect extends f this.$input_area.prepend(html); } get_pill_html(value) { - const encoded_value = encodeURIComponent(value); + const link_field = this.get_link_field(); + const encoded_value = encodeURIComponent(value.name); + const pill_name = frappe.get_link_title(link_field.options, value[link_field.fieldname]) || value.name; return ` `; diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js index b9a838688d..c4f042533d 100644 --- a/frappe/public/js/frappe/form/formatters.js +++ b/frappe/public/js/frappe/form/formatters.js @@ -106,12 +106,14 @@ frappe.form.formatters = { Link: function(value, docfield, options, doc) { var doctype = docfield._options || docfield.options; var original_value = value; + let link_title = frappe.get_link_title(doctype, value); + if(value && value.match && value.match(/^['"].*['"]$/)) { value.replace(/^.(.*).$/, "$1"); } if(options && (options.for_print || options.only_value)) { - return value; + return link_title || value; } if(frappe.form.link_formatters[doctype]) { @@ -135,13 +137,14 @@ frappe.form.formatters = { return ` - ${__(options && options.label || value)}`; + data-name="${original_value}" + data-value="${original_value}"> + ${__(options && options.label || link_title || value)}`; } else { - return value; + return link_title || value; } } else { - return value; + return link_title || value; } }, Date: function(value) { diff --git a/frappe/public/js/frappe/form/save.js b/frappe/public/js/frappe/form/save.js index 65d84e2202..612e449a7e 100644 --- a/frappe/public/js/frappe/form/save.js +++ b/frappe/public/js/frappe/form/save.js @@ -249,31 +249,40 @@ frappe.ui.form.update_calling_link = (newdoc) => { }; if (is_valid_doctype()) { - // set value - if (doc && doc.parentfield) { - //update values for child table - $.each(frappe._from_link.frm.fields_dict[doc.parentfield].grid.grid_rows, function (index, field) { - if (field.doc && field.doc.name === frappe._from_link.docname) { - frappe._from_link.set_value(newdoc.name); + frappe.model.with_doctype(newdoc.doctype, () => { + let meta = frappe.get_meta(newdoc.doctype); + // set value + if (doc && doc.parentfield) { + //update values for child table + $.each(frappe._from_link.frm.fields_dict[doc.parentfield].grid.grid_rows, function (index, field) { + if (field.doc && field.doc.name === frappe._from_link.docname) { + if (meta.title_field && meta.show_title_field_in_link) { + frappe.add_link_title(newdoc.doctype, newdoc.name, newdoc[meta.title_field]); + } + frappe._from_link.set_value(newdoc.name); + } + }); + } else { + if (meta.title_field && meta.show_title_field_in_link) { + frappe.add_link_title(newdoc.doctype, newdoc.name, newdoc[meta.title_field]); } - }); - } else { - frappe._from_link.set_value(newdoc.name); - } + frappe._from_link.set_value(newdoc.name); + } - // refresh field - frappe._from_link.refresh(); + // refresh field + frappe._from_link.refresh(); - // if from form, switch - if (frappe._from_link.frm) { - frappe.set_route("Form", - frappe._from_link.frm.doctype, frappe._from_link.frm.docname) - .then(() => { - frappe.utils.scroll_to(frappe._from_link_scrollY); - }); - } + // if from form, switch + if (frappe._from_link.frm) { + frappe.set_route("Form", + frappe._from_link.frm.doctype, frappe._from_link.frm.docname) + .then(() => { + frappe.utils.scroll_to(frappe._from_link_scrollY); + }); + } - frappe._from_link = null; + frappe._from_link = null; + }); } } diff --git a/frappe/public/js/frappe/link_title.js b/frappe/public/js/frappe/link_title.js new file mode 100644 index 0000000000..82bc6c149c --- /dev/null +++ b/frappe/public/js/frappe/link_title.js @@ -0,0 +1,34 @@ +// for link titles +frappe._link_titles = {}; + +frappe.get_link_title = function(doctype, name) { + if (!doctype || !name) { + return; + } + + return frappe._link_titles[doctype + "::" + name]; +}; + +frappe.add_link_title = function (doctype, name, value) { + if (!doctype || !name) { + return; + } + + frappe._link_titles[doctype + "::" + name] = value; +}; + +frappe.set_link_title = function(f) { + let doctype = f.get_options(); + let docname = f.get_input_value(); + + if ((!in_list(frappe.boot.doctypes_with_show_link_field_title, doctype)) || (!doctype || !docname) || + (frappe.get_link_title(doctype, docname))) { + return; + } + + frappe.xcall("frappe.desk.search.get_link_title", {"doctype": doctype, "docname": docname}).then((r) => { + if (r && docname !== r) { + f.set_input_label(r); + } + }); +}; \ No newline at end of file diff --git a/frappe/public/js/frappe/request.js b/frappe/public/js/frappe/request.js index 12fa9c8e21..9f09b288b6 100644 --- a/frappe/public/js/frappe/request.js +++ b/frappe/public/js/frappe/request.js @@ -241,6 +241,11 @@ frappe.request.call = function(opts) { $.extend(frappe._messages, data.__messages); } + // sync link titles + if (data._link_titles) { + $.extend(frappe._link_titles, data._link_titles); + } + // callbacks var status_code_handler = statusCode[xhr.statusCode().status]; if (status_code_handler) { diff --git a/frappe/public/js/frappe/ui/filters/filter.js b/frappe/public/js/frappe/ui/filters/filter.js index b2b2b623e2..d8bc760668 100644 --- a/frappe/public/js/frappe/ui/filters/filter.js +++ b/frappe/public/js/frappe/ui/filters/filter.js @@ -313,6 +313,10 @@ frappe.ui.Filter = class { return this.utils.get_selected_value(this.field, this.get_condition()); } + get_selected_label() { + return this.utils.get_selected_label(this.field); + } + get_condition() { return this.filter_edit_area.find('.condition').val(); } @@ -360,7 +364,7 @@ frappe.ui.Filter = class { get_filter_button_text() { let value = this.utils.get_formatted_value( this.field, - this.get_selected_value() + this.get_selected_label() || this.get_selected_value() ); return `${__(this.field.df.label)} ${__(this.get_condition())} ${__( value @@ -448,6 +452,12 @@ frappe.ui.filter_utils = { return val; }, + get_selected_label(field) { + if (in_list(["Link", "Dynamic Link"], field.df.fieldtype)) { + return field.get_label_value(); + } + }, + get_default_condition(df) { if (df.fieldtype == 'Data') { return 'like'; diff --git a/frappe/www/printview.py b/frappe/www/printview.py index cdf47790eb..268a01eafb 100644 --- a/frappe/www/printview.py +++ b/frappe/www/printview.py @@ -170,6 +170,38 @@ def get_rendered_template(doc, name=None, print_format=None, meta=None, return html +def set_link_titles(doc): + # Replaces name with title of link field doctype + + meta = frappe.get_meta(doc.doctype) + set_title_values_for_link_and_dynamic_link_fields(meta, doc) + set_title_values_for_table_and_multiselect_fields(meta, doc) + +def set_title_values_for_link_and_dynamic_link_fields(meta, doc): + for field in meta.get_link_fields() + meta.get_dynamic_link_fields(): + if not doc.get(field.fieldname): + continue + + # If link field, then get doctype from options + # If dynamic link field, then get doctype from dependent field + doctype = field.options if field.fieldtype == "Link" else doc.get(field.options) + + meta = frappe.get_meta(doctype) + if not meta or not (meta.title_field and meta.show_title_field_in_link): + continue + + link_title = frappe.get_cached_value(doctype, doc.get(field.fieldname), meta.title_field) + setattr(doc, field.fieldname, link_title) + +def set_title_values_for_table_and_multiselect_fields(meta, doc): + for field in meta.get_table_fields(): + if not doc.get(field.fieldname): + continue + + _meta = frappe.get_meta(field.options) + for value in doc.get(field.fieldname): + set_title_values_for_link_and_dynamic_link_fields(_meta, value) + def convert_markdown(doc, meta): '''Convert text field values to markdown if necessary''' for field in meta.fields: @@ -191,6 +223,7 @@ def get_html_and_style(doc, name=None, print_format=None, meta=None, doc = frappe.get_doc(json.loads(doc)) print_format = get_print_format_doc(print_format, meta=meta or frappe.get_meta(doc.doctype)) + set_link_titles(doc) try: html = get_rendered_template(doc, name=name, print_format=print_format, meta=meta, From bee72ee6ff3ad906a5ac83f5e4ba67d4cc153b34 Mon Sep 17 00:00:00 2001 From: hrwx Date: Tue, 3 Aug 2021 17:15:29 +0530 Subject: [PATCH 002/176] fix: Null query error --- frappe/desk/search.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/frappe/desk/search.py b/frappe/desk/search.py index a64d6efec4..6d259e3a3d 100644 --- a/frappe/desk/search.py +++ b/frappe/desk/search.py @@ -144,7 +144,8 @@ def search_widget(doctype, txt, query=None, searchfield=None, start=0, title_field_query = get_title_field_query(meta) # Insert title field query after name - formatted_fields.insert(1, title_field_query) + if title_field_query: + formatted_fields.insert(1, title_field_query) # find relevance as location of search term from the beginning of string `name`. used for sorting results. formatted_fields.append("""locate({_txt}, `tab{doctype}`.`name`) as `_relevance`""".format( @@ -216,7 +217,7 @@ def get_std_fields_list(meta, key): def get_title_field_query(meta): title_field = meta.title_field if meta.title_field else None show_title_field_in_link = meta.show_title_field_in_link if meta.show_title_field_in_link else None - field = "NULL as `label`" + field = None if title_field and show_title_field_in_link: field = "`tab{0}`.{1} as `label`".format(meta.name, title_field) @@ -224,10 +225,13 @@ def get_title_field_query(meta): return field def build_for_autosuggest(res, doctype, is_query): + meta = frappe.get_meta(doctype) + title_field = get_title_field_query(meta) + _from = 2 if title_field else 1 results = [] for r in res: r = list(r) - if is_query or doctype in (frappe.get_hooks().standard_queries or {}): + if not (meta.title_field and meta.show_title_field_in_link) or doctype in (frappe.get_hooks().standard_queries or {}): out = { "value": r[0], "description": ", ".join(unique(cstr(d) for d in r[1:] if d)) @@ -235,8 +239,8 @@ def build_for_autosuggest(res, doctype, is_query): else: out = { "value": r[0], - "label": r[1], - "description": ", ".join(unique(cstr(d) for d in r[2:] if d)) + "label": r[1] if title_field else None, + "description": ", ".join(unique(cstr(d) for d in r[_from:] if d)) } results.append(out) From 1b3d202eb6e5a10d51500f82b0eabfd7f395260e Mon Sep 17 00:00:00 2001 From: hrwx Date: Fri, 6 Aug 2021 11:31:08 +0530 Subject: [PATCH 003/176] fix: do not modify doc for print formats --- frappe/utils/formatters.py | 15 +++++++++++++++ frappe/www/printview.py | 18 ++++++++++++++---- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/frappe/utils/formatters.py b/frappe/utils/formatters.py index 9efccc15f0..2ef3ab4fce 100644 --- a/frappe/utils/formatters.py +++ b/frappe/utils/formatters.py @@ -95,4 +95,19 @@ def format_value(value, df=None, doc=None, currency=None, translated=False): elif df.get("fieldtype") == "Text Editor": return "
{}
".format(value) + elif df.get("fieldtype") in ["Link", "Dynamic Link"]: + if not doc or not doc.get("__link_titles") or not df.options: + return value + + doctype = df.options + if df.get("fieldtype") == "Dynamic Link": + if not df.parent: + return value + + meta = frappe.get_meta(df.parent) + _field = meta.get_field(df.options) + doctype = _field.options + + return doc.__link_titles.get("{0}::{1}".format(doctype, value), value) + return value diff --git a/frappe/www/printview.py b/frappe/www/printview.py index 268a01eafb..77fbd0b8e4 100644 --- a/frappe/www/printview.py +++ b/frappe/www/printview.py @@ -171,13 +171,20 @@ def get_rendered_template(doc, name=None, print_format=None, meta=None, return html def set_link_titles(doc): - # Replaces name with title of link field doctype + # Adds name with title of link field doctype to __link_titles + if not doc.get("__link_titles"): + setattr(doc, "__link_titles", {}) meta = frappe.get_meta(doc.doctype) set_title_values_for_link_and_dynamic_link_fields(meta, doc) set_title_values_for_table_and_multiselect_fields(meta, doc) -def set_title_values_for_link_and_dynamic_link_fields(meta, doc): +def set_title_values_for_link_and_dynamic_link_fields(meta, doc, parent_doc=None): + if parent_doc and not parent_doc.get("__link_titles"): + setattr(parent_doc, "__link_titles", {}) + elif doc and not doc.get("__link_titles"): + setattr(doc, "__link_titles", {}) + for field in meta.get_link_fields() + meta.get_dynamic_link_fields(): if not doc.get(field.fieldname): continue @@ -191,7 +198,10 @@ def set_title_values_for_link_and_dynamic_link_fields(meta, doc): continue link_title = frappe.get_cached_value(doctype, doc.get(field.fieldname), meta.title_field) - setattr(doc, field.fieldname, link_title) + if parent_doc: + parent_doc.__link_titles["{0}::{1}".format(doctype, doc.get(field.fieldname))] = link_title + elif doc: + doc.__link_titles["{0}::{1}".format(doctype, doc.get(field.fieldname))] = link_title def set_title_values_for_table_and_multiselect_fields(meta, doc): for field in meta.get_table_fields(): @@ -200,7 +210,7 @@ def set_title_values_for_table_and_multiselect_fields(meta, doc): _meta = frappe.get_meta(field.options) for value in doc.get(field.fieldname): - set_title_values_for_link_and_dynamic_link_fields(_meta, value) + set_title_values_for_link_and_dynamic_link_fields(_meta, value, doc) def convert_markdown(doc, meta): '''Convert text field values to markdown if necessary''' From 0adff72877bac3b9ce400454e65bd9bb9f965d1a Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Wed, 15 Dec 2021 20:03:56 +0530 Subject: [PATCH 004/176] fix: link title for link fields --- frappe/public/js/frappe/form/controls/link.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/link.js b/frappe/public/js/frappe/form/controls/link.js index a3c876fae2..a884399360 100644 --- a/frappe/public/js/frappe/form/controls/link.js +++ b/frappe/public/js/frappe/form/controls/link.js @@ -89,7 +89,7 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat if (this.parse) value = this.parse(value, label); if (label) { this.label = label; - frappe.add_link_title(this.doctype, value, label); + frappe.add_link_title(this.df.options, value, label); } return this.validate_and_set_in_model(value, e); From d83bcc83542c32a759d1c4df1c067f83f15f548b Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Wed, 15 Dec 2021 20:14:43 +0530 Subject: [PATCH 005/176] fix: title in table multiselect pills --- frappe/public/js/frappe/form/controls/table_multiselect.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/form/controls/table_multiselect.js b/frappe/public/js/frappe/form/controls/table_multiselect.js index f74e0837ff..6e26a15249 100644 --- a/frappe/public/js/frappe/form/controls/table_multiselect.js +++ b/frappe/public/js/frappe/form/controls/table_multiselect.js @@ -49,7 +49,7 @@ frappe.ui.form.ControlTableMultiSelect = class ControlTableMultiSelect extends f setup_buttons() { this.$input_area.find('.link-btn').remove(); } - parse(value) { + parse(value, label) { const link_field = this.get_link_field(); if (value) { @@ -128,8 +128,8 @@ frappe.ui.form.ControlTableMultiSelect = class ControlTableMultiSelect extends f } get_pill_html(value) { const link_field = this.get_link_field(); - const encoded_value = encodeURIComponent(value.name); - const pill_name = frappe.get_link_title(link_field.options, value[link_field.fieldname]) || value.name; + const encoded_value = encodeURIComponent(value); + const pill_name = frappe.get_link_title(link_field.options, value) || value; return ` `; } + get_label(value) { + const item = this._data?.find(d => d.value === value); + return item ? item.label || item.value : null; + } + get_awesomplete_settings() { const settings = super.get_awesomplete_settings(); From 8a264d05cacf8501dab393f009aa899190e5f7d2 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Tue, 15 Feb 2022 13:02:20 +0530 Subject: [PATCH 087/176] fix: remove `ignore_in_getter`; cleaner implementation --- frappe/model/base_document.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index f6b7d05079..d55ed6cbd2 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -73,8 +73,7 @@ def get_controller(doctype): return site_controllers[doctype] class BaseDocument(object): - ignore_in_getter = ("doctype", "_meta", "meta", "_table_fields", "_valid_columns") - ignore_in_setter = ("doctype",) + ignore_in_setter = ("doctype", "_meta", "meta", "_table_fields", "_valid_columns") def __init__(self, d): if d.get("doctype"): @@ -148,10 +147,11 @@ class BaseDocument(object): else: value = self.__dict__.get(key, default) - if value is None and key not in self.ignore_in_getter \ - and key in (d.fieldname for d in self.meta.get_table_fields()): - self.set(key, []) - value = self.__dict__.get(key) + if value is None and key in ( + d.fieldname for d in self.meta.get_table_fields() + ): + value = [] + self.set(key, value) return value else: From 7ce9f1eaa1acd8c9d7ef618c06dc91182e8e5d93 Mon Sep 17 00:00:00 2001 From: Pruthvi Patel Date: Tue, 15 Feb 2022 13:06:55 +0530 Subject: [PATCH 088/176] fix: limit without filter --- frappe/model/base_document.py | 3 +++ frappe/tests/test_document.py | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index ea4264212b..a386313dc2 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -149,6 +149,9 @@ class BaseDocument(object): self.set(key, []) value = self.__dict__.get(key) + if limit and isinstance(value, (list, tuple)) and len(value) > limit: + value = value[:limit] + return value else: return self.__dict__ diff --git a/frappe/tests/test_document.py b/frappe/tests/test_document.py index a0c44c5c72..71af7e996f 100644 --- a/frappe/tests/test_document.py +++ b/frappe/tests/test_document.py @@ -264,7 +264,10 @@ class TestDocument(unittest.TestCase): def test_limit_for_get(self): doc = frappe.get_doc("DocType", "DocType") - # assuming DocType has more that 3 Data fields + # assuming DocType has more than 3 Data fields + self.assertEquals(len(doc.get("fields", limit=3)), 3) + + # limit with filters self.assertEquals(len(doc.get("fields", filters={"fieldtype": "Data"}, limit=3)), 3) def test_virtual_fields(self): From 81f4e2b00910ee47e8abb6e7b7534e51d2064baa Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Tue, 15 Feb 2022 13:47:20 +0530 Subject: [PATCH 089/176] test: UI test for list/report view paging --- cypress/integration/report_view.js | 56 +++++++++++++++++++++++------- frappe/tests/ui_test_helpers.py | 6 ++++ 2 files changed, 49 insertions(+), 13 deletions(-) diff --git a/cypress/integration/report_view.js b/cypress/integration/report_view.js index 0253e8fd43..5a0b13a3a0 100644 --- a/cypress/integration/report_view.js +++ b/cypress/integration/report_view.js @@ -11,30 +11,60 @@ context('Report View', () => { 'title': 'Doc 1', 'description': 'Random Text', 'enabled': 0, - // submit document - 'docstatus': 1 - }, true).as('doc'); + 'docstatus': 1 // submit document + }, true); + return cy.window().its('frappe').then(frappe => { + return frappe.call("frappe.tests.ui_test_helpers.create_multiple_contact_records"); + }); }); + it('Field with enabled allow_on_submit should be editable.', () => { cy.intercept('POST', 'api/method/frappe.client.set_value').as('value-update'); cy.visit(`/app/List/${doctype_name}/Report`); + // check status column added from docstatus cy.get('.dt-row-0 > .dt-cell--col-3').should('contain', 'Submitted'); let cell = cy.get('.dt-row-0 > .dt-cell--col-4'); + // select the cell cell.dblclick(); cell.get('.dt-cell__edit--col-4').findByRole('checkbox').check({ force: true }); + cy.wait('@value-update'); - cy.get('@doc').then(doc => { - cy.call('frappe.client.get_value', { - doctype: doc.doctype, - filters: { - name: doc.name, - }, - fieldname: 'enabled' - }).then(r => { - expect(r.message.enabled).to.equals(1); - }); + + cy.call('frappe.client.get_value', { + doctype: doctype_name, + filters: { + title: 'Doc 1', + }, + fieldname: 'enabled' + }).then(r => { + expect(r.message.enabled).to.equals(1); }); }); + + it('test load more with count selection buttons', () => { + cy.visit('/app/contact/view/report'); + + cy.clear_filters(); + cy.get('.list-paging-area .list-count').should('contain.text', '20 of'); + cy.get('.list-paging-area .btn-more').click(); + cy.get('.list-paging-area .list-count').should('contain.text', '40 of'); + cy.get('.list-paging-area .btn-more').click(); + cy.get('.list-paging-area .list-count').should('contain.text', '60 of'); + + cy.get('.list-paging-area .btn-group .btn-paging[data-value="100"]').click(); + + cy.get('.list-paging-area .list-count').should('contain.text', '100 of'); + cy.get('.list-paging-area .btn-more').click(); + cy.get('.list-paging-area .list-count').should('contain.text', '200 of'); + cy.get('.list-paging-area .btn-more').click(); + cy.get('.list-paging-area .list-count').should('contain.text', '300 of'); + + cy.get('.list-paging-area .btn-group .btn-paging[data-value="500"]').click(); + + cy.get('.list-paging-area .list-count').should('contain.text', '500 of'); + cy.get('.list-paging-area .btn-more').click(); + cy.get('.list-paging-area .list-count').should('contain.text', '1000 of'); + }); }); \ No newline at end of file diff --git a/frappe/tests/ui_test_helpers.py b/frappe/tests/ui_test_helpers.py index b299df522c..079dcc64ef 100644 --- a/frappe/tests/ui_test_helpers.py +++ b/frappe/tests/ui_test_helpers.py @@ -134,6 +134,12 @@ def create_contact_records(): insert_contact('Test Form Contact 2', '54321') insert_contact('Test Form Contact 3', '12345') +@frappe.whitelist() +def create_multiple_contact_records(): + if frappe.db.get_all('Contact', {'first_name': 'Multiple Contact 1'}): + return + for index in range(1001): + insert_contact('Multiple Contact {}'.format(index+1), '12345{}'.format(index+1)) def insert_contact(first_name, phone_number): doc = frappe.get_doc({ From 18ba5fcd49d53f9af6d883721fde45a10e243fd1 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Tue, 15 Feb 2022 14:10:55 +0530 Subject: [PATCH 090/176] perf: reduce one query in `get_controller` --- frappe/model/base_document.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index 18b9212e1d..eb08a9b0ae 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -33,13 +33,12 @@ def get_controller(doctype): module_name, custom = frappe.db.get_value( "DocType", doctype, ("module", "custom"), cache=True - ) or ["Core", False] + ) or ("Core", False) if custom: - if frappe.db.field_exists("DocType", "is_tree"): - is_tree = frappe.db.get_value("DocType", doctype, "is_tree", cache=True) - else: - is_tree = False + is_tree = frappe.db.get_value( + "DocType", doctype, "is_tree", ignore=True, cache=True + ) _class = NestedSet if is_tree else Document else: class_overrides = frappe.get_hooks('override_doctype_class') From 1a20f376f3b5259e66e3d0b4ab58664371722e8e Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Tue, 15 Feb 2022 13:06:30 +0530 Subject: [PATCH 091/176] perf: reduce loop in `doc.update` --- frappe/model/base_document.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index a0f692f630..c8a6ead0ec 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -106,13 +106,9 @@ class BaseDocument(object): }) """ - # QUESTION: why do we need the 1st for loop? - # we're essentially setting the values in d, in the 2nd for loop (?) - - # first set default field values of base document - for key in default_fields: - if key in d: - self.set(key, d[key]) + # set name first, as it is used a reference in child document + if "name" in d: + self.name = d["name"] for key, value in d.items(): self.set(key, value) @@ -189,6 +185,7 @@ class BaseDocument(object): if isinstance(value, (dict, BaseDocument)): if not self.__dict__.get(key): self.__dict__[key] = [] + value = self._init_child(value, key) self.__dict__[key].append(value) @@ -225,6 +222,7 @@ class BaseDocument(object): def _init_child(self, value, key): if not self.doctype: return value + if not isinstance(value, BaseDocument): if "doctype" not in value or value['doctype'] is None: value["doctype"] = self.get_table_field_doctype(key) From 8ba50a8b142dcc036ef2f86aa3d641df656e2c21 Mon Sep 17 00:00:00 2001 From: Summayya Hashmani <58825865+sumaiya2908@users.noreply.github.com> Date: Tue, 15 Feb 2022 19:30:08 +0530 Subject: [PATCH 092/176] feat: add button in dashboard list redirecting to dashboard view. (#15695) Co-authored-by: Summayya Co-authored-by: Shariq Ansari <30859809+shariquerik@users.noreply.github.com> --- frappe/desk/doctype/dashboard/dashboard_list.js | 16 ++++++++++++++++ frappe/public/icons/timeless/symbol-defs.svg | 7 +++++++ 2 files changed, 23 insertions(+) create mode 100644 frappe/desk/doctype/dashboard/dashboard_list.js diff --git a/frappe/desk/doctype/dashboard/dashboard_list.js b/frappe/desk/doctype/dashboard/dashboard_list.js new file mode 100644 index 0000000000..d60a324048 --- /dev/null +++ b/frappe/desk/doctype/dashboard/dashboard_list.js @@ -0,0 +1,16 @@ +frappe.listview_settings['Dashboard'] = { + button: { + show(doc) { + return doc.name; + }, + get_label() { + return frappe.utils.icon("dashboard-list", "sm"); + }, + get_description(doc) { + return __('View {0}', [`${doc.name}`]); + }, + action(doc) { + frappe.set_route('dashboard-view', doc.name); + } + }, +}; \ No newline at end of file diff --git a/frappe/public/icons/timeless/symbol-defs.svg b/frappe/public/icons/timeless/symbol-defs.svg index f2977e3016..bf4e02a7af 100644 --- a/frappe/public/icons/timeless/symbol-defs.svg +++ b/frappe/public/icons/timeless/symbol-defs.svg @@ -814,6 +814,13 @@ + + + + + + + From af7dc6b774846fcf4e473854b37104a4efa75f6e Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Tue, 15 Feb 2022 20:24:03 +0530 Subject: [PATCH 093/176] fix: after load more on refresh gets duplicate data --- frappe/public/js/frappe/list/base_list.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js index ed27bdb29e..d09a1c7043 100644 --- a/frappe/public/js/frappe/list/base_list.js +++ b/frappe/public/js/frappe/list/base_list.js @@ -391,9 +391,10 @@ frappe.views.BaseList = class BaseList { $this.addClass("btn-info"); this.start = 0; - this.page_length = $this.data().value; + this.page_length = this.selected_page_count = $this.data().value; } else if ($this.is(".btn-more")) { this.start = this.start + this.page_length; + this.page_length = this.selected_page_count || 20; } this.refresh(); }); @@ -474,6 +475,7 @@ frappe.views.BaseList = class BaseList { this.render(); this.after_render(); this.freeze(false); + this.reset_defaults(); if (this.settings.refresh) { this.settings.refresh(this); } @@ -500,6 +502,11 @@ frappe.views.BaseList = class BaseList { this.data = this.data.uniqBy((d) => d.name); } + reset_defaults() { + this.page_length = this.page_length + this.start; + this.start = 0; + } + freeze() { // show a freeze message while data is loading } From f41a05cfd9a3cefdae8ec5137d34c06aae3000c1 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Tue, 15 Feb 2022 20:35:53 +0530 Subject: [PATCH 094/176] test: UI test to check if refresh work after load more --- cypress/integration/report_view.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cypress/integration/report_view.js b/cypress/integration/report_view.js index 5a0b13a3a0..4bc5784a53 100644 --- a/cypress/integration/report_view.js +++ b/cypress/integration/report_view.js @@ -46,7 +46,6 @@ context('Report View', () => { it('test load more with count selection buttons', () => { cy.visit('/app/contact/view/report'); - cy.clear_filters(); cy.get('.list-paging-area .list-count').should('contain.text', '20 of'); cy.get('.list-paging-area .btn-more').click(); cy.get('.list-paging-area .list-count').should('contain.text', '40 of'); @@ -61,6 +60,10 @@ context('Report View', () => { cy.get('.list-paging-area .btn-more').click(); cy.get('.list-paging-area .list-count').should('contain.text', '300 of'); + // check if refresh works after load more + cy.get('.page-head .standard-actions [data-original-title="Refresh"]').click(); + cy.get('.list-paging-area .list-count').should('contain.text', '300 of'); + cy.get('.list-paging-area .btn-group .btn-paging[data-value="500"]').click(); cy.get('.list-paging-area .list-count').should('contain.text', '500 of'); From 1a912aa787c53bb8226f4588afdb148566d776f3 Mon Sep 17 00:00:00 2001 From: hrwx Date: Tue, 15 Feb 2022 14:58:24 +0000 Subject: [PATCH 095/176] fix: merge groups for doctype links --- frappe/model/meta.py | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/frappe/model/meta.py b/frappe/model/meta.py index 372392f689..1b437aaf62 100644 --- a/frappe/model/meta.py +++ b/frappe/model/meta.py @@ -14,16 +14,28 @@ Example: ''' +import json +import os from datetime import datetime + import click -import frappe, json, os -from frappe.utils import cstr, cint, cast -from frappe.model import default_fields, no_value_fields, optional_fields, data_fieldtypes, table_fields, child_table_fields -from frappe.model.document import Document + +import frappe +from frappe import _ +from frappe.model import ( + child_table_fields, + data_fieldtypes, + default_fields, + no_value_fields, + optional_fields, + table_fields, +) from frappe.model.base_document import BaseDocument -from frappe.modules import load_doctype_module +from frappe.model.document import Document from frappe.model.workflow import get_workflow_name -from frappe import _ +from frappe.modules import load_doctype_module +from frappe.utils import cast, cint, cstr + def get_meta(doctype, cached=True): if cached: @@ -546,7 +558,7 @@ class Meta(Document): # For internal links parent doctype will be the key doctype = link.parent_doctype or link.link_doctype # group found - if link.group and group.label == link.group: + if link.group and _(group.label) == _(link.group): if doctype not in group.get('items'): group.get('items').append(doctype) link.added = True From 8bae45823c6fb21517315a267678cbdaed0d3687 Mon Sep 17 00:00:00 2001 From: Wolfram Schmidt Date: Wed, 16 Feb 2022 05:29:12 +0100 Subject: [PATCH 096/176] fix: Update Translations (#15878) --- frappe/translations/de.csv | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/translations/de.csv b/frappe/translations/de.csv index 17151a14eb..9cf27bd60f 100644 --- a/frappe/translations/de.csv +++ b/frappe/translations/de.csv @@ -736,6 +736,7 @@ Content Hash,Inhalts-Hash, Content web page.,Inhalt der Webseite., Conversation Tones,Konversationstöne, Copyright,Copyright, +Copy to Clipboard,In die Zwischenablage, Core,Kern, Core DocTypes cannot be customized.,Core DocTypes können nicht angepasst werden., Could not connect to outgoing email server,Konnte keine Verbindung zum Postausgangsserver herstellen, @@ -959,6 +960,7 @@ Edit {0},Bearbeiten {0}, Editable Grid,Editierbares Raster, Editing Row,Zeile bearbeiten, Eg. smsgateway.com/api/send_sms.cgi,z. B. smsgateway.com/api/send_sms.cgi, +Email,E-Mail, Email Account Name,E-Mail-Konten-Name, Email Account added multiple times,E-Mail-Konto wurde mehrmals hinzugefügt, Email Addresses,E-Mail-Adressen, From 6cbede451da63d223bf484d5b32c373dd221cff7 Mon Sep 17 00:00:00 2001 From: smehata <53169014+smehata@users.noreply.github.com> Date: Wed, 16 Feb 2022 10:12:35 +0530 Subject: [PATCH 097/176] fix(Permission Manager): Update client-side permission data (#15945) On updating access from Permission Manager. Permissions are not updated till we do a hard refresh. ![Screenshot from 2022-02-11 12-32-52](https://user-images.githubusercontent.com/53169014/153550692-dc530eec-f44e-497d-9aca-8c10f1819cb0.png) --- frappe/core/page/permission_manager/permission_manager.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/core/page/permission_manager/permission_manager.js b/frappe/core/page/permission_manager/permission_manager.js index 6b427fdebf..cb218b2eae 100644 --- a/frappe/core/page/permission_manager/permission_manager.js +++ b/frappe/core/page/permission_manager/permission_manager.js @@ -347,6 +347,7 @@ frappe.PermissionEngine = class PermissionEngine { } add_check_events() { + let me = this; this.body.on("click", ".show-user-permissions", () => { frappe.route_options = { allow: this.get_doctype() || "" }; frappe.set_route('List', 'User Permission'); @@ -373,7 +374,7 @@ frappe.PermissionEngine = class PermissionEngine { // exception: reverse chk.prop("checked", !chk.prop("checked")); } else { - this.get_perm(args.role)[args.ptype] = args.value; + me.get_perm(args.role)[args.ptype] = args.value; } } }); From 24a750c048b5a0cfbfe5b50bfa19f5a0f2138135 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Wed, 16 Feb 2022 10:52:48 +0530 Subject: [PATCH 098/176] chore: remove redundant code from `update_if_missing` --- frappe/model/base_document.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index 83d3d70eea..f4a4916a9f 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -120,14 +120,18 @@ class BaseDocument(object): return self def update_if_missing(self, d): + """Set default values for fields without existing values""" if isinstance(d, BaseDocument): d = d.get_valid_dict() - if "doctype" in d: - self.set("doctype", d.get("doctype")) for key, value in d.items(): - # dont_update_if_missing is a list of fieldnames, for which, you don't want to set default value - if (self.get(key) is None) and (value is not None) and (key not in self.dont_update_if_missing): + if ( + value is not None + and self.get(key) is None + # dont_update_if_missing is a list of fieldnames + # for which you don't want to set default value + and key not in self.dont_update_if_missing + ): self.set(key, value) def get_db_value(self, key): From 581c5f52e66629669531d92044d84c4acacf9464 Mon Sep 17 00:00:00 2001 From: Wolfram Schmidt Date: Wed, 16 Feb 2022 06:49:57 +0100 Subject: [PATCH 099/176] fix: added missing translations for View Types (#15873) added missing translations for View Types > no-docs --- frappe/translations/de.csv | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/translations/de.csv b/frappe/translations/de.csv index 9cf27bd60f..3af45b024e 100644 --- a/frappe/translations/de.csv +++ b/frappe/translations/de.csv @@ -1487,7 +1487,8 @@ Linked with {0},Verknüpft mit {0}, Links,Verknüpfungen, List,Listenansicht, List Filter,Listenfilter, -List View Setting,List View Setting, +List View,Listenansicht, +List View Setting,Einstellungen zu Listenansicht, List a document type,Einen Dokumenttyp auflisten, "List as [{""label"": _(""Jobs""), ""route"":""jobs""}]","Liste als [{ ""label"": _ ( ""Jobs""), ""route"": ""jobs""}]", List of backups available for download,Datensicherungen herunterladen, From 8b41f7a7e7a00b54f615de902d2de1c5bff1acf9 Mon Sep 17 00:00:00 2001 From: Wolfram Schmidt Date: Wed, 16 Feb 2022 06:51:04 +0100 Subject: [PATCH 100/176] fix(translation): Update translation for web_template (#15956) --- frappe/translations/de.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/translations/de.csv b/frappe/translations/de.csv index 3af45b024e..5bec4dd4da 100644 --- a/frappe/translations/de.csv +++ b/frappe/translations/de.csv @@ -1455,6 +1455,7 @@ Last User,Letzter Benutzer, Last Week,Letzte Woche, Last Year,Vergangenes Jahr, Last synced {0},Zuletzt synchronisiert {0}, +Learn more,Mehr erfahren, Leave a Comment,Hinterlasse einen Kommentar, Leave blank to repeat always,"Freilassen, um immer zu wiederholen", Leave this conversation,Benachrichtigungen abbestellen, From 6d0abc77a88fcf02d49568272b880bf29dc64074 Mon Sep 17 00:00:00 2001 From: Wolfram Schmidt Date: Wed, 16 Feb 2022 06:52:07 +0100 Subject: [PATCH 101/176] fix(translation): Update translations for website module (#15955) --- frappe/translations/de.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/translations/de.csv b/frappe/translations/de.csv index 5bec4dd4da..25a33370dc 100644 --- a/frappe/translations/de.csv +++ b/frappe/translations/de.csv @@ -1226,8 +1226,8 @@ Headers,Headers, Heading,Überschrift, Hello {0},Hallo {0}, Hello!,Hallo!, -Help Articles,Artikel-Hilfe, -Help Category,Kategorie-Hilfe, +Help Articles,Hilfeartikel, +Help Category,Hilfekategorie, Help on Search,Hilfe zur Suche, "Help: To link to another record in the system, use ""#Form/Note/[Note Name]"" as the Link URL. (don't use ""http://"")","Hilfe: Um eine Verknüpfung mit einem anderen Datensatz im System zu erstellen, bitte ""#Formular/Anmerkung/[Anmerkungsname]"" als Verknüpfungs-URL verwenden (kein ""http://""!).", Helvetica,Helvetica, From 6d4df45ab0cd094f195a860dfddc5b00bcc8f960 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Wed, 16 Feb 2022 13:58:24 +0530 Subject: [PATCH 102/176] revert: unrelated formatting changes --- frappe/public/js/frappe/form/form.js | 196 +++++++++++++-------------- 1 file changed, 98 insertions(+), 98 deletions(-) diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index 1fa5d6192d..171115b60b 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -44,7 +44,7 @@ frappe.ui.form.Form = class FrappeForm { setup_meta() { this.meta = frappe.get_doc('DocType', this.doctype); - if (this.meta.istable) { + if(this.meta.istable) { this.meta.in_dialog = 1; } @@ -248,7 +248,7 @@ frappe.ui.form.Form = class FrappeForm { // on main doc frappe.model.on(me.doctype, "*", function(fieldname, value, doc) { // set input - if (doc.name === me.docname) { + if(doc.name===me.docname) { me.dirty(); let field = me.fields_dict[fieldname]; @@ -271,7 +271,7 @@ frappe.ui.form.Form = class FrappeForm { // using $.each to preserve df via closure $.each(table_fields, function(i, df) { frappe.model.on(df.options, "*", function(fieldname, value, doc) { - if (doc.parent === me.docname && doc.parentfield === df.fieldname) { + if(doc.parent===me.docname && doc.parentfield===df.fieldname) { me.dirty(); me.fields_dict[df.fieldname].grid.set_value(fieldname, value, doc); return me.script_manager.trigger(fieldname, doc.doctype, doc.name); @@ -282,7 +282,7 @@ frappe.ui.form.Form = class FrappeForm { setup_notify_on_rename() { $(document).on('rename', (ev, dt, old_name, new_name) => { - if (dt == this.doctype) + if (dt==this.doctype) this.rename_notify(dt, old_name, new_name); }); } @@ -299,7 +299,7 @@ frappe.ui.form.Form = class FrappeForm { e.stopPropagation(); e.preventDefault(); - if (me.doc.__islocal) { + if(me.doc.__islocal) { frappe.msgprint(__("Please save before attaching.")); throw "attach error"; } @@ -322,13 +322,13 @@ frappe.ui.form.Form = class FrappeForm { refresh(docname) { var switched = docname ? true : false; - if (docname) { + if(docname) { this.switch_doc(docname); } cur_frm = this; - if (this.docname) { // document to show + if(this.docname) { // document to show this.save_disabled = false; // set the doc this.doc = frappe.get_doc(this.doctype, this.docname); @@ -353,7 +353,7 @@ frappe.ui.form.Form = class FrappeForm { } // do setup - if (!this.setup_done) { + if(!this.setup_done) { this.setup(); } @@ -361,12 +361,12 @@ frappe.ui.form.Form = class FrappeForm { this.trigger_onload(switched); // if print format is shown, refresh the format - // if (this.print_preview.wrapper.is(":visible")) { + // if(this.print_preview.wrapper.is(":visible")) { // this.print_preview.preview(); // } - if (switched) { - if (this.show_print_first && this.doc.docstatus === 1) { + if(switched) { + if(this.show_print_first && this.doc.docstatus===1) { // show print view this.print_doc(); } @@ -374,9 +374,9 @@ frappe.ui.form.Form = class FrappeForm { // set status classes this.$wrapper.removeClass('validated-form') - .toggleClass('editable-form', this.doc.docstatus === 0) - .toggleClass('submitted-form', this.doc.docstatus === 1) - .toggleClass('cancelled-form', this.doc.docstatus === 2); + .toggleClass('editable-form', this.doc.docstatus===0) + .toggleClass('submitted-form', this.doc.docstatus===1) + .toggleClass('cancelled-form', this.doc.docstatus===2); this.show_conflict_message(); } @@ -415,7 +415,7 @@ frappe.ui.form.Form = class FrappeForm { frappe.throw(`Action ${action} not found`); } } - if (action.action_type === 'Server Action') { + if (action.action_type==='Server Action') { return frappe.xcall(action.action, {'doc': this.doc}).then((doc) => { if (doc.doctype) { // document is returned by the method, @@ -430,7 +430,7 @@ frappe.ui.form.Form = class FrappeForm { alert: true }); }); - } else if (action.action_type === 'Route') { + } else if (action.action_type==='Route') { return frappe.set_route(action.action); } } @@ -449,7 +449,7 @@ frappe.ui.form.Form = class FrappeForm { } check_reload() { - if (this.doc && (!this.doc.__unsaved) && this.doc.__last_sync_on && + if(this.doc && (!this.doc.__unsaved) && this.doc.__last_sync_on && (new Date() - this.doc.__last_sync_on) > (this.refresh_if_stale_for * 1000)) { this.reload_doc(); return true; @@ -458,7 +458,7 @@ frappe.ui.form.Form = class FrappeForm { trigger_onload(switched) { this.cscript.is_onload = false; - if (!this.opendocs[this.docname]) { + if(!this.opendocs[this.docname]) { var me = this; this.cscript.is_onload = true; this.initialize_new_doc(); @@ -496,13 +496,13 @@ frappe.ui.form.Form = class FrappeForm { }); // update seen - if (this.meta.track_seen) { + if(this.meta.track_seen) { $('.list-id[data-name="'+ me.docname +'"]').addClass('seen'); } } render_form(switched) { - if (!this.meta.istable) { + if(!this.meta.istable) { this.layout.doc = this.doc; this.layout.attach_doc_and_docfields(); @@ -530,7 +530,7 @@ frappe.ui.form.Form = class FrappeForm { () => this.script_manager.trigger("refresh"), // call onload post render for callbacks to be fired () => { - if (this.cscript.is_onload) { + if(this.cscript.is_onload) { return this.script_manager.trigger("onload_post_render"); } }, @@ -547,7 +547,7 @@ frappe.ui.form.Form = class FrappeForm { this.cscript.is_onload && this.set_first_tab_as_active(); - if (!this.hidden) { + if(!this.hidden) { this.layout.show_empty_form_message(); } @@ -588,7 +588,7 @@ frappe.ui.form.Form = class FrappeForm { } cleanup_refresh() { - if (this.fields_dict['amended_from']) { + if(this.fields_dict['amended_from']) { if (this.doc.amended_from) { unhide_field('amended_from'); if (this.fields_dict['amendment_date']) unhide_field('amendment_date'); @@ -598,15 +598,15 @@ frappe.ui.form.Form = class FrappeForm { } } - if (this.fields_dict['trash_reason']) { - if (this.doc.trash_reason && this.doc.docstatus == 2) { + if(this.fields_dict['trash_reason']) { + if(this.doc.trash_reason && this.doc.docstatus == 2) { unhide_field('trash_reason'); } else { hide_field('trash_reason'); } } - if (this.meta.autoname && this.meta.autoname.substr(0, 6) == 'field:' && !this.doc.__islocal) { + if(this.meta.autoname && this.meta.autoname.substr(0,6)=='field:' && !this.doc.__islocal) { var fn = this.meta.autoname.substr(6); if (this.doc[fn]) { @@ -614,7 +614,7 @@ frappe.ui.form.Form = class FrappeForm { } } - if (this.meta.autoname == "naming_series:" && !this.doc.__islocal) { + if(this.meta.autoname=="naming_series:" && !this.doc.__islocal) { this.toggle_display("naming_series", false); } } @@ -622,12 +622,12 @@ frappe.ui.form.Form = class FrappeForm { refresh_header(switched) { // set title // main title - if (!this.meta.in_dialog || this.in_form) { + if(!this.meta.in_dialog || this.in_form) { frappe.utils.set_title(this.meta.issingle ? this.doctype : this.docname); } // show / hide buttons - if (this.toolbar) { + if(this.toolbar) { if (switched) { this.toolbar.current_status = undefined; } @@ -645,11 +645,11 @@ frappe.ui.form.Form = class FrappeForm { // SAVE save_or_update() { - if (this.save_disabled) return; + if(this.save_disabled) return; - if (this.doc.docstatus === 0) { + if(this.doc.docstatus===0) { this.save(); - } else if (this.doc.docstatus === 1 && this.doc.__unsaved) { + } else if(this.doc.docstatus===1 && this.doc.__unsaved) { this.save("Update"); } } @@ -669,14 +669,14 @@ frappe.ui.form.Form = class FrappeForm { validate_and_save(save_action, callback, btn, on_error, resolve, reject) { var me = this; - if (!save_action) save_action = "Save"; + if(!save_action) save_action = "Save"; this.validate_form_action(save_action, resolve); var after_save = function(r) { // to remove hash from URL to avoid scroll after save history.replaceState(null, null, ' '); - if (!r.exc) { - if (["Save", "Update", "Amend"].indexOf(save_action) !== -1) { + if(!r.exc) { + if (["Save", "Update", "Amend"].indexOf(save_action)!==-1) { frappe.utils.play_sound("click"); } @@ -694,7 +694,7 @@ frappe.ui.form.Form = class FrappeForm { } me.refresh(); } else { - if (on_error) { + if(on_error) { on_error(); reject(); } @@ -708,20 +708,20 @@ frappe.ui.form.Form = class FrappeForm { console.error(e) } btn && $(btn).prop("disabled", false); - if (on_error) { + if(on_error) { on_error(); reject(); } }; - if (save_action != "Update") { + if(save_action != "Update") { // validate frappe.validated = true; frappe.run_serially([ () => this.script_manager.trigger("validate"), () => this.script_manager.trigger("before_save"), () => { - if (!frappe.validated) { + if(!frappe.validated) { fail(); return; } @@ -741,12 +741,12 @@ frappe.ui.form.Form = class FrappeForm { frappe.confirm(__("Permanently Submit {0}?", [this.docname]), function() { frappe.validated = true; me.script_manager.trigger("before_submit").then(function() { - if (!frappe.validated) { + if(!frappe.validated) { return me.handle_save_fail(btn, on_error); } me.save('Submit', function(r) { - if (r.exc) { + if(r.exc) { me.handle_save_fail(btn, on_error); } else { frappe.utils.play_sound("submit"); @@ -935,7 +935,7 @@ frappe.ui.form.Form = class FrappeForm { } if (!this.perm[0][perm_to_check] && !allowed_for_workflow) { - if (resolve) { + if(resolve) { // re-enable buttons resolve(); } @@ -980,7 +980,7 @@ frappe.ui.form.Form = class FrappeForm { // trigger link fields which have default values set if (this.is_new() && this.doc.__run_link_triggers) { $.each(this.fields_dict, function(fieldname, field) { - if (field.df.fieldtype == "Link" && this.doc[fieldname]) { + if (field.df.fieldtype=="Link" && this.doc[fieldname]) { // triggers add fetch, sets value in model and runs triggers field.set_value(this.doc[fieldname], true); } @@ -991,8 +991,8 @@ frappe.ui.form.Form = class FrappeForm { } show_conflict_message() { - if (this.doc.__needs_refresh) { - if (this.doc.__unsaved) { + if(this.doc.__needs_refresh) { + if(this.doc.__unsaved) { this.dashboard.clear_headline(); this.dashboard.set_headline_alert(__("This form has been modified after you have loaded it") + '' @@ -1004,20 +1004,20 @@ frappe.ui.form.Form = class FrappeForm { } show_submit_message() { - if (this.meta.is_submittable + if(this.meta.is_submittable && this.perm[0] && this.perm[0].submit && !this.is_dirty() && !this.is_new() && !frappe.model.has_workflow(this.doctype) // show only if no workflow - && this.doc.docstatus === 0) { + && this.doc.docstatus===0) { this.dashboard.add_comment(__('Submit this document to confirm'), 'blue', true); } } show_web_link() { - if (!this.doc.__islocal && this.doc.__onload && this.doc.__onload.is_website_generator) { + if(!this.doc.__islocal && this.doc.__onload && this.doc.__onload.is_website_generator) { this.web_link && this.web_link.remove(); - if (this.doc.__onload.published) { + if(this.doc.__onload.published) { this.add_web_link("/" + this.doc.route); } } @@ -1034,16 +1034,16 @@ frappe.ui.form.Form = class FrappeForm { var dt = this.parent_doctype ? this.parent_doctype : this.doctype; this.perm = frappe.perm.get_perm(dt, this.doc); - if (!this.perm[0].read) { + if(!this.perm[0].read) { return 0; } return 1; } check_doctype_conflict(docname) { - if (this.doctype == 'DocType' && docname == 'DocType') { + if(this.doctype=='DocType' && docname=='DocType') { frappe.msgprint(__('Allowing DocType, DocType. Be careful!')); - } else if (this.doctype == 'DocType') { + } else if(this.doctype=='DocType') { if (frappe.views.formview[docname] || frappe.pages['List/'+docname]) { window.location.reload(); // frappe.msgprint(__("Cannot open {0} when its instance is open", ['DocType'])) @@ -1062,16 +1062,16 @@ frappe.ui.form.Form = class FrappeForm { // notify this form of renamed records rename_notify(dt, old, name) { // from form - if (this.meta.istable) + if(this.meta.istable) return; - if (this.docname == old) + if(this.docname == old) this.docname = name; else return; // cleanup - if (this && this.opendocs[old] && frappe.meta.docfield_copy[dt]) { + if(this && this.opendocs[old] && frappe.meta.docfield_copy[dt]) { // delete docfield copy frappe.meta.docfield_copy[dt][name] = frappe.meta.docfield_copy[dt][old]; delete frappe.meta.docfield_copy[dt][old]; @@ -1080,7 +1080,7 @@ frappe.ui.form.Form = class FrappeForm { delete this.opendocs[old]; this.opendocs[name] = true; - if (this.meta.in_dialog || !this.in_form) { + if(this.meta.in_dialog || !this.in_form) { return; } @@ -1155,7 +1155,7 @@ frappe.ui.form.Form = class FrappeForm { newdoc.idx = null; newdoc.__run_link_triggers = false; - if (onload) { + if(onload) { onload(newdoc); } frappe.set_route('Form', newdoc.doctype, newdoc.name); @@ -1164,7 +1164,7 @@ frappe.ui.form.Form = class FrappeForm { reload_doc() { this.check_doctype_conflict(this.docname); - if (!this.doc.__islocal) { + if(!this.doc.__islocal) { frappe.model.remove_from_locals(this.doctype, this.docname); return frappe.model.with_doc(this.doctype, this.docname, () => { this.refresh(); @@ -1311,9 +1311,9 @@ frappe.ui.form.Form = class FrappeForm { $.each(fields_list, function(i, fname) { var docfield = frappe.meta.docfield_map[doctype][fname]; - if (docfield) { + if(docfield) { var label = __(docfield.label || "").replace(/\([^\)]*\)/g, ""); // eslint-disable-line - if (parentfield) { + if(parentfield) { grid_field_label_map[doctype + "-" + fname] = label.trim() + " (" + __(currency) + ")"; } else { @@ -1333,8 +1333,8 @@ frappe.ui.form.Form = class FrappeForm { } field_map(fnames, fn) { - if (typeof fnames === 'string') { - if (fnames == '*') { + if(typeof fnames==='string') { + if(fnames == '*') { fnames = Object.keys(this.fields_dict); } else { fnames = [fnames]; @@ -1343,7 +1343,7 @@ frappe.ui.form.Form = class FrappeForm { for (var i=0, l=fnames.length; i { - if (!unique_keys.includes(key)) { + if(!unique_keys.includes(key)) { d[key] = values[key]; } }); @@ -1448,9 +1448,9 @@ frappe.ui.form.Form = class FrappeForm { var me = this; var _set = function(f, v) { var fieldobj = me.fields_dict[f]; - if (fieldobj) { - if (!if_missing || !frappe.model.has_value(me.doctype, me.doc.name, f)) { - if (frappe.model.table_fields.includes(fieldobj.df.fieldtype) && $.isArray(v)) { + if(fieldobj) { + if(!if_missing || !frappe.model.has_value(me.doctype, me.doc.name, f)) { + if(frappe.model.table_fields.includes(fieldobj.df.fieldtype) && $.isArray(v)) { frappe.model.clear_table(me.doc, fieldobj.df.fieldname); @@ -1473,13 +1473,13 @@ frappe.ui.form.Form = class FrappeForm { } }; - if (typeof field == "string") { + if(typeof field=="string") { return _set(field, value); - } else if ($.isPlainObject(field)) { + } else if($.isPlainObject(field)) { let tasks = []; for (let f in field) { let v = field[f]; - if (me.get_field(f)) { + if(me.get_field(f)) { tasks.push(() => _set(f, v)); } } @@ -1489,7 +1489,7 @@ frappe.ui.form.Form = class FrappeForm { call(opts, args, callback) { var me = this; - if (typeof opts === 'string') { + if(typeof opts==='string') { // called as frm.call('do_this', {with_arg: 'arg'}); opts = { method: opts, @@ -1498,19 +1498,19 @@ frappe.ui.form.Form = class FrappeForm { callback: callback }; } - if (!opts.doc) { - if (opts.method.indexOf(".") === -1) + if(!opts.doc) { + if(opts.method.indexOf(".")===-1) opts.method = frappe.model.get_server_module_name(me.doctype) + "." + opts.method; opts.original_callback = opts.callback; opts.callback = function(r) { - if ($.isPlainObject(r.message)) { - if (opts.child) { + if($.isPlainObject(r.message)) { + if(opts.child) { // update child doc opts.child = locals[opts.child.doctype][opts.child.name]; var std_field_list = ["doctype"].concat(frappe.model.std_fields_list); for (var key in r.message) { - if (std_field_list.indexOf(key) === -1) { + if (std_field_list.indexOf(key)===-1) { opts.child[key] = r.message[key]; } } @@ -1526,7 +1526,7 @@ frappe.ui.form.Form = class FrappeForm { } else { opts.original_callback = opts.callback; opts.callback = function(r) { - if (!r.exc) me.refresh_fields(); + if(!r.exc) me.refresh_fields(); opts.original_callback && opts.original_callback(r); }; @@ -1567,7 +1567,7 @@ frappe.ui.form.Form = class FrappeForm { } get_title() { - if (this.meta.title_field) { + if(this.meta.title_field) { return this.doc[this.meta.title_field]; } else { return this.doc.name; @@ -1581,11 +1581,11 @@ frappe.ui.form.Form = class FrappeForm { // handle TableMultiselect child fields let _selected = []; - if (me.fields_dict[df.fieldname].grid) { + if(me.fields_dict[df.fieldname].grid) { _selected = me.fields_dict[df.fieldname].grid.get_selected(); } - if (_selected.length) { + if(_selected.length) { selected[df.fieldname] = _selected; } }); @@ -1595,11 +1595,11 @@ frappe.ui.form.Form = class FrappeForm { set_indicator_formatter(fieldname, get_color, get_text) { // get doctype from parent var doctype; - if (frappe.meta.docfield_map[this.doctype][fieldname]) { + if(frappe.meta.docfield_map[this.doctype][fieldname]) { doctype = this.doctype; } else { frappe.meta.get_table_fields(this.doctype).every(function(df) { - if (frappe.meta.docfield_map[df.options][fieldname]) { + if(frappe.meta.docfield_map[df.options][fieldname]) { doctype = df.options; return false; } else { @@ -1610,11 +1610,11 @@ frappe.ui.form.Form = class FrappeForm { frappe.meta.docfield_map[doctype][fieldname].formatter = function(value, df, options, doc) { - if (value) { + if(value) { var label; - if (get_text) { + if(get_text) { label = get_text(doc); - } else if (frappe.form.link_formatters[df.options]) { + } else if(frappe.form.link_formatters[df.options]) { label = frappe.form.link_formatters[df.options](value, doc); } else { label = value; @@ -1633,21 +1633,21 @@ frappe.ui.form.Form = class FrappeForm { // return true or false if the user can make a particlar doctype // will check permission, `can_make_methods` if exists, or will decided on // basis of whether the document is submittable - if (!frappe.model.can_create(doctype)) { + if(!frappe.model.can_create(doctype)) { return false; } - if (this.custom_make_buttons && this.custom_make_buttons[doctype]) { + if(this.custom_make_buttons && this.custom_make_buttons[doctype]) { // custom buttons are translated and so are the keys const key = __(this.custom_make_buttons[doctype]); // if the button is present, then show make return !!this.custom_buttons[key]; } - if (this.can_make_methods && this.can_make_methods[doctype]) { + if(this.can_make_methods && this.can_make_methods[doctype]) { return this.can_make_methods[doctype](this); } else { - if (this.meta.is_submittable && !this.doc.docstatus == 1) { + if(this.meta.is_submittable && !this.doc.docstatus==1) { return false; } else { return true; @@ -1660,9 +1660,9 @@ frappe.ui.form.Form = class FrappeForm { // will handover to `make_methods` if defined // or will create and match link fields let me = this; - if (this.make_methods && this.make_methods[doctype]) { + if(this.make_methods && this.make_methods[doctype]) { return this.make_methods[doctype](this); - } else if (this.custom_make_buttons && this.custom_make_buttons[doctype]) { + } else if(this.custom_make_buttons && this.custom_make_buttons[doctype]) { this.custom_buttons[__(this.custom_make_buttons[doctype])].trigger('click'); } else { frappe.model.with_doctype(doctype, function() { @@ -1693,10 +1693,10 @@ frappe.ui.form.Form = class FrappeForm { update_in_all_rows(table_fieldname, fieldname, value) { // update the child value in all tables where it is missing - if (!value) return; + if(!value) return; var cl = this.doc[table_fieldname] || []; - for (var i = 0; i < cl.length; i++) { - if (!cl[i][fieldname]) cl[i][fieldname] = value; + for(var i = 0; i < cl.length; i++){ + if(!cl[i][fieldname]) cl[i][fieldname] = value; } refresh_field("items"); } From 2337c70b7ade4216d4d7b2a20891255f76c58972 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Wed, 16 Feb 2022 14:42:19 +0530 Subject: [PATCH 103/176] fix: use `throw` instead of `msgprint` --- frappe/core/doctype/file/file.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index 2808a2710b..50a7b31bca 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -745,7 +745,7 @@ def delete_file(path): """Delete file from `public folder`""" if path: if ".." in path.split("/"): - frappe.msgprint(_("It is risky to delete this file: {0}. Please contact your System Manager.").format(path)) + frappe.throw(_("It is risky to delete this file: {0}. Please contact your System Manager.").format(path)) parts = os.path.split(path.strip("/")) if parts[0]=="files": From 4c403333c41840e5839fe4608baa82b0f23192b0 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Wed, 16 Feb 2022 16:02:37 +0530 Subject: [PATCH 104/176] fix: remove unused flag `in_setup_help` --- frappe/utils/jinja.py | 27 +++++++++++---------------- frappe/utils/safe_exec.py | 36 ++++++++++++++++-------------------- 2 files changed, 27 insertions(+), 36 deletions(-) diff --git a/frappe/utils/jinja.py b/frappe/utils/jinja.py index 12d00a78d8..3702a009fb 100644 --- a/frappe/utils/jinja.py +++ b/frappe/utils/jinja.py @@ -97,13 +97,10 @@ def get_jloader(): if not getattr(frappe.local, 'jloader', None): from jinja2 import ChoiceLoader, PackageLoader, PrefixLoader - if frappe.local.flags.in_setup_help: - apps = ['frappe'] - else: - apps = frappe.get_hooks('template_apps') - if not apps: - apps = frappe.local.flags.web_pages_apps or frappe.get_installed_apps(sort=True) - apps.reverse() + apps = frappe.get_hooks('template_apps') + if not apps: + apps = frappe.local.flags.web_pages_apps or frappe.get_installed_apps(sort=True) + apps.reverse() if "frappe" not in apps: apps.append('frappe') @@ -124,15 +121,13 @@ def set_filters(jenv): import frappe from frappe.utils import cint, cstr, flt - jenv.filters["json"] = frappe.as_json - jenv.filters["len"] = len - jenv.filters["int"] = cint - jenv.filters["str"] = cstr - jenv.filters["flt"] = flt - - if frappe.flags.in_setup_help: - return - + jenv.filters.update({ + "json": frappe.as_json, + "len": len, + "int": cint, + "str": cstr, + "flt": flt, + }) def get_jinja_hooks(): """Returns a tuple of (methods, filters) each containing a dict of method name and method definition pair.""" diff --git a/frappe/utils/safe_exec.py b/frappe/utils/safe_exec.py index 2042c1f2ce..5013963d1f 100644 --- a/frappe/utils/safe_exec.py +++ b/frappe/utils/safe_exec.py @@ -139,7 +139,21 @@ def get_safe_globals(): get_hooks=get_hooks, enqueue=safe_enqueue, sanitize_html=frappe.utils.sanitize_html, - log_error=frappe.log_error + log_error=frappe.log_error, + db = NamespaceDict( + get_list=frappe.get_list, + get_all=frappe.get_all, + get_value=frappe.db.get_value, + set_value=frappe.db.set_value, + get_single_value=frappe.db.get_single_value, + get_default=frappe.db.get_default, + exists=frappe.db.exists, + count=frappe.db.count, + escape=frappe.db.escape, + sql=read_sql, + commit=frappe.db.commit, + rollback=frappe.db.rollback, + ), ), FrappeClient=FrappeClient, style=frappe._dict( @@ -155,29 +169,11 @@ def get_safe_globals(): dev_server=1 if frappe._dev_server else 0, run_script=run_script, is_job_queued=is_job_queued, + get_visible_columns=get_visible_columns, ) add_module_properties(frappe.exceptions, out.frappe, lambda obj: inspect.isclass(obj) and issubclass(obj, Exception)) - if not frappe.flags.in_setup_help: - out.get_visible_columns = get_visible_columns - out.frappe.date_format = date_format - out.frappe.time_format = time_format - out.frappe.db = NamespaceDict( - get_list=frappe.get_list, - get_all=frappe.get_all, - get_value=frappe.db.get_value, - set_value=frappe.db.set_value, - get_single_value=frappe.db.get_single_value, - get_default=frappe.db.get_default, - exists=frappe.db.exists, - count=frappe.db.count, - escape=frappe.db.escape, - sql=read_sql, - commit=frappe.db.commit, - rollback=frappe.db.rollback, - ) - if frappe.response: out.frappe.response = frappe.response From 20056a447febf8c507060372ab91078ead54e946 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 16 Feb 2022 17:21:59 +0530 Subject: [PATCH 105/176] ci: Track server-side coverage as well while doing UI tests --- .github/helper/install.sh | 4 +++- .github/workflows/ui-tests.yml | 19 ++++++++++++++++++- frappe/commands/utils.py | 11 ++++++++--- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/.github/helper/install.sh b/.github/helper/install.sh index 19a7c68e19..26b3f28ba2 100644 --- a/.github/helper/install.sh +++ b/.github/helper/install.sh @@ -50,7 +50,9 @@ if [ "$TYPE" == "server" ]; then sed -i 's/^socketio:/# socketio:/g' Procfile; f if [ "$TYPE" == "server" ]; then sed -i 's/^redis_socketio:/# redis_socketio:/g' Procfile; fi if [ "$TYPE" == "ui" ]; then bench setup requirements --node; fi -if [ "$TYPE" == "server" ]; then bench setup requirements --dev; fi +bench setup requirements --dev + +if [ "$TYPE" == "ui" ]; then sed -i 's/^web: bench serve/web: bench serve --with-coverage/g' Procfile; fi # install node-sass which is required for website theme test cd ./apps/frappe || exit diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index 3eefd1ce82..fb09768c81 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -118,7 +118,9 @@ jobs: - name: Install if: ${{ steps.check-build.outputs.build == 'strawberry' }} - run: bash ${GITHUB_WORKSPACE}/.github/helper/install.sh + run: | + bash ${GITHUB_WORKSPACE}/.github/helper/install.sh + cat ~/frappe-bench/Procfile env: DB: mariadb TYPE: ui @@ -141,6 +143,11 @@ jobs: env: CYPRESS_RECORD_KEY: 4a48f41c-11b3-425b-aa88-c58048fa69eb + - name: Stop server + run: | + ps -ef | grep "frappe serve" | awk '{print $2}' | xargs kill -s SIGINT 2> /dev/null || true + sleep 5 + - name: Check If Coverage Report Exists id: check_coverage uses: andstor/file-existence-action@v1 @@ -156,3 +163,13 @@ jobs: directory: /home/runner/frappe-bench/apps/frappe/.cypress-coverage/ verbose: true flags: ui-tests + + - name: Upload Server Coverage Data + if: ${{ steps.check-build.outputs.build == 'strawberry' }} + uses: codecov/codecov-action@v2 + with: + name: MariaDB + fail_ci_if_error: true + files: /home/runner/frappe-bench/sites/coverage.xml + verbose: true + flags: server diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py index e3379a43aa..7246df8aa7 100644 --- a/frappe/commands/utils.py +++ b/frappe/commands/utils.py @@ -742,8 +742,9 @@ def run_ui_tests(context, app, headless=False, parallel=True, with_coverage=Fals @click.option('--profile', is_flag=True, default=False) @click.option('--noreload', "no_reload", is_flag=True, default=False) @click.option('--nothreading', "no_threading", is_flag=True, default=False) +@click.option('--with-coverage', is_flag=True, default=False) @pass_context -def serve(context, port=None, profile=False, no_reload=False, no_threading=False, sites_path='.', site=None): +def serve(context, port=None, profile=False, no_reload=False, no_threading=False, sites_path='.', site=None, with_coverage=False): "Start development web server" import frappe.app @@ -751,8 +752,12 @@ def serve(context, port=None, profile=False, no_reload=False, no_threading=False site = None else: site = context.sites[0] - - frappe.app.serve(port=port, profile=profile, no_reload=no_reload, no_threading=no_threading, site=site, sites_path='.') + with CodeCoverage(with_coverage, 'frappe'): + if with_coverage: + # unable to track coverage with threading enabled + no_threading = True + no_reload = True + frappe.app.serve(port=port, profile=profile, no_reload=no_reload, no_threading=no_threading, site=site, sites_path='.') @click.command('request') From 4e24efda8f7aae035fcdc772b89c683c8450dfb6 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 16 Feb 2022 17:44:14 +0530 Subject: [PATCH 106/176] ci: Exclude coverage.py and build.py from the report --- .github/workflows/ui-tests.yml | 4 +--- frappe/coverage.py | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index fb09768c81..91369dcaaa 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -118,9 +118,7 @@ jobs: - name: Install if: ${{ steps.check-build.outputs.build == 'strawberry' }} - run: | - bash ${GITHUB_WORKSPACE}/.github/helper/install.sh - cat ~/frappe-bench/Procfile + run: bash ${GITHUB_WORKSPACE}/.github/helper/install.sh env: DB: mariadb TYPE: ui diff --git a/frappe/coverage.py b/frappe/coverage.py index 1969cae141..e76bdaae90 100644 --- a/frappe/coverage.py +++ b/frappe/coverage.py @@ -29,6 +29,8 @@ FRAPPE_EXCLUSIONS = [ "*/commands/*", "*/frappe/change_log/*", "*/frappe/exceptions*", + "*/frappe/coverage.py", + "*/frappe/build.py", "*frappe/setup.py", "*/doctype/*/*_dashboard.py", "*/patches/*", From 4fb22d0f3419995076183abc860cd95bcfecbed7 Mon Sep 17 00:00:00 2001 From: Benedict Allerberger Date: Wed, 16 Feb 2022 22:23:27 +0100 Subject: [PATCH 107/176] fix: broken validation for custom LDAP server --- frappe/integrations/doctype/ldap_settings/ldap_settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/integrations/doctype/ldap_settings/ldap_settings.py b/frappe/integrations/doctype/ldap_settings/ldap_settings.py index 7c9c64ba3c..3d29feebac 100644 --- a/frappe/integrations/doctype/ldap_settings/ldap_settings.py +++ b/frappe/integrations/doctype/ldap_settings/ldap_settings.py @@ -45,8 +45,8 @@ class LDAPSettings(Document): title=_("Misconfigured")) if self.ldap_directory_server.lower() == 'custom': - if not self.ldap_group_member_attribute or not self.ldap_group_mappings_section: - frappe.throw(_("Custom LDAP Directoy Selected, please ensure 'LDAP Group Member attribute' and 'LDAP Group Mappings' are entered"), + if not self.ldap_group_member_attribute or not self.ldap_group_objectclass: + frappe.throw(_("Custom LDAP Directoy Selected, please ensure 'LDAP Group Member attribute' and 'Group Object Class' are entered"), title=_("Misconfigured")) else: From e0dcabf22499c6c900b7d72061ff7662a213d609 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 17 Feb 2022 09:52:49 +0530 Subject: [PATCH 108/176] ci: Build not required for UI tests Since we build again after instrumentation --- .github/helper/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/helper/install.sh b/.github/helper/install.sh index 26b3f28ba2..246bdbe096 100644 --- a/.github/helper/install.sh +++ b/.github/helper/install.sh @@ -62,4 +62,4 @@ cd ../.. bench start & bench --site test_site reinstall --yes if [ "$TYPE" == "server" ]; then bench --site test_site_producer reinstall --yes; fi -CI=Yes bench build --app frappe +if [ "$TYPE" == "server" ]; then CI=Yes bench build --app frappe; fi From de22bd6297bd0224e291b8856e532432f199fcaa Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Thu, 17 Feb 2022 10:35:15 +0530 Subject: [PATCH 109/176] fix: improved validation --- frappe/utils/backups.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index 2ef53a3343..69f4ee2b01 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -653,7 +653,8 @@ def get_backup_path(): @frappe.whitelist() def get_backup_encryption_key(): - return frappe.local.conf.encryption_key + frappe.only("System Manager") + return frappe.conf.encryption_key class Backup: def __init__(self, file_path): From 0f95c2716de3d10cf27ba01556b3f8d7abab0e0d Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Thu, 17 Feb 2022 10:50:31 +0530 Subject: [PATCH 110/176] fix: incorrect function name in call --- frappe/utils/backups.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index 69f4ee2b01..d23804bef4 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -653,7 +653,7 @@ def get_backup_path(): @frappe.whitelist() def get_backup_encryption_key(): - frappe.only("System Manager") + frappe.only_for("System Manager") return frappe.conf.encryption_key class Backup: From 383eb668bf90c38594d6ebbde41962e4e12d06c6 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 17 Feb 2022 11:27:34 +0530 Subject: [PATCH 111/176] fix: Update docfields of a doctype while doing update_docfield_property - This is necessary to get updated docfields while adding new row --- frappe/public/js/frappe/form/grid.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index 11fda3c8b0..98ab573b07 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -972,6 +972,7 @@ export default class Grid { // update the parent too (for new rows) this.docfields.find(d => d.fieldname === fieldname)[property] = value; + frappe.meta.docfield_map[this.doctype][fieldname][property] = value; this.debounced_refresh(); } From bb00c34e72bd4a9ae7f06289187904acf9da02f3 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 17 Feb 2022 11:30:28 +0530 Subject: [PATCH 112/176] fix: Update grid-row docfield instead of updating doctype meta --- frappe/public/js/frappe/form/grid.js | 3 ++- frappe/public/js/frappe/form/grid_row.js | 18 +++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index 98ab573b07..5dc59120fd 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -368,6 +368,8 @@ export default class Grid { if (this.grid_rows[ri] && !append_row) { var grid_row = this.grid_rows[ri]; grid_row.doc = d; + // reset docfield list for this row + grid_row.docfields = this.docfields; grid_row.refresh(); } else { var grid_row = new GridRow({ @@ -972,7 +974,6 @@ export default class Grid { // update the parent too (for new rows) this.docfields.find(d => d.fieldname === fieldname)[property] = value; - frappe.meta.docfield_map[this.doctype][fieldname][property] = value; this.debounced_refresh(); } diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js index a40f428969..441a879369 100644 --- a/frappe/public/js/frappe/form/grid_row.js +++ b/frappe/public/js/frappe/form/grid_row.js @@ -5,16 +5,13 @@ export default class GridRow { this.on_grid_fields_dict = {}; this.on_grid_fields = []; $.extend(this, opts); - if (this.doc && this.parent_df.options) { - frappe.meta.make_docfield_copy_for(this.parent_df.options, this.doc.name, this.docfields); - const docfields = frappe.meta.get_docfields(this.parent_df.options, this.doc.name); - this.docfields = docfields.length ? docfields : opts.docfields; - } + this.set_docfields(); this.columns = {}; this.columns_list = []; this.row_check_html = ''; this.make(); } + make() { var me = this; @@ -41,6 +38,15 @@ export default class GridRow { this.set_data(); } } + + set_docfields() { + if (this.doc && this.parent_df.options) { + frappe.meta.make_docfield_copy_for(this.parent_df.options, this.doc.name, this.docfields); + const docfields = frappe.meta.get_docfields(this.parent_df.options, this.doc.name); + this.docfields = docfields; + } + } + set_data() { this.wrapper.data({ "doc": this.doc @@ -152,6 +158,8 @@ export default class GridRow { this.doc = locals[this.doc.doctype][this.doc.name]; } + // update docfield list + this.set_docfields(); if(this.grid.template && !this.grid.meta.editable_grid) { this.render_template(); } else { From a8c9b92a013da438f25c873e93a1085148875a83 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 17 Feb 2022 12:16:35 +0530 Subject: [PATCH 113/176] fix: No need to reset docfields, grid row already has df copy --- frappe/public/js/frappe/form/grid.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index 5dc59120fd..11fda3c8b0 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -368,8 +368,6 @@ export default class Grid { if (this.grid_rows[ri] && !append_row) { var grid_row = this.grid_rows[ri]; grid_row.doc = d; - // reset docfield list for this row - grid_row.docfields = this.docfields; grid_row.refresh(); } else { var grid_row = new GridRow({ From 0a1cd9e623061dc563224dfbc941f003f82a83b4 Mon Sep 17 00:00:00 2001 From: ChillarAnand Date: Thu, 17 Feb 2022 15:43:07 +0530 Subject: [PATCH 114/176] fix: Removed verbose flag for gzip --- frappe/installer.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/installer.py b/frappe/installer.py index d892ff4ddc..0948620ab0 100644 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -529,10 +529,9 @@ def extract_sql_gzip(sql_gz_path): import subprocess try: - # dvf - decompress, verbose, force original_file = sql_gz_path decompressed_file = original_file.rstrip(".gz") - cmd = 'gzip -dvf < {0} > {1}'.format(original_file, decompressed_file) + cmd = 'gzip --decompress --force < {0} > {1}'.format(original_file, decompressed_file) subprocess.check_call(cmd, shell=True) except Exception: raise From 628c9bc2881abadb83fc1f7211cbffecbae48cec Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Thu, 17 Feb 2022 16:57:27 +0530 Subject: [PATCH 115/176] ci: Remove build.py from exclusion list Co-authored-by: gavin --- frappe/coverage.py | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/coverage.py b/frappe/coverage.py index e76bdaae90..5f89800deb 100644 --- a/frappe/coverage.py +++ b/frappe/coverage.py @@ -30,7 +30,6 @@ FRAPPE_EXCLUSIONS = [ "*/frappe/change_log/*", "*/frappe/exceptions*", "*/frappe/coverage.py", - "*/frappe/build.py", "*frappe/setup.py", "*/doctype/*/*_dashboard.py", "*/patches/*", From 9262d2774e00a4a4c12080f23983593790a01368 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 17 Feb 2022 18:50:33 +0530 Subject: [PATCH 116/176] fix(grid): Update docfields for new record --- frappe/public/js/frappe/form/grid_row.js | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js index 441a879369..0ee5a180e0 100644 --- a/frappe/public/js/frappe/form/grid_row.js +++ b/frappe/public/js/frappe/form/grid_row.js @@ -11,7 +11,6 @@ export default class GridRow { this.row_check_html = ''; this.make(); } - make() { var me = this; @@ -39,11 +38,18 @@ export default class GridRow { } } - set_docfields() { + set_docfields(update=false) { if (this.doc && this.parent_df.options) { frappe.meta.make_docfield_copy_for(this.parent_df.options, this.doc.name, this.docfields); const docfields = frappe.meta.get_docfields(this.parent_df.options, this.doc.name); - this.docfields = docfields; + if (update) { + // to maintain references + this.docfields.forEach(df => { + Object.assign(df, docfields.find(d => d.fieldname === df.fieldname)); + }); + } else { + this.docfields = docfields; + } } } @@ -154,12 +160,15 @@ export default class GridRow { }, __('Move To'), 'Update'); } refresh() { + // update docfields for new record + if (this.frm && this.doc && this.doc.__islocal) { + this.set_docfields(true); + } + if(this.frm && this.doc) { this.doc = locals[this.doc.doctype][this.doc.name]; } - // update docfield list - this.set_docfields(); if(this.grid.template && !this.grid.meta.editable_grid) { this.render_template(); } else { From 0b37f2a3240c7a5f3bc931179b109a0ee57a76b8 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Fri, 18 Feb 2022 11:30:05 +0530 Subject: [PATCH 117/176] fix: Saving Client Script produces Error in Console --- .../doctype/client_script/client_script.js | 56 +++++++++++++++++++ .../doctype/client_script/client_script.json | 6 +- 2 files changed, 59 insertions(+), 3 deletions(-) diff --git a/frappe/custom/doctype/client_script/client_script.js b/frappe/custom/doctype/client_script/client_script.js index ad9c9e4e42..18786c62cf 100644 --- a/frappe/custom/doctype/client_script/client_script.js +++ b/frappe/custom/doctype/client_script/client_script.js @@ -2,6 +2,9 @@ // For license information, please see license.txt frappe.ui.form.on('Client Script', { + setup(frm) { + frm.get_field("sample").html(SAMPLE_HTML); + }, refresh(frm) { if (frm.doc.dt && frm.doc.script) { frm.add_custom_button(__('Go to {0}', [frm.doc.dt]), @@ -97,3 +100,56 @@ frappe.ui.form.on('${doctype}', { frm.set_value('script', script + boilerplate); } }); + +const SAMPLE_HTML = `

Client Script Help

+

Client Scripts are executed only on the client-side (i.e. in Forms). Here are some examples to get you started

+

+
+// fetch local_tax_no on selection of customer
+// cur_frm.add_fetch(link_field,  source_fieldname,  target_fieldname);
+cur_frm.add_fetch("customer",  "local_tax_no',  'local_tax_no');
+
+// additional validation on dates
+frappe.ui.form.on('Task',  'validate',  function(frm) {
+    if (frm.doc.from_date < get_today()) {
+        msgprint('You can not select past date in From Date');
+        validated = false;
+    }
+});
+
+// make a field read-only after saving
+frappe.ui.form.on('Task',  {
+    refresh: function(frm) {
+        // use the __islocal value of doc,  to check if the doc is saved or not
+        frm.set_df_property('myfield',  'read_only',  frm.doc.__islocal ? 0 : 1);
+    }
+});
+
+// additional permission check
+frappe.ui.form.on('Task',  {
+    validate: function(frm) {
+        if(user=='user1@example.com' && frm.doc.purpose!='Material Receipt') {
+            msgprint('You are only allowed Material Receipt');
+            validated = false;
+        }
+    }
+});
+
+// calculate sales incentive
+frappe.ui.form.on('Sales Invoice',  {
+    validate: function(frm) {
+        // calculate incentives for each person on the deal
+        total_incentive = 0
+        $.each(frm.doc.sales_team,  function(i,  d) {
+            // calculate incentive
+            var incentive_percent = 2;
+            if(frm.doc.base_grand_total > 400) incentive_percent = 4;
+            // actual incentive
+            d.incentives = flt(frm.doc.base_grand_total) * incentive_percent / 100;
+            total_incentive += flt(d.incentives)
+        });
+        frm.doc.total_incentive = total_incentive;
+    }
+})
+
+
`; diff --git a/frappe/custom/doctype/client_script/client_script.json b/frappe/custom/doctype/client_script/client_script.json index 50f6bf3cc4..eca84b4dec 100644 --- a/frappe/custom/doctype/client_script/client_script.json +++ b/frappe/custom/doctype/client_script/client_script.json @@ -40,8 +40,7 @@ { "fieldname": "sample", "fieldtype": "HTML", - "label": "Sample", - "options": "

Client Script Help

\n

Client Scripts are executed only on the client-side (i.e. in Forms). Here are some examples to get you started

\n
\n\n// fetch local_tax_no on selection of customer \n// cur_frm.add_fetch(link_field,  source_fieldname,  target_fieldname); \ncur_frm.add_fetch('customer',  'local_tax_no',  'local_tax_no');\n\n// additional validation on dates \nfrappe.ui.form.on('Task',  'validate',  function(frm) {\n    if (frm.doc.from_date < get_today()) {\n        msgprint('You can not select past date in From Date');\n        validated = false;\n    } \n});\n\n// make a field read-only after saving \nfrappe.ui.form.on('Task',  {\n    refresh: function(frm) {\n        // use the __islocal value of doc,  to check if the doc is saved or not\n        frm.set_df_property('myfield',  'read_only',  frm.doc.__islocal ? 0 : 1);\n    } \n});\n\n// additional permission check\nfrappe.ui.form.on('Task',  {\n    validate: function(frm) {\n        if(user=='user1@example.com' && frm.doc.purpose!='Material Receipt') {\n            msgprint('You are only allowed Material Receipt');\n            validated = false;\n        }\n    } \n});\n\n// calculate sales incentive\nfrappe.ui.form.on('Sales Invoice',  {\n    validate: function(frm) {\n        // calculate incentives for each person on the deal\n        total_incentive = 0\n        $.each(frm.doc.sales_team,  function(i,  d) {\n            // calculate incentive\n            var incentive_percent = 2;\n            if(frm.doc.base_grand_total > 400) incentive_percent = 4;\n            // actual incentive\n            d.incentives = flt(frm.doc.base_grand_total) * incentive_percent / 100;\n            total_incentive += flt(d.incentives)\n        });\n        frm.doc.total_incentive = total_incentive;\n    } \n})\n\n
" + "label": "Sample" }, { "default": "0", @@ -76,7 +75,7 @@ "idx": 1, "index_web_pages_for_search": 1, "links": [], - "modified": "2021-09-04 12:03:27.029815", + "modified": "2022-02-18 00:43:33.941466", "modified_by": "Administrator", "module": "Custom", "name": "Client Script", @@ -107,5 +106,6 @@ ], "sort_field": "modified", "sort_order": "ASC", + "states": [], "track_changes": 1 } \ No newline at end of file From 74748c60b2cb9e84a6c68aa3a873dbc31ee52635 Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Fri, 18 Feb 2022 12:45:21 +0530 Subject: [PATCH 118/176] test: depends on for tabs --- cypress/integration/depends_on.js | 21 +++++++++++++++++++++ frappe/public/js/frappe/form/tab.js | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/cypress/integration/depends_on.js b/cypress/integration/depends_on.js index 9aa6b5d89d..c0dbbf63f6 100644 --- a/cypress/integration/depends_on.js +++ b/cypress/integration/depends_on.js @@ -55,10 +55,31 @@ context('Depends On', () => { 'read_only_depends_on': "eval:doc.test_field=='Some Other Value'", 'options': "Child Test Depends On" }, + { + "label": "Dependent Tab", + "fieldname": "dependent_tab", + "fieldtype": "Tab Break", + "depends_on": "eval:doc.test_field=='Show Tab'" + }, + { + "fieldname": "tab_section", + "fieldtype": "Section Break", + }, + { + "label": "Field in Tab", + "fieldname": "field_in_tab", + "fieldtype": "Data", + } ] }); }); }); + it('should show the tab on other setting field value', () => { + cy.new_form('Test Depends On'); + cy.fill_field('test_field', 'Show Tab'); + cy.get('body').click(); + cy.findByRole("tab", {name: "Dependent Tab"}).should('be.visible'); + }) it('should set the field as mandatory depending on other fields value', () => { cy.new_form('Test Depends On'); cy.fill_field('test_field', 'Some Value'); diff --git a/frappe/public/js/frappe/form/tab.js b/frappe/public/js/frappe/form/tab.js index c8ca016398..7df4d3a0cc 100644 --- a/frappe/public/js/frappe/form/tab.js +++ b/frappe/public/js/frappe/form/tab.js @@ -40,7 +40,7 @@ export default class Tab { hide = true; } - hide && this.toggle(false); + this.toggle(!hide) } toggle(show) { From b8539028909f7786f6be21ab6c8a1dc861496afa Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Fri, 18 Feb 2022 13:03:31 +0530 Subject: [PATCH 119/176] chore: add missing semicolon --- cypress/integration/depends_on.js | 2 +- frappe/public/js/frappe/form/tab.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cypress/integration/depends_on.js b/cypress/integration/depends_on.js index c0dbbf63f6..12f54f2b6e 100644 --- a/cypress/integration/depends_on.js +++ b/cypress/integration/depends_on.js @@ -79,7 +79,7 @@ context('Depends On', () => { cy.fill_field('test_field', 'Show Tab'); cy.get('body').click(); cy.findByRole("tab", {name: "Dependent Tab"}).should('be.visible'); - }) + }); it('should set the field as mandatory depending on other fields value', () => { cy.new_form('Test Depends On'); cy.fill_field('test_field', 'Some Value'); diff --git a/frappe/public/js/frappe/form/tab.js b/frappe/public/js/frappe/form/tab.js index 7df4d3a0cc..0e740ce49c 100644 --- a/frappe/public/js/frappe/form/tab.js +++ b/frappe/public/js/frappe/form/tab.js @@ -40,7 +40,7 @@ export default class Tab { hide = true; } - this.toggle(!hide) + this.toggle(!hide); } toggle(show) { From a307767dd5552e4c69a5b9467af7d712a235fecc Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 18 Feb 2022 17:14:34 +0530 Subject: [PATCH 120/176] refactor(minor): update_document_title API * Check for acceptable types * Check for DocType permission * Raise all exceptions if occured during document renaming --- frappe/model/rename_doc.py | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/frappe/model/rename_doc.py b/frappe/model/rename_doc.py index 6ffaadc5eb..73bda4e720 100644 --- a/frappe/model/rename_doc.py +++ b/frappe/model/rename_doc.py @@ -1,5 +1,6 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors +# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and Contributors # License: MIT. See LICENSE +from typing import Optional import frappe from frappe import _, bold from frappe.model.dynamic_links import get_dynamic_link_map @@ -11,14 +12,32 @@ from frappe.query_builder import Field @frappe.whitelist() -def update_document_title(doctype, docname, title_field=None, old_title=None, new_title=None, new_name=None, merge=False): +def update_document_title( + doctype: str, + docname: str, + title_field: Optional[str] = None, + old_title: Optional[str] = None, + new_title: Optional[str] = None, + new_name: Optional[str] = None, + merge: bool = False, +) -> str: """ Update title from header in form view """ - if docname and new_name and not docname == new_name: + # TODO: omit this after runtime type checking (ref: https://github.com/frappe/frappe/pull/14927) + for obj in [docname, new_name, new_title, old_title]: + if not isinstance(obj, (str, None)): + frappe.throw(f"{obj} must be of type str or None") + + frappe.has_permission(doctype, ptype="write", throw=True) + + title_updated = old_title and new_title and (old_title != new_title) + name_updated = new_name and docname and (docname != new_name) + + if name_updated: docname = rename_doc(doctype=doctype, old=docname, new=new_name, merge=merge) - if old_title and new_title and not old_title == new_title: + if title_updated: try: frappe.db.set_value(doctype, docname, title_field, new_title) frappe.msgprint(_('Saved'), alert=True, indicator='green') @@ -27,8 +46,9 @@ def update_document_title(doctype, docname, title_field=None, old_title=None, ne frappe.throw( _("{0} {1} already exists").format(doctype, frappe.bold(docname)), title=_("Duplicate Name"), - exc=frappe.DuplicateEntryError + exc=frappe.DuplicateEntryError, ) + raise return docname From 953560af3544e6a256491d47f5a059833488a394 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 18 Feb 2022 17:16:44 +0530 Subject: [PATCH 121/176] chore: Add type hints for rename_doc module * Easier debugging ffs :crie: --- frappe/model/naming.py | 3 +- frappe/model/rename_doc.py | 82 +++++++++++++++++--------------- frappe/model/utils/rename_doc.py | 8 +++- 3 files changed, 51 insertions(+), 42 deletions(-) diff --git a/frappe/model/naming.py b/frappe/model/naming.py index b2d11a4cfc..9024b3d7b4 100644 --- a/frappe/model/naming.py +++ b/frappe/model/naming.py @@ -1,6 +1,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: MIT. See LICENSE +from typing import Optional import frappe from frappe import _ from frappe.utils import now_datetime, cint, cstr @@ -283,7 +284,7 @@ def get_default_naming_series(doctype): return None -def validate_name(doctype, name, case=None, merge=False): +def validate_name(doctype: str, name: str, case: Optional[str] = None): if not name: frappe.throw(_("No Name Specified for {0}").format(doctype)) if name.startswith("New "+doctype): diff --git a/frappe/model/rename_doc.py b/frappe/model/rename_doc.py index 73bda4e720..ffd43fb1c7 100644 --- a/frappe/model/rename_doc.py +++ b/frappe/model/rename_doc.py @@ -1,14 +1,18 @@ # Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and Contributors # License: MIT. See LICENSE -from typing import Optional +from typing import TYPE_CHECKING, Dict, List, Optional + import frappe from frappe import _, bold from frappe.model.dynamic_links import get_dynamic_link_map from frappe.model.naming import validate_name from frappe.model.utils.user_settings import sync_user_settings, update_user_settings_data +from frappe.query_builder import Field from frappe.utils import cint from frappe.utils.password import rename_password -from frappe.query_builder import Field + +if TYPE_CHECKING: + from frappe.model.meta import Meta @frappe.whitelist() @@ -53,16 +57,16 @@ def update_document_title( return docname def rename_doc( - doctype, - old, - new, - force=False, - merge=False, - ignore_permissions=False, - ignore_if_exists=False, - show_alert=True, - rebuild_search=True -): + doctype: str, + old: str, + new: str, + force: bool = False, + merge: bool = False, + ignore_permissions: bool = False, + ignore_if_exists: bool = False, + show_alert: bool = True, + rebuild_search: bool = True, +) -> str: """Rename a doc(dt, old) to doc(dt, new) and update all linked fields of type "Link".""" if not frappe.db.exists(doctype, old): return @@ -99,7 +103,7 @@ def rename_doc( update_user_settings(old, new, link_fields) if doctype=='DocType': - rename_doctype(doctype, old, new, force) + rename_doctype(doctype, old, new) update_customizations(old, new) update_attachments(doctype, old, new) @@ -141,7 +145,7 @@ def rename_doc( return new -def update_assignments(old, new, doctype): +def update_assignments(old: str, new: str, doctype: str) -> None: old_assignments = frappe.parse_json(frappe.db.get_value(doctype, old, '_assign')) or [] new_assignments = frappe.parse_json(frappe.db.get_value(doctype, new, '_assign')) or [] common_assignments = list(set(old_assignments).intersection(new_assignments)) @@ -163,7 +167,7 @@ def update_assignments(old, new, doctype): unique_assignments = list(set(old_assignments + new_assignments)) frappe.db.set_value(doctype, new, '_assign', frappe.as_json(unique_assignments, indent=0)) -def update_user_settings(old, new, link_fields): +def update_user_settings(old: str, new: str, link_fields: List[Dict]) -> None: ''' Update the user settings of all the linked doctypes while renaming. ''' @@ -198,7 +202,7 @@ def update_user_settings(old, new, link_fields): def update_customizations(old: str, new: str) -> None: frappe.db.set_value("Custom DocPerm", {"parent": old}, "parent", new, update_modified=False) -def update_attachments(doctype, old, new): +def update_attachments(doctype: str, old: str, new: str) -> None: try: if old != "File Data" and doctype != "DocType": frappe.db.sql("""update `tabFile` set attached_to_name=%s @@ -207,11 +211,11 @@ def update_attachments(doctype, old, new): if not frappe.db.is_column_missing(e): raise -def rename_versions(doctype, old, new): +def rename_versions(doctype: str, old: str, new: str) -> None: frappe.db.sql("""UPDATE `tabVersion` SET `docname`=%s WHERE `ref_doctype`=%s AND `docname`=%s""", (new, doctype, old)) -def rename_eps_records(doctype, old, new): +def rename_eps_records(doctype: str, old: str, new: str) -> None: epl = frappe.qb.DocType("Energy Point Log") (frappe.qb.update(epl) .set(epl.reference_name, new) @@ -221,20 +225,20 @@ def rename_eps_records(doctype, old, new): ) ).run() -def rename_parent_and_child(doctype, old, new, meta): +def rename_parent_and_child(doctype: str, old: str, new: str, meta: "Meta") -> None: # rename the doc frappe.db.sql("UPDATE `tab{0}` SET `name`={1} WHERE `name`={1}".format(doctype, '%s'), (new, old)) update_autoname_field(doctype, new, meta) update_child_docs(old, new, meta) -def update_autoname_field(doctype, new, meta): +def update_autoname_field(doctype: str, new: str, meta: "Meta") -> None: # update the value of the autoname field on rename of the docname if meta.get('autoname'): field = meta.get('autoname').split(':') if field and field[0] == "field": frappe.db.sql("UPDATE `tab{0}` SET `{1}`={2} WHERE `name`={2}".format(doctype, field[1], '%s'), (new, new)) -def validate_rename(doctype, new, meta, merge, force, ignore_permissions): +def validate_rename(doctype: str, new: str, meta: "Meta", merge: bool, force: bool, ignore_permissions: bool) -> str: # using for update so that it gets locked and someone else cannot edit it while this rename is going on! exists = ( frappe.qb.from_(doctype) @@ -246,27 +250,27 @@ def validate_rename(doctype, new, meta, merge, force, ignore_permissions): exists = exists[0] if exists else None if merge and not exists: - frappe.msgprint(_("{0} {1} does not exist, select a new target to merge").format(doctype, new), raise_exception=1) + frappe.throw(_("{0} {1} does not exist, select a new target to merge").format(doctype, new)) if exists and exists != new: # for fixing case, accents exists = None if (not merge) and exists: - frappe.msgprint(_("Another {0} with name {1} exists, select another name").format(doctype, new), raise_exception=1) + frappe.throw(_("Another {0} with name {1} exists, select another name").format(doctype, new)) if not (ignore_permissions or frappe.permissions.has_permission(doctype, "write", raise_exception=False)): - frappe.msgprint(_("You need write permission to rename"), raise_exception=1) + frappe.throw(_("You need write permission to rename")) if not (force or ignore_permissions) and not meta.allow_rename: - frappe.msgprint(_("{0} not allowed to be renamed").format(_(doctype)), raise_exception=1) + frappe.throw(_("{0} not allowed to be renamed").format(_(doctype))) # validate naming like it's done in doc.py - new = validate_name(doctype, new, merge=merge) + new = validate_name(doctype, new) return new -def rename_doctype(doctype, old, new, force=False): +def rename_doctype(doctype: str, old: str, new: str) -> None: # change options for fieldtype Table, Table MultiSelect and Link fields_with_options = ("Link",) + frappe.model.table_fields @@ -281,13 +285,13 @@ def rename_doctype(doctype, old, new, force=False): # change parenttype for fieldtype Table update_parenttype_values(old, new) -def update_child_docs(old, new, meta): +def update_child_docs(old: str, new: str, meta: "Meta") -> None: # update "parent" for df in meta.get_table_fields(): frappe.db.sql("update `tab%s` set parent=%s where parent=%s" \ % (df.options, '%s', '%s'), (new, old)) -def update_link_field_values(link_fields, old, new, doctype): +def update_link_field_values(link_fields: List[Dict], old: str, new: str, doctype: str) -> None: for field in link_fields: if field['issingle']: try: @@ -322,7 +326,7 @@ def update_link_field_values(link_fields, old, new, doctype): if doctype=='DocType' and field['parent'] == old: field['parent'] = new -def get_link_fields(doctype): +def get_link_fields(doctype: str) -> List[Dict]: # get link fields from tabDocField if not frappe.flags.link_fields: frappe.flags.link_fields = {} @@ -365,7 +369,7 @@ def get_link_fields(doctype): return frappe.flags.link_fields[doctype] -def update_options_for_fieldtype(fieldtype, old, new): +def update_options_for_fieldtype(fieldtype: str, old: str, new: str) -> None: if frappe.conf.developer_mode: for name in frappe.get_all("DocField", filters={"options": old}, pluck="parent"): doctype = frappe.get_doc("DocType", name) @@ -386,7 +390,7 @@ def update_options_for_fieldtype(fieldtype, old, new): frappe.db.sql("""update `tabProperty Setter` set value=%s where property='options' and value=%s""", (new, old)) -def get_select_fields(old, new): +def get_select_fields(old: str, new: str) -> List[Dict]: """ get select type fields where doctype's name is hardcoded as new line separated list @@ -430,7 +434,7 @@ def get_select_fields(old, new): return select_fields -def update_select_field_values(old, new): +def update_select_field_values(old: str, new: str): frappe.db.sql(""" update `tabDocField` set options=replace(options, %s, %s) where @@ -453,7 +457,7 @@ def update_select_field_values(old, new): (value like {0} or value like {1})""" .format(frappe.db.escape('%' + '\n' + old + '%'), frappe.db.escape('%' + old + '\n' + '%')), (old, new, new)) -def update_parenttype_values(old, new): +def update_parenttype_values(old: str, new: str): child_doctypes = frappe.db.get_all('DocField', fields=['options', 'fieldname'], filters={ @@ -489,7 +493,7 @@ def update_parenttype_values(old, new): for doctype in child_doctypes: frappe.db.sql(f"update `tab{doctype}` set parenttype=%s where parenttype=%s", (new, old)) -def rename_dynamic_links(doctype, old, new): +def rename_dynamic_links(doctype: str, old: str, new: str): for df in get_dynamic_link_map().get(doctype, []): # dynamic link in single, just one value to check if frappe.get_meta(df.parent).issingle: @@ -505,7 +509,7 @@ def rename_dynamic_links(doctype, old, new): where {options}=%s and {fieldname}=%s""".format(parent = parent, fieldname=df.fieldname, options=df.options), (new, doctype, old)) -def bulk_rename(doctype, rows=None, via_console = False): +def bulk_rename(doctype: str, rows: Optional[List[List]] = None, via_console: bool = False) -> Optional[List[str]]: """Bulk rename documents :param doctype: DocType to be renamed @@ -543,7 +547,7 @@ def bulk_rename(doctype, rows=None, via_console = False): if not via_console: return rename_log -def update_linked_doctypes(doctype, docname, linked_to, value, ignore_doctypes=None): +def update_linked_doctypes(doctype: str, docname: str, linked_to: str, value: str, ignore_doctypes: Optional[List] = None) -> None: from frappe.model.utils.rename_doc import update_linked_doctypes show_deprecation_warning("update_linked_doctypes") @@ -556,7 +560,7 @@ def update_linked_doctypes(doctype, docname, linked_to, value, ignore_doctypes=N ) -def get_fetch_fields(doctype, linked_to, ignore_doctypes=None): +def get_fetch_fields(doctype: str, linked_to: str, ignore_doctypes: Optional[List] = None) -> List[Dict]: from frappe.model.utils.rename_doc import get_fetch_fields show_deprecation_warning("get_fetch_fields") @@ -564,7 +568,7 @@ def get_fetch_fields(doctype, linked_to, ignore_doctypes=None): doctype=doctype, linked_to=linked_to, ignore_doctypes=ignore_doctypes ) -def show_deprecation_warning(funct): +def show_deprecation_warning(funct: str) -> None: from click import secho message = ( f"Function frappe.model.rename_doc.{funct} has been deprecated and " diff --git a/frappe/model/utils/rename_doc.py b/frappe/model/utils/rename_doc.py index bf71d36a42..f7afbd0cf2 100644 --- a/frappe/model/utils/rename_doc.py +++ b/frappe/model/utils/rename_doc.py @@ -1,10 +1,14 @@ +# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and Contributors +# License: MIT. See LICENSE + from itertools import product +from typing import Dict, List, Optional import frappe from frappe.model.rename_doc import get_link_fields -def update_linked_doctypes(doctype, docname, linked_to, value, ignore_doctypes=None): +def update_linked_doctypes(doctype: str, docname: str, linked_to: str, value: str, ignore_doctypes: Optional[List] = None): """ linked_doctype_info_list = list formed by get_fetch_fields() function docname = Master DocType's name in which modification are made @@ -24,7 +28,7 @@ def update_linked_doctypes(doctype, docname, linked_to, value, ignore_doctypes=N ) -def get_fetch_fields(doctype, linked_to, ignore_doctypes=None): +def get_fetch_fields(doctype: str, linked_to: str, ignore_doctypes: Optional[List] = None) -> List[Dict]: """ doctype = Master DocType in which the changes are being made linked_to = DocType name of the field thats being updated in Master From 2d5c9651df262ccbf2c21956970ac18c1902aab8 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Fri, 18 Feb 2022 18:10:10 +0530 Subject: [PATCH 122/176] fix: share clickable URLs from List View --- frappe/public/js/frappe/list/list_view.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index 64960e0b09..5cfc7c75d4 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -1483,7 +1483,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { return [ filter[1], "=", - JSON.stringify([filter[2], filter[3]]), + encodeURIComponent(JSON.stringify([filter[2], filter[3]])), ].join(""); }) .join("&"); From ec1817de66dc143042f42bd0de28b7fafaff49b9 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 18 Feb 2022 20:17:18 +0530 Subject: [PATCH 123/176] test: Add tests for rename_doc module --- frappe/tests/test_rename_doc.py | 90 ++++++++++++++++++++++++++++++--- 1 file changed, 82 insertions(+), 8 deletions(-) diff --git a/frappe/tests/test_rename_doc.py b/frappe/tests/test_rename_doc.py index 58cc5bb125..ef3348b01f 100644 --- a/frappe/tests/test_rename_doc.py +++ b/frappe/tests/test_rename_doc.py @@ -1,13 +1,40 @@ +# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and Contributors +# License: MIT. See LICENSE + import os import unittest +from contextlib import contextmanager, redirect_stdout +from io import StringIO +from random import choice, sample +from typing import List +from unittest.mock import patch import frappe -from frappe.utils import add_to_date, now -from frappe.exceptions import DoesNotExistError - -from random import choice, sample +from frappe.exceptions import DoesNotExistError, ValidationError from frappe.model.base_document import get_controller +from frappe.model.rename_doc import bulk_rename, get_fetch_fields, update_linked_doctypes from frappe.modules.utils import get_doc_path +from frappe.utils import add_to_date, now + + +@contextmanager +def patch_db(endpoints: List[str] = None): + patched_endpoints = [] + + for point in endpoints: + x = patch(f"frappe.db.{point}", new=lambda: True) + patched_endpoints.append(x) + + savepoint = "SAVEPOINT_for_test_bulk_rename" + frappe.db.savepoint(save_point=savepoint) + try: + for x in patched_endpoints: + x.start() + yield + finally: + for x in patched_endpoints: + x.stop() + frappe.db.rollback(save_point=savepoint) class TestRenameDoc(unittest.TestCase): @@ -50,6 +77,11 @@ class TestRenameDoc(unittest.TestCase): @classmethod def tearDownClass(self): """Deleting data generated for the tests defined under TestRenameDoc""" + # delete_doc doesnt drop tables + # this is done to bypass inconsistencies in the db + frappe.delete_doc_if_exists("DocType", "Renamed Doc") + frappe.db.sql_ddl("drop table if exists `tabRenamed Doc`") + # delete the documents created for docname in self.available_documents: frappe.delete_doc(self.test_doctype, docname) @@ -153,7 +185,49 @@ class TestRenameDoc(unittest.TestCase): new_name, frappe.rename_doc("Renamed Doc", old_name, new_name, force=True) ) - # delete_doc doesnt drop tables - # this is done to bypass inconsistencies in the db - frappe.delete_doc_if_exists("DocType", "Renamed Doc") - frappe.db.sql_ddl("drop table if exists `tabRenamed Doc`") + def test_update_title_api(self): + from frappe.model.rename_doc import update_document_title + allow_rename_prop = frappe.db.get_value("DocType", self.test_doctype, "allow_rename") + frappe.clear_cache() + if not frappe.get_meta(self.test_doctype).allow_rename: + frappe.db.set_value("DocType", self.test_doctype, "allow_rename", 1, update_modified=False) + + dt = self.test_doctype + dn = self.available_documents[0] + new_name = f"{dn}-new" + + # pass invalid types to API + with self.assertRaises(ValidationError): + update_document_title(dt, dn, {}, {"hack": "this"}) + + doc_before = frappe.get_doc(self.test_doctype, dn) + update_document_title(dt, dn, new_name=new_name) + doc_after = frappe.get_doc(self.test_doctype, new_name) + + self.assertEqual(doc_before.description, doc_after.description) + self.assertEqual(doc_before.creation, doc_after.creation) + self.assertEqual(doc_before.owner, doc_after.owner) + + self.available_documents[0] = new_name + frappe.db.set_value("DocType", self.test_doctype, "allow_rename", allow_rename_prop, update_modified=False) + + def test_bulk_rename(self): + input_data = [[x, f"{x}-new"] for x in self.available_documents] + + with patch_db(["commit", "rollback"]), patch("frappe.enqueue") as enqueue: + message_log = bulk_rename(self.test_doctype, input_data, via_console=False) + self.assertEqual(len(message_log), len(self.available_documents)) + self.assertIsInstance(message_log, list) + enqueue.assert_called_with( + 'frappe.utils.global_search.rebuild_for_doctype', doctype=self.test_doctype, + ) + + def test_deprecated_utils(self): + stdout = StringIO() + + with redirect_stdout(stdout), patch_db(["set_value"]): + get_fetch_fields("User", "ToDo", ["Activity Log"]) + self.assertTrue("Function frappe.model.rename_doc.get_fetch_fields" in stdout.getvalue()) + + update_linked_doctypes("User", "ToDo", "str", "str") + self.assertTrue("Function frappe.model.rename_doc.update_linked_doctypes" in stdout.getvalue()) From 8aedf6410a3dc401a4153f7676dbcce0d55084ec Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 18 Feb 2022 20:17:39 +0530 Subject: [PATCH 124/176] fix: None is not NoneType * also, rename test ;) --- frappe/model/rename_doc.py | 2 +- frappe/tests/test_rename_doc.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/model/rename_doc.py b/frappe/model/rename_doc.py index ffd43fb1c7..88752103ae 100644 --- a/frappe/model/rename_doc.py +++ b/frappe/model/rename_doc.py @@ -30,7 +30,7 @@ def update_document_title( """ # TODO: omit this after runtime type checking (ref: https://github.com/frappe/frappe/pull/14927) for obj in [docname, new_name, new_title, old_title]: - if not isinstance(obj, (str, None)): + if not isinstance(obj, (str, type(None))): frappe.throw(f"{obj} must be of type str or None") frappe.has_permission(doctype, ptype="write", throw=True) diff --git a/frappe/tests/test_rename_doc.py b/frappe/tests/test_rename_doc.py index ef3348b01f..e86bd9cde2 100644 --- a/frappe/tests/test_rename_doc.py +++ b/frappe/tests/test_rename_doc.py @@ -185,7 +185,7 @@ class TestRenameDoc(unittest.TestCase): new_name, frappe.rename_doc("Renamed Doc", old_name, new_name, force=True) ) - def test_update_title_api(self): + def test_update_document_title_api(self): from frappe.model.rename_doc import update_document_title allow_rename_prop = frappe.db.get_value("DocType", self.test_doctype, "allow_rename") frappe.clear_cache() From d5ce2b4a8c10af3bad7c74ec2043fb882f6ecd4f Mon Sep 17 00:00:00 2001 From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com> Date: Sat, 19 Feb 2022 21:22:35 +0530 Subject: [PATCH 125/176] fix: Totalling for tree view reports (#15950) --- frappe/core/doctype/report/test_report.py | 54 ++++++++++++++++++- frappe/desk/query_report.py | 24 ++++++--- .../js/frappe/views/reports/query_report.js | 5 +- 3 files changed, 73 insertions(+), 10 deletions(-) diff --git a/frappe/core/doctype/report/test_report.py b/frappe/core/doctype/report/test_report.py index 5a22304f32..bf63afa5c5 100644 --- a/frappe/core/doctype/report/test_report.py +++ b/frappe/core/doctype/report/test_report.py @@ -3,7 +3,7 @@ import frappe, json, os import unittest -from frappe.desk.query_report import run, save_report +from frappe.desk.query_report import run, save_report, add_total_row from frappe.desk.reportview import delete_report, save_report as _save_report from frappe.custom.doctype.customize_form.customize_form import reset_customization from frappe.core.doctype.user_permission.test_user_permission import create_user @@ -282,3 +282,55 @@ result = [ # Set user back to administrator frappe.set_user('Administrator') + + def test_add_total_row_for_tree_reports(self): + report_settings = { + 'tree': True, + 'parent_field': 'parent_value' + } + + columns = [ + { + "fieldname": "parent_column", + "label": "Parent Column", + "fieldtype": "Data", + "width": 10 + }, + { + "fieldname": "column_1", + "label": "Column 1", + "fieldtype": "Float", + "width": 10 + }, + { + "fieldname": "column_2", + "label": "Column 2", + "fieldtype": "Float", + "width": 10 + } + ] + + result = [ + { + "parent_column": "Parent 1", + "column_1": 200, + "column_2": 150.50 + }, + { + "parent_column": "Child 1", + "column_1": 100, + "column_2": 75.25, + "parent_value": "Parent 1" + }, + { + "parent_column": "Child 2", + "column_1": 100, + "column_2": 75.25, + "parent_value": "Parent 1" + } + ] + + result = add_total_row(result, columns, meta=None, report_settings=report_settings) + self.assertEqual(result[-1][0], "Total") + self.assertEqual(result[-1][1], 200) + self.assertEqual(result[-1][2], 150.50) diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index 97bceeb725..9ed956e986 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -73,7 +73,7 @@ def get_report_result(report, filters): return res @frappe.read_only() -def generate_report_result(report, filters=None, user=None, custom_columns=None): +def generate_report_result(report, filters=None, user=None, custom_columns=None, report_settings=None): user = user or frappe.session.user filters = filters or [] @@ -108,7 +108,7 @@ def generate_report_result(report, filters=None, user=None, custom_columns=None) result = get_filtered_data(report.ref_doctype, columns, result, user) if cint(report.add_total_row) and result and not skip_total_row: - result = add_total_row(result, columns) + result = add_total_row(result, columns, report_settings=report_settings) return { "result": result, @@ -210,7 +210,7 @@ def get_script(report_name): @frappe.whitelist() @frappe.read_only() -def run(report_name, filters=None, user=None, ignore_prepared_report=False, custom_columns=None): +def run(report_name, filters=None, user=None, ignore_prepared_report=False, custom_columns=None, report_settings=None): report = get_report_doc(report_name) if not user: user = frappe.session.user @@ -238,7 +238,7 @@ def run(report_name, filters=None, user=None, ignore_prepared_report=False, cust dn = "" result = get_prepared_report_result(report, filters, dn, user) else: - result = generate_report_result(report, filters, user, custom_columns) + result = generate_report_result(report, filters, user, custom_columns, report_settings) result["add_total_row"] = report.add_total_row and not result.get( "skip_total_row", False @@ -435,9 +435,19 @@ def build_xlsx_data(columns, data, visible_idx, include_indentation, ignore_visi return result, column_widths -def add_total_row(result, columns, meta=None): +def add_total_row(result, columns, meta=None, report_settings=None): total_row = [""] * len(columns) has_percent = [] + is_tree = False + parent_field = '' + + if report_settings: + if isinstance(report_settings, (str,)): + report_settings = json.loads(report_settings) + + is_tree = report_settings.get('tree') + parent_field = report_settings.get('parent_field') + for i, col in enumerate(columns): fieldtype, options, fieldname = None, None, None if isinstance(col, str): @@ -464,12 +474,12 @@ def add_total_row(result, columns, meta=None): for row in result: if i >= len(row): continue - cell = row.get(fieldname) if isinstance(row, dict) else row[i] if fieldtype in ["Currency", "Int", "Float", "Percent", "Duration"] and flt( cell ): - total_row[i] = flt(total_row[i]) + flt(cell) + if not (is_tree and row.get(parent_field)): + total_row[i] = flt(total_row[i]) + flt(cell) if fieldtype == "Percent" and i not in has_percent: has_percent.append(i) diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 7ba0a0228f..c226a3a458 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -578,6 +578,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { args: { report_name: this.report_name, filters: filters, + report_settings: this.report_settings }, callback: resolve, always: () => this.page.btn_secondary.prop('disabled', false) @@ -834,7 +835,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { let data = this.data; let columns = this.columns.filter((col) => !col.hidden); - if (this.raw_data.add_total_row) { + if (this.raw_data.add_total_row && !this.report_settings.tree) { data = data.slice(); data.splice(-1, 1); } @@ -854,7 +855,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { treeView: this.tree_report, layout: 'fixed', cellHeight: 33, - showTotalRow: this.raw_data.add_total_row, + showTotalRow: this.raw_data.add_total_row && !this.report_settings.tree, direction: frappe.utils.is_rtl() ? 'rtl' : 'ltr', hooks: { columnTotal: frappe.utils.report_column_total From 5de89df5b77d6b02f7662ac21006aa3301192f08 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 21 Feb 2022 09:32:44 +0530 Subject: [PATCH 126/176] ci: Only upload server-side coverage report if .py files are changed --- .github/helper/roulette.py | 13 +++++++++---- .github/workflows/ui-tests.yml | 3 ++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/helper/roulette.py b/.github/helper/roulette.py index 9831df7f30..f0caa74e96 100644 --- a/.github/helper/roulette.py +++ b/.github/helper/roulette.py @@ -52,7 +52,8 @@ if __name__ == "__main__": ci_files_changed = any(f for f in files_list if is_ci(f)) only_docs_changed = len(list(filter(is_docs, files_list))) == len(files_list) only_frontend_code_changed = len(list(filter(is_frontend_code, files_list))) == len(files_list) - only_py_changed = len(list(filter(is_py, files_list))) == len(files_list) + updated_py_file_count = len(list(filter(is_py, files_list))) + only_py_changed = updated_py_file_count == len(files_list) if ci_files_changed: print("CI related files were updated, running all build processes.") @@ -65,8 +66,12 @@ if __name__ == "__main__": print("Only Frontend code was updated; Stopping Python build process.") sys.exit(0) - elif only_py_changed and build_type == "ui": - print("Only Python code was updated, stopping Cypress build process.") - sys.exit(0) + elif build_type == "ui": + if only_py_changed: + print("Only Python code was updated, stopping Cypress build process.") + sys.exit(0) + elif updated_py_file_count > 0: + # both frontend and backend code were updated + os.system('echo "::set-output name=build-server::strawberry"') os.system('echo "::set-output name=build::strawberry"') diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index 91369dcaaa..fc8093444e 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -142,6 +142,7 @@ jobs: CYPRESS_RECORD_KEY: 4a48f41c-11b3-425b-aa88-c58048fa69eb - name: Stop server + if: ${{ steps.check-build.outputs.build-server == 'strawberry' }} run: | ps -ef | grep "frappe serve" | awk '{print $2}' | xargs kill -s SIGINT 2> /dev/null || true sleep 5 @@ -163,7 +164,7 @@ jobs: flags: ui-tests - name: Upload Server Coverage Data - if: ${{ steps.check-build.outputs.build == 'strawberry' }} + if: ${{ steps.check-build.outputs.build-server == 'strawberry' }} uses: codecov/codecov-action@v2 with: name: MariaDB From 21fcd00416fac36cbbbf0f1187f62ba4451ed369 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 21 Feb 2022 11:07:37 +0530 Subject: [PATCH 127/176] ci: While running all builds set build-server as well --- .github/helper/roulette.py | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/helper/roulette.py b/.github/helper/roulette.py index f0caa74e96..90f4608a22 100644 --- a/.github/helper/roulette.py +++ b/.github/helper/roulette.py @@ -41,6 +41,7 @@ if __name__ == "__main__": # this is a push build, run all builds if not pr_number: os.system('echo "::set-output name=build::strawberry"') + os.system('echo "::set-output name=build-server::strawberry"') sys.exit(0) files_list = files_list or get_files_list(pr_number=pr_number, repo=repo) From 25af0c82173d4a7fb28fa7a5c4d9c0e5c723edb8 Mon Sep 17 00:00:00 2001 From: lapardnemihk1099 Date: Mon, 21 Feb 2022 13:36:39 +0530 Subject: [PATCH 128/176] chore: unnecessary JS warning if options are not defined in date field --- frappe/public/js/frappe/form/controls/date.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/date.js b/frappe/public/js/frappe/form/controls/date.js index 7ad1887d62..fa9dc1c99e 100644 --- a/frappe/public/js/frappe/form/controls/date.js +++ b/frappe/public/js/frappe/form/controls/date.js @@ -158,8 +158,10 @@ frappe.ui.form.ControlDate = class ControlDate extends frappe.ui.form.ControlDat return value; } get_df_options() { + if(!this.df.options) return {}; + let options = {}; - let df_options = this.df.options || ''; + let df_options = this.df.options; if (typeof df_options === 'string') { try { options = JSON.parse(df_options); From e562368069a5e604d22b2bdcac34368c92fee9fd Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 21 Feb 2022 13:43:53 +0530 Subject: [PATCH 129/176] fix: Fix if table_field exists in meta of link.parent_doctype --- frappe/core/doctype/doctype/doctype.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index 6d0409521e..7d75ef7ba9 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -784,10 +784,9 @@ def validate_links_table_fieldnames(meta): if not meta.links or frappe.flags.in_patch or frappe.flags.in_fixtures: return - fieldnames = tuple(field.fieldname for field in meta.fields) for index, link in enumerate(meta.links, 1): link_meta = frappe.get_meta(link.link_doctype) - if not link_meta.get_field(link.link_fieldname): + if not frappe.get_meta(link.link_doctype).has_field(link.link_fieldname): message = _("Document Links Row #{0}: Could not find field {1} in {2} DocType").format(index, frappe.bold(link.link_fieldname), frappe.bold(link.link_doctype)) frappe.throw(message, InvalidFieldNameError, _("Invalid Fieldname")) @@ -802,7 +801,7 @@ def validate_links_table_fieldnames(meta): message = _("Document Links Row #{0}: Table Fieldname is mandatory for internal links").format(index) frappe.throw(message, frappe.ValidationError, _("Table Fieldname Missing")) - if link.table_fieldname not in fieldnames: + if not frappe.get_meta(link.parent_doctype).has_field(link.table_fieldname): message = _("Document Links Row #{0}: Could not find field {1} in {2} DocType").format(index, frappe.bold(link.table_fieldname), frappe.bold(meta.name)) frappe.throw(message, frappe.ValidationError, _("Invalid Table Fieldname")) From 88791c22648ab25fb95543441646b81a2c7ca60a Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 21 Feb 2022 14:25:34 +0530 Subject: [PATCH 130/176] test: Set correct parent doctype for document link --- frappe/custom/doctype/customize_form/test_customize_form.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/custom/doctype/customize_form/test_customize_form.py b/frappe/custom/doctype/customize_form/test_customize_form.py index 0fe39e0008..d131f06127 100644 --- a/frappe/custom/doctype/customize_form/test_customize_form.py +++ b/frappe/custom/doctype/customize_form/test_customize_form.py @@ -257,7 +257,7 @@ class TestCustomizeForm(unittest.TestCase): frappe.clear_cache() d = self.get_customize_form("User Group") - d.append('links', dict(link_doctype='User Group Member', parent_doctype='User', + d.append('links', dict(link_doctype='User Group Member', parent_doctype='User Group', link_fieldname='user', table_fieldname='user_group_members', group='Tests', custom=1)) d.run_method("save_customization") @@ -267,7 +267,7 @@ class TestCustomizeForm(unittest.TestCase): # check links exist self.assertTrue([d.name for d in user_group.links if d.link_doctype == 'User Group Member']) - self.assertTrue([d.name for d in user_group.links if d.parent_doctype == 'User']) + self.assertTrue([d.name for d in user_group.links if d.parent_doctype == 'User Group']) # remove the link d = self.get_customize_form("User Group") From c775ca1d1dc0765e10fa70ad32dbdb0abff7d85f Mon Sep 17 00:00:00 2001 From: Benedict Allerberger Date: Mon, 21 Feb 2022 12:42:56 +0100 Subject: [PATCH 131/176] feat(minor): Add Custom Group Search for custom LDAP servers --- .../doctype/ldap_settings/ldap_settings.json | 7 +++++++ .../integrations/doctype/ldap_settings/ldap_settings.py | 9 ++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/frappe/integrations/doctype/ldap_settings/ldap_settings.json b/frappe/integrations/doctype/ldap_settings/ldap_settings.json index d915ae2ad6..fd45a71538 100644 --- a/frappe/integrations/doctype/ldap_settings/ldap_settings.json +++ b/frappe/integrations/doctype/ldap_settings/ldap_settings.json @@ -38,6 +38,7 @@ "local_ca_certs_file", "ldap_custom_settings_section", "ldap_group_objectclass", + "ldap_custom_group_search", "column_break_33", "ldap_group_member_attribute", "ldap_group_mappings_section", @@ -247,6 +248,12 @@ "fieldtype": "Data", "label": "Group Object Class" }, + { + "description": "string value, i.e. {0} or uid={0},ou=users,dc=example,dc=com", + "fieldname": "ldap_custom_group_search", + "fieldtype": "Data", + "label": "Custom Group Search" + }, { "description": "Requires any valid fdn path. i.e. ou=users,dc=example,dc=com", "fieldname": "ldap_search_path_user", diff --git a/frappe/integrations/doctype/ldap_settings/ldap_settings.py b/frappe/integrations/doctype/ldap_settings/ldap_settings.py index 3d29feebac..f16d126440 100644 --- a/frappe/integrations/doctype/ldap_settings/ldap_settings.py +++ b/frappe/integrations/doctype/ldap_settings/ldap_settings.py @@ -49,6 +49,10 @@ class LDAPSettings(Document): frappe.throw(_("Custom LDAP Directoy Selected, please ensure 'LDAP Group Member attribute' and 'Group Object Class' are entered"), title=_("Misconfigured")) + if self.ldap_custom_group_search and "{0}" not in self.ldap_custom_group_search: + frappe.throw(_("Custom Group Search if filled needs to contain the user placeholder {0}, eg uid={0},ou=users,dc=example,dc=com"), + title=_("Misconfigured")) + else: frappe.throw(_("LDAP Search String must be enclosed in '()' and needs to contian the user placeholder {0}, eg sAMAccountName={0}")) @@ -209,7 +213,10 @@ class LDAPSettings(Document): ldap_object_class = self.ldap_group_objectclass ldap_group_members_attribute = self.ldap_group_member_attribute - user_search_str = getattr(user, self.ldap_username_field).value + ldap_custom_group_search = "{0}" + if self.ldap_custom_group_search: + ldap_custom_group_search = self.ldap_custom_group_search + user_search_str = ldap_custom_group_search.format(getattr(user, self.ldap_username_field).value) else: # NOTE: depreciate this else path From 745297a49d516e5e3c4bb3e1b0c4235e7d31165d Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Mon, 21 Feb 2022 19:54:34 +0100 Subject: [PATCH 132/176] refactor: a not in b Search: if not ([\w\d]*?) in ([\w\d]*?) Replace: if $1 not in $2 --- frappe/database/database.py | 2 +- frappe/desk/reportview.py | 5 +++-- frappe/desk/treeview.py | 2 +- frappe/installer.py | 2 +- frappe/model/db_query.py | 4 ++-- frappe/model/rename_doc.py | 2 +- frappe/model/sync.py | 2 +- frappe/realtime.py | 2 +- frappe/test_runner.py | 4 ++-- frappe/translate.py | 2 +- frappe/utils/redis_wrapper.py | 4 ++-- frappe/utils/user.py | 2 +- frappe/website/utils.py | 2 +- 13 files changed, 18 insertions(+), 17 deletions(-) mode change 100755 => 100644 frappe/utils/user.py diff --git a/frappe/database/database.py b/frappe/database/database.py index c833bdeed3..dc9f20d8c2 100644 --- a/frappe/database/database.py +++ b/frappe/database/database.py @@ -584,7 +584,7 @@ class Database(object): company = frappe.db.get_single_value('Global Defaults', 'default_company') """ - if not doctype in self.value_cache: + if doctype not in self.value_cache: self.value_cache[doctype] = {} if cache and fieldname in self.value_cache[doctype]: diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py index b0e1f901aa..1ec8ede62e 100644 --- a/frappe/desk/reportview.py +++ b/frappe/desk/reportview.py @@ -533,7 +533,8 @@ def get_stats(stats, doctype, filters=None): columns = [] for tag in tags: - if not tag in columns: continue + if tag not in columns: + continue try: tag_count = frappe.get_list(doctype, fields=[tag, "count(*)"], @@ -612,7 +613,7 @@ def scrub_user_tags(tagcount): alltags = t.split(',') for tag in alltags: if tag: - if not tag in rdict: + if tag not in rdict: rdict[tag] = 0 rdict[tag] += tagdict[t] diff --git a/frappe/desk/treeview.py b/frappe/desk/treeview.py index 7e3efb5d48..5e8fb18fe4 100644 --- a/frappe/desk/treeview.py +++ b/frappe/desk/treeview.py @@ -15,7 +15,7 @@ def get_all_nodes(doctype, label, parent, tree_method, **filters): tree_method = frappe.get_attr(tree_method) - if not tree_method in frappe.whitelisted: + if tree_method not in frappe.whitelisted: frappe.throw(_("Not Permitted"), frappe.PermissionError) data = tree_method(doctype, parent, **filters) diff --git a/frappe/installer.py b/frappe/installer.py index 0948620ab0..20db451d26 100644 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -184,7 +184,7 @@ def install_app(name, verbose=False, set_as_patched=True): def add_to_installed_apps(app_name, rebuild_website=True): installed_apps = frappe.get_installed_apps() - if not app_name in installed_apps: + if app_name not in installed_apps: installed_apps.append(app_name) frappe.db.set_global("installed_apps", json.dumps(installed_apps)) frappe.db.commit() diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py index 79be261981..a6b96e8fb5 100644 --- a/frappe/model/db_query.py +++ b/frappe/model/db_query.py @@ -330,7 +330,7 @@ class DatabaseQuery(object): table_name = table_name[7:] if not table_name[0]=='`': table_name = f"`{table_name}`" - if not table_name in self.tables: + if table_name not in self.tables: self.append_table(table_name) def append_table(self, table_name): @@ -428,7 +428,7 @@ class DatabaseQuery(object): f = get_filter(self.doctype, f, additional_filters_config) tname = ('`tab' + f.doctype + '`') - if not tname in self.tables: + if tname not in self.tables: self.append_table(tname) if 'ifnull(' in f.fieldname: diff --git a/frappe/model/rename_doc.py b/frappe/model/rename_doc.py index 6ffaadc5eb..d825261617 100644 --- a/frappe/model/rename_doc.py +++ b/frappe/model/rename_doc.py @@ -307,7 +307,7 @@ def get_link_fields(doctype): if not frappe.flags.link_fields: frappe.flags.link_fields = {} - if not doctype in frappe.flags.link_fields: + if doctype not in frappe.flags.link_fields: link_fields = frappe.db.sql("""\ select parent, fieldname, (select issingle from tabDocType dt diff --git a/frappe/model/sync.py b/frappe/model/sync.py index 9ba14d5e68..109260d0fe 100644 --- a/frappe/model/sync.py +++ b/frappe/model/sync.py @@ -117,7 +117,7 @@ def get_doc_files(files, start_path): if os.path.isdir(os.path.join(doctype_path, docname)): doc_path = os.path.join(doctype_path, docname, docname) + ".json" if os.path.exists(doc_path): - if not doc_path in files: + if doc_path not in files: files.append(doc_path) return files diff --git a/frappe/realtime.py b/frappe/realtime.py index aa0e2fddad..e0f64d32fb 100644 --- a/frappe/realtime.py +++ b/frappe/realtime.py @@ -65,7 +65,7 @@ def publish_realtime(event=None, message=None, room=None, if after_commit: params = [event, message, room] - if not params in frappe.local.realtime_log: + if params not in frappe.local.realtime_log: frappe.local.realtime_log.append(params) else: emit_via_redis(event, message, room) diff --git a/frappe/test_runner.py b/frappe/test_runner.py index 05f1ce1cd7..20759331c3 100644 --- a/frappe/test_runner.py +++ b/frappe/test_runner.py @@ -285,7 +285,7 @@ def make_test_records(doctype, verbose=0, force=False): if options == "[Select]": continue - if not options in frappe.local.test_objects: + if options not in frappe.local.test_objects: frappe.local.test_objects[options] = [] make_test_records(options, verbose, force) make_test_records_for_doctype(options, verbose, force) @@ -425,7 +425,7 @@ def add_to_test_record_log(doctype): '''Add `doctype` to site/.test_log `.test_log` is a cache of all doctypes for which test records are created''' test_record_log = get_test_record_log() - if not doctype in test_record_log: + if doctype not in test_record_log: frappe.flags.test_record_log.append(doctype) with open(frappe.get_site_path('.test_log'), 'w') as f: f.write('\n'.join(filter(None, frappe.flags.test_record_log))) diff --git a/frappe/translate.py b/frappe/translate.py index c883e63de3..c7293aa9f1 100644 --- a/frappe/translate.py +++ b/frappe/translate.py @@ -135,7 +135,7 @@ def get_dict(fortype, name=None): asset_key = fortype + ":" + (name or "-") translation_assets = cache.hget("translation_assets", frappe.local.lang, shared=True) or {} - if not asset_key in translation_assets: + if asset_key not in translation_assets: messages = [] if fortype=="doctype": messages = get_messages_from_doctype(name) diff --git a/frappe/utils/redis_wrapper.py b/frappe/utils/redis_wrapper.py index 9ca5bbfd4f..c40180b538 100644 --- a/frappe/utils/redis_wrapper.py +++ b/frappe/utils/redis_wrapper.py @@ -154,7 +154,7 @@ class RedisWrapper(redis.Redis): _name = self.make_key(name, shared=shared) # set in local - if not _name in frappe.local.cache: + if _name not in frappe.local.cache: frappe.local.cache[_name] = {} frappe.local.cache[_name][key] = value @@ -173,7 +173,7 @@ class RedisWrapper(redis.Redis): def hget(self, name, key, generator=None, shared=False): _name = self.make_key(name, shared=shared) - if not _name in frappe.local.cache: + if _name not in frappe.local.cache: frappe.local.cache[_name] = {} if not key: return None diff --git a/frappe/utils/user.py b/frappe/utils/user.py old mode 100755 new mode 100644 index cbf38f6acb..ca7a555c72 --- a/frappe/utils/user.py +++ b/frappe/utils/user.py @@ -79,7 +79,7 @@ class UserPermissions: for r in get_valid_perms(): dt = r['parent'] - if not dt in self.perm_map: + if dt not in self.perm_map: self.perm_map[dt] = {} for k in frappe.permissions.rights: diff --git a/frappe/website/utils.py b/frappe/website/utils.py index 152d312533..f0a8da7736 100644 --- a/frappe/website/utils.py +++ b/frappe/website/utils.py @@ -226,7 +226,7 @@ def get_full_index(route=None, app=None): # order as per index if present for route, children in children_map.items(): - if not route in pages: + if route not in pages: # no parent (?) continue From be51b60c84be413dda503466c940e6fc3c36efc2 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Mon, 21 Feb 2022 19:56:45 +0100 Subject: [PATCH 133/176] chore: ignore rev in blame --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index f02694846d..633c5fcfe2 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -13,3 +13,6 @@ fe20515c23a3ac41f1092bf0eaf0a0a452ec2e85 # Updating license headers 34460265554242a8d05fb09f049033b1117e1a2b + +# Refactor "not a in b" -> "a not in b" +745297a49d516e5e3c4bb3e1b0c4235e7d31165d From b2116ff36dff134f711022f1dc44378b3f799f15 Mon Sep 17 00:00:00 2001 From: cpdeethree Date: Mon, 21 Feb 2022 20:20:10 -0600 Subject: [PATCH 134/176] fix: error in table creation from incorrect scope --- frappe/database/postgres/schema.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/database/postgres/schema.py b/frappe/database/postgres/schema.py index 9487bc2fa7..f6235b6ff5 100644 --- a/frappe/database/postgres/schema.py +++ b/frappe/database/postgres/schema.py @@ -19,15 +19,15 @@ class PostgresTable(DBTable): add_text += ",\n".join( ( - "parent varchar({varchar_len})", - "parentfield varchar({varchar_len})", - "parenttype varchar({varchar_len})" + "parent varchar({varchar_len})".format(varchar_len=frappe.db.VARCHAR_LEN), + "parentfield varchar({varchar_len})".format(varchar_len=frappe.db.VARCHAR_LEN), + "parenttype varchar({varchar_len})".format(varchar_len=frappe.db.VARCHAR_LEN) ) ) # TODO: set docstatus length # create table - frappe.db.sql(("""create table `%s` ( + frappe.db.sql("""create table `%s` ( name varchar({varchar_len}) not null primary key, creation timestamp(6), modified timestamp(6), @@ -35,7 +35,7 @@ class PostgresTable(DBTable): owner varchar({varchar_len}), docstatus smallint not null default '0', idx bigint not null default '0', - %s)""" % (self.table_name, add_text)).format(varchar_len=frappe.db.VARCHAR_LEN)) + %s)""".format(varchar_len=frappe.db.VARCHAR_LEN) % (self.table_name, add_text)) self.create_indexes() frappe.db.commit() From dc351b1a82fd32269c070e53d0bc8b0823e1e853 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Tue, 22 Feb 2022 08:29:02 +0530 Subject: [PATCH 135/176] chore: Remove flag from codecov badge To get the actual coverage of the repository --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ef471aa05a..8c8317c8bd 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ - + From 8e3e0df5d7b99dd4f46eb7355d4c115439406034 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 21 Feb 2022 15:55:30 +0530 Subject: [PATCH 136/176] fix(minor): throttle listview refresh on same args for 3 seconds --- frappe/public/js/frappe/list/base_list.js | 18 +++++++++++++++++- .../public/js/frappe/ui/filters/filter_list.js | 2 +- frappe/public/scss/common/modal.scss | 5 +++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js index d09a1c7043..2ea6e55666 100644 --- a/frappe/public/js/frappe/list/base_list.js +++ b/frappe/public/js/frappe/list/base_list.js @@ -465,9 +465,14 @@ frappe.views.BaseList = class BaseList { } refresh() { + let args = this.get_call_args(); + if (this.no_change(args)) { + console.log('throttled'); + return Promise.resolve(); + } this.freeze(true); // fetch data from server - return frappe.call(this.get_call_args()).then((r) => { + return frappe.call(args).then((r) => { // render this.prepare_data(r); this.toggle_result_area(); @@ -482,6 +487,17 @@ frappe.views.BaseList = class BaseList { }); } + no_change(args) { + // returns true if arguments are same for the last 5 seconds + // this helps in throttling if called from various sources + if (this.last_args && JSON.stringify(args) === this.last_args) { + return true; + } + this.last_args = JSON.stringify(args); + setTimeout(() => { this.last_args = null}, 3000); + return false; + } + prepare_data(r) { let data = r.message || {}; diff --git a/frappe/public/js/frappe/ui/filters/filter_list.js b/frappe/public/js/frappe/ui/filters/filter_list.js index 1377a6ff13..b0a1eee707 100644 --- a/frappe/public/js/frappe/ui/filters/filter_list.js +++ b/frappe/public/js/frappe/ui/filters/filter_list.js @@ -293,7 +293,7 @@ frappe.ui.FilterGroup = class {
-
+
diff --git a/frappe/public/scss/common/modal.scss b/frappe/public/scss/common/modal.scss index ec582591f2..c9217a075e 100644 --- a/frappe/public/scss/common/modal.scss +++ b/frappe/public/scss/common/modal.scss @@ -225,6 +225,11 @@ body.modal-open[style^="padding-right"] { } } +// modal is xs (for grids) +.modal .hidden-xs { + display: none !important; +} + .dialog-assignment-row { display: flex; align-items: center; From 5fd693d50ed5542f4fb03846997d6707538b66c5 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 21 Feb 2022 15:56:27 +0530 Subject: [PATCH 137/176] fix(minor): throttle listview refresh on same args for 3 seconds --- frappe/public/js/frappe/list/base_list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js index 2ea6e55666..1ba729c6a3 100644 --- a/frappe/public/js/frappe/list/base_list.js +++ b/frappe/public/js/frappe/list/base_list.js @@ -488,7 +488,7 @@ frappe.views.BaseList = class BaseList { } no_change(args) { - // returns true if arguments are same for the last 5 seconds + // returns true if arguments are same for the last 3 seconds // this helps in throttling if called from various sources if (this.last_args && JSON.stringify(args) === this.last_args) { return true; From 585086c0a8381fd1eb7b14f1429fd651d9ebc6dc Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 22 Feb 2022 10:20:40 +0530 Subject: [PATCH 138/176] fix: Use meta if parent doctype is same as current doctype --- frappe/core/doctype/doctype/doctype.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index 7d75ef7ba9..dca0a05281 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -784,10 +784,12 @@ def validate_links_table_fieldnames(meta): if not meta.links or frappe.flags.in_patch or frappe.flags.in_fixtures: return + fieldnames = tuple(field.fieldname for field in meta.fields) for index, link in enumerate(meta.links, 1): - link_meta = frappe.get_meta(link.link_doctype) if not frappe.get_meta(link.link_doctype).has_field(link.link_fieldname): - message = _("Document Links Row #{0}: Could not find field {1} in {2} DocType").format(index, frappe.bold(link.link_fieldname), frappe.bold(link.link_doctype)) + message = _("Document Links Row #{0}: Could not find field {1} in {2} DocType").format( + index, frappe.bold(link.link_fieldname), frappe.bold(link.link_doctype) + ) frappe.throw(message, InvalidFieldNameError, _("Invalid Fieldname")) if not link.is_child_table: @@ -801,8 +803,15 @@ def validate_links_table_fieldnames(meta): message = _("Document Links Row #{0}: Table Fieldname is mandatory for internal links").format(index) frappe.throw(message, frappe.ValidationError, _("Table Fieldname Missing")) - if not frappe.get_meta(link.parent_doctype).has_field(link.table_fieldname): - message = _("Document Links Row #{0}: Could not find field {1} in {2} DocType").format(index, frappe.bold(link.table_fieldname), frappe.bold(meta.name)) + if meta.name == link.parent_doctype: + field_exists = link.table_fieldname in fieldnames + else: + field_exists = frappe.get_meta(link.parent_doctype).has_field(link.table_fieldname) + + if not field_exists: + message = _("Document Links Row #{0}: Could not find field {1} in {2} DocType").format( + index, frappe.bold(link.table_fieldname), frappe.bold(meta.name) + ) frappe.throw(message, frappe.ValidationError, _("Invalid Table Fieldname")) def validate_fields_for_doctype(doctype): From a7cd6003cedfea1b6da2755a171f462103ed1a7f Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 22 Feb 2022 10:26:42 +0530 Subject: [PATCH 139/176] fix: Wrap timeout getting for custom queues in function (backport #15933) (#16054) Co-authored-by: Lev Vereshchagin Co-authored-by: Gavin D'souza --- frappe/utils/background_jobs.py | 35 +++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/frappe/utils/background_jobs.py b/frappe/utils/background_jobs.py index 2c8b7f5fd3..58029dbc5f 100755 --- a/frappe/utils/background_jobs.py +++ b/frappe/utils/background_jobs.py @@ -1,6 +1,7 @@ import os import socket import time +from functools import lru_cache from uuid import uuid4 from collections import defaultdict from typing import List @@ -20,18 +21,22 @@ from frappe.utils.redis_queue import RedisQueue from frappe.utils.commands import log -common_site_config = frappe.get_file_json("common_site_config.json") -custom_workers_config = common_site_config.get("workers", {}) -default_timeout = 300 -queue_timeout = { - "default": default_timeout, - "short": default_timeout, - "long": 1500, - **{ - worker: config.get("timeout", default_timeout) - for worker, config in custom_workers_config.items() + +@lru_cache() +def get_queues_timeout(): + common_site_config = frappe.get_conf() + custom_workers_config = common_site_config.get("workers", {}) + default_timeout = 300 + + return { + "default": default_timeout, + "short": default_timeout, + "long": 1500, + **{ + worker: config.get("timeout", default_timeout) + for worker, config in custom_workers_config.items() + } } -} redis_connection = None @@ -57,7 +62,7 @@ def enqueue(method, queue='default', timeout=None, event=None, q = get_queue(queue, is_async=is_async) if not timeout: - timeout = queue_timeout.get(queue) or 300 + timeout = get_queues_timeout().get(queue) or 300 queue_args = { "site": frappe.local.site, "user": frappe.session.user, @@ -204,7 +209,7 @@ def get_jobs(site=None, queue=None, key='method'): def get_queue_list(queue_list=None, build_queue_name=False): '''Defines possible queues. Also wraps a given queue in a list after validating.''' - default_queue_list = list(queue_timeout) + default_queue_list = list(get_queues_timeout()) if queue_list: if isinstance(queue_list, str): queue_list = [queue_list] @@ -236,7 +241,7 @@ def get_queue(qtype, is_async=True): def validate_queue(queue, default_queue_list=None): if not default_queue_list: - default_queue_list = list(queue_timeout) + default_queue_list = list(get_queues_timeout()) if queue not in default_queue_list: frappe.throw(_("Queue should be one of {0}").format(', '.join(default_queue_list))) @@ -296,7 +301,7 @@ def generate_qname(qtype: str) -> str: def is_queue_accessible(qobj: Queue) -> bool: """Checks whether queue is relate to current bench or not. """ - accessible_queues = [generate_qname(q) for q in list(queue_timeout)] + accessible_queues = [generate_qname(q) for q in list(get_queues_timeout())] return qobj.name in accessible_queues def enqueue_test_job(): From 4cb37c129b76cb0128bd2522e15c8e8f0d3db9ed Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 22 Feb 2022 10:34:38 +0530 Subject: [PATCH 140/176] fix(minor): test and linting --- cypress/integration/list_view.js | 1 + frappe/public/js/frappe/form/grid_row.js | 8 ++++---- frappe/public/js/frappe/list/base_list.js | 6 ++++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/cypress/integration/list_view.js b/cypress/integration/list_view.js index b161af2df7..b7a96db4bc 100644 --- a/cypress/integration/list_view.js +++ b/cypress/integration/list_view.js @@ -12,6 +12,7 @@ context('List View', () => { cy.get('.list-row-container .list-row-checkbox').click({ multiple: true, force: true }); cy.get('.actions-btn-group button').contains('Actions').should('be.visible'); cy.intercept('/api/method/frappe.desk.reportview.get').as('list-refresh'); + cy.wait(300); // wait before you hit another refresh cy.get('button[data-original-title="Refresh"]').click(); cy.wait('@list-refresh'); cy.get('.list-row-container .list-row-checkbox:checked').should('be.visible'); diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js index 0ee5a180e0..ec89d26213 100644 --- a/frappe/public/js/frappe/form/grid_row.js +++ b/frappe/public/js/frappe/form/grid_row.js @@ -340,7 +340,7 @@ export default class GridRow {
-

+ ${__('Add / Remove Columns')} @@ -420,10 +420,10 @@ export default class GridRow { data-label='${docfield.label}' data-type='${docfield.fieldtype}'>

-
+
${frappe.utils.icon('drag', 'xs')}
-
+
${__(docfield.label)}
@@ -431,7 +431,7 @@ export default class GridRow { value='${docfield.columns || cint(d.columns)}' data-fieldname='${docfield.fieldname}' style='background-color: #ffff; display: inline'>
-
+
diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js index 1ba729c6a3..b7cb5a05df 100644 --- a/frappe/public/js/frappe/list/base_list.js +++ b/frappe/public/js/frappe/list/base_list.js @@ -467,7 +467,7 @@ frappe.views.BaseList = class BaseList { refresh() { let args = this.get_call_args(); if (this.no_change(args)) { - console.log('throttled'); + // console.log('throttled'); return Promise.resolve(); } this.freeze(true); @@ -494,7 +494,9 @@ frappe.views.BaseList = class BaseList { return true; } this.last_args = JSON.stringify(args); - setTimeout(() => { this.last_args = null}, 3000); + setTimeout(() => { + this.last_args = null; + }, 3000); return false; } From 33890ed8606cdfcff4920a749e36a57c4661fe4e Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Tue, 22 Feb 2022 11:23:51 +0530 Subject: [PATCH 141/176] refactor: use f-strings instead of .format and % --- frappe/database/postgres/schema.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/frappe/database/postgres/schema.py b/frappe/database/postgres/schema.py index f6235b6ff5..bb7ff20a26 100644 --- a/frappe/database/postgres/schema.py +++ b/frappe/database/postgres/schema.py @@ -5,29 +5,29 @@ from frappe.database.schema import DBTable, get_definition class PostgresTable(DBTable): def create(self): - add_text = "" + varchar_len = frappe.db.VARCHAR_LEN + additional_definitions = "" # columns column_defs = self.get_column_definitions() if column_defs: - add_text += ",\n".join(column_defs) + additional_definitions += ",\n".join(column_defs) # child table columns if self.meta.get("istable") or 0: if column_defs: - add_text += ",\n" + additional_definitions += ",\n" - add_text += ",\n".join( + additional_definitions += ",\n".join( ( - "parent varchar({varchar_len})".format(varchar_len=frappe.db.VARCHAR_LEN), - "parentfield varchar({varchar_len})".format(varchar_len=frappe.db.VARCHAR_LEN), - "parenttype varchar({varchar_len})".format(varchar_len=frappe.db.VARCHAR_LEN) + f"parent varchar({varchar_len})", + f"parentfield varchar({varchar_len})", + f"parenttype varchar({varchar_len})", ) ) - # TODO: set docstatus length # create table - frappe.db.sql("""create table `%s` ( + frappe.db.sql(f"""create table `{self.table_name}` ( name varchar({varchar_len}) not null primary key, creation timestamp(6), modified timestamp(6), @@ -35,7 +35,9 @@ class PostgresTable(DBTable): owner varchar({varchar_len}), docstatus smallint not null default '0', idx bigint not null default '0', - %s)""".format(varchar_len=frappe.db.VARCHAR_LEN) % (self.table_name, add_text)) + {additional_definitions} + )""" + ) self.create_indexes() frappe.db.commit() From d87915a12e654dc6312cdfb89b2b7835a33a6d87 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Tue, 22 Feb 2022 12:01:30 +0530 Subject: [PATCH 142/176] test: docfield with `{defaults}` --- frappe/core/doctype/doctype/test_doctype.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/frappe/core/doctype/doctype/test_doctype.py b/frappe/core/doctype/doctype/test_doctype.py index 50882f51bd..9b4f733e7d 100644 --- a/frappe/core/doctype/doctype/test_doctype.py +++ b/frappe/core/doctype/doctype/test_doctype.py @@ -498,6 +498,13 @@ class TestDocType(unittest.TestCase): self.assertEqual(doc.is_virtual, 1) self.assertFalse(frappe.db.table_exists('Test Virtual Doctype')) + def test_default_fieldname(self): + fields = [{"label": "title", "fieldname": "title", "fieldtype": "Data", "default": "{some_fieldname}"}] + dt = new_doctype("DT with default field", fields=fields) + dt.insert() + + dt.delete() + def new_doctype(name, unique=0, depends_on='', fields=None): doc = frappe.get_doc({ "doctype": "DocType", From f1f6b21cf1e14328cc72be4029aba4f0086a731c Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 22 Feb 2022 12:08:27 +0530 Subject: [PATCH 143/176] fix(minor): styles for editable checks and links --- frappe/public/scss/desk/frappe_datatable.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/scss/desk/frappe_datatable.scss b/frappe/public/scss/desk/frappe_datatable.scss index fb7d795ced..cfec31b72e 100644 --- a/frappe/public/scss/desk/frappe_datatable.scss +++ b/frappe/public/scss/desk/frappe_datatable.scss @@ -58,7 +58,7 @@ } .link-btn { - top: 6px; + top: 0px; } select { @@ -77,7 +77,7 @@ padding: 0; border: var(--dt-focus-border-width) solid #9bccf8; - input { + input[type="text"] { font-size: inherit; height: 27px; From 15c66f69001dbdca249808fdc17db1c8feb59c90 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 22 Feb 2022 12:23:32 +0530 Subject: [PATCH 144/176] fix(style): fix style for inline button in grid --- frappe/public/scss/common/grid.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/scss/common/grid.scss b/frappe/public/scss/common/grid.scss index 1903413fbb..bfce93dbcc 100644 --- a/frappe/public/scss/common/grid.scss +++ b/frappe/public/scss/common/grid.scss @@ -192,7 +192,7 @@ margin-left: var(--margin-xs); button { - height: 27px; + height: 24px; } } From 75b6ee398c4f3e19934d2b05dbe6bc4e94f531f8 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Tue, 22 Feb 2022 12:44:30 +0530 Subject: [PATCH 145/176] fix: `AttributeError` when initialising `FormMeta` --- frappe/desk/form/meta.py | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/frappe/desk/form/meta.py b/frappe/desk/form/meta.py index b91dd3d481..fa6a1f313b 100644 --- a/frappe/desk/form/meta.py +++ b/frappe/desk/form/meta.py @@ -12,6 +12,15 @@ from frappe.translate import extract_messages_from_code, make_dict_from_messages from frappe.utils import get_html_format +ASSET_KEYS = ( + "__js", "__css", "__list_js", "__calendar_js", "__map_js", + "__linked_with", "__messages", "__print_formats", "__workflow_docs", + "__form_grid_templates", "__listview_template", "__tree_js", + "__dashboard", "__kanban_column_fields", '__templates', + '__custom_js', '__custom_list_js' +) + + def get_meta(doctype, cached=True): # don't cache for developer mode as js files, templates may be edited if cached and not frappe.conf.developer_mode: @@ -34,6 +43,12 @@ class FormMeta(Meta): super(FormMeta, self).__init__(doctype) self.load_assets() + def set(self, key, value, *args, **kwargs): + if key in ASSET_KEYS: + self.__dict__[key] = value + else: + super(FormMeta, self).set(key, value, *args, **kwargs) + def load_assets(self): if self.get('__assets_loaded', False): return @@ -55,11 +70,7 @@ class FormMeta(Meta): def as_dict(self, no_nulls=False): d = super(FormMeta, self).as_dict(no_nulls=no_nulls) - for k in ("__js", "__css", "__list_js", "__calendar_js", "__map_js", - "__linked_with", "__messages", "__print_formats", "__workflow_docs", - "__form_grid_templates", "__listview_template", "__tree_js", - "__dashboard", "__kanban_column_fields", '__templates', - '__custom_js', '__custom_list_js'): + for k in ASSET_KEYS: d[k] = self.get(k) # d['fields'] = d.get('fields', []) @@ -172,7 +183,7 @@ class FormMeta(Meta): WHERE doc_type=%s AND docstatus<2 and disabled=0""", (self.name,), as_dict=1, update={"doctype":"Print Format"}) - self.set("__print_formats", print_formats, as_value=True) + self.set("__print_formats", print_formats) def load_workflows(self): # get active workflow @@ -186,7 +197,7 @@ class FormMeta(Meta): for d in workflow.get("states"): workflow_docs.append(frappe.get_doc("Workflow State", d.state)) - self.set("__workflow_docs", workflow_docs, as_value=True) + self.set("__workflow_docs", workflow_docs) def load_templates(self): @@ -208,7 +219,7 @@ class FormMeta(Meta): for content in self.get("__form_grid_templates").values(): messages = extract_messages_from_code(content) messages = make_dict_from_messages(messages) - self.get("__messages").update(messages, as_value=True) + self.get("__messages").update(messages) def load_dashboard(self): self.set('__dashboard', self.get_dashboard_data()) @@ -224,7 +235,7 @@ class FormMeta(Meta): fields = [x['field_name'] for x in values] fields = list(set(fields)) - self.set("__kanban_column_fields", fields, as_value=True) + self.set("__kanban_column_fields", fields) except frappe.PermissionError: # no access to kanban board pass From 1e48d058b7868387fbfd25b39e43620e0862a780 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 22 Feb 2022 12:51:11 +0530 Subject: [PATCH 146/176] fix(style): add wait for test --- cypress/integration/list_view.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/integration/list_view.js b/cypress/integration/list_view.js index b7a96db4bc..3e0d1c9d50 100644 --- a/cypress/integration/list_view.js +++ b/cypress/integration/list_view.js @@ -12,7 +12,7 @@ context('List View', () => { cy.get('.list-row-container .list-row-checkbox').click({ multiple: true, force: true }); cy.get('.actions-btn-group button').contains('Actions').should('be.visible'); cy.intercept('/api/method/frappe.desk.reportview.get').as('list-refresh'); - cy.wait(300); // wait before you hit another refresh + cy.wait(3000); // wait before you hit another refresh cy.get('button[data-original-title="Refresh"]').click(); cy.wait('@list-refresh'); cy.get('.list-row-container .list-row-checkbox:checked').should('be.visible'); From 32ca5bf52b1e165737e23a11bfaef17f6946e938 Mon Sep 17 00:00:00 2001 From: lapardnemihk1099 Date: Tue, 22 Feb 2022 15:32:38 +0530 Subject: [PATCH 147/176] fix: formatting and declaration --- frappe/public/js/frappe/form/controls/date.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/form/controls/date.js b/frappe/public/js/frappe/form/controls/date.js index fa9dc1c99e..48f4f3b5ee 100644 --- a/frappe/public/js/frappe/form/controls/date.js +++ b/frappe/public/js/frappe/form/controls/date.js @@ -158,10 +158,10 @@ frappe.ui.form.ControlDate = class ControlDate extends frappe.ui.form.ControlDat return value; } get_df_options() { - if(!this.df.options) return {}; - - let options = {}; let df_options = this.df.options; + if (!df_options) return {}; + + let options = {}; if (typeof df_options === 'string') { try { options = JSON.parse(df_options); From eaf8327e0daaaf7a38188ee632c14c4547ca0ba6 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 22 Feb 2022 18:43:16 +0530 Subject: [PATCH 148/176] fix: Use correct path of built assets - Get path from bundled_assets --- frappe/translate.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/translate.py b/frappe/translate.py index c883e63de3..0a8c6aeaad 100644 --- a/frappe/translate.py +++ b/frappe/translate.py @@ -576,13 +576,15 @@ def get_server_messages(app): def get_messages_from_include_files(app_name=None): """Returns messages from js files included at time of boot like desk.min.js for desk and web""" + from frappe.utils.jinja_globals import bundled_asset messages = [] app_include_js = frappe.get_hooks("app_include_js", app_name=app_name) or [] web_include_js = frappe.get_hooks("web_include_js", app_name=app_name) or [] include_js = app_include_js + web_include_js for js_path in include_js: - relative_path = os.path.join(frappe.local.sites_path, js_path.lstrip('/')) + file_path = bundled_asset(js_path) + relative_path = os.path.join(frappe.local.sites_path, file_path.lstrip('/')) messages_from_file = get_messages_from_file(relative_path) messages.extend(messages_from_file) From a8da557b032d660fce0be41ffde808e6ef8eaf9b Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 22 Feb 2022 22:48:50 +0530 Subject: [PATCH 149/176] fix(minor): test: blur to set value --- cypress/integration/report_view.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cypress/integration/report_view.js b/cypress/integration/report_view.js index 4bc5784a53..884ebdc260 100644 --- a/cypress/integration/report_view.js +++ b/cypress/integration/report_view.js @@ -29,6 +29,7 @@ context('Report View', () => { // select the cell cell.dblclick(); cell.get('.dt-cell__edit--col-4').findByRole('checkbox').check({ force: true }); + cy.get('.frappe-list').click(); // click outside cy.wait('@value-update'); @@ -70,4 +71,4 @@ context('Report View', () => { cy.get('.list-paging-area .btn-more').click(); cy.get('.list-paging-area .list-count').should('contain.text', '1000 of'); }); -}); \ No newline at end of file +}); From 2c1ef84a0bff6825c7f7fc3f8b9057d295ce432c Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 22 Feb 2022 23:10:47 +0530 Subject: [PATCH 150/176] fix(minor): test: blur to set value --- cypress/integration/report_view.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/integration/report_view.js b/cypress/integration/report_view.js index 884ebdc260..6e3a28bbfc 100644 --- a/cypress/integration/report_view.js +++ b/cypress/integration/report_view.js @@ -29,7 +29,7 @@ context('Report View', () => { // select the cell cell.dblclick(); cell.get('.dt-cell__edit--col-4').findByRole('checkbox').check({ force: true }); - cy.get('.frappe-list').click(); // click outside + cy.get('.dt-row-0 > .dt-cell--col-3').click(); // click outside cy.wait('@value-update'); From 466f946da51cd5578dd86a300545e22be92b741c Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 23 Feb 2022 08:51:13 +0530 Subject: [PATCH 151/176] fix: Color picker selected color style --- frappe/public/scss/common/color_picker.scss | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/frappe/public/scss/common/color_picker.scss b/frappe/public/scss/common/color_picker.scss index 84755beb18..2e53150a41 100644 --- a/frappe/public/scss/common/color_picker.scss +++ b/frappe/public/scss/common/color_picker.scss @@ -94,7 +94,10 @@ .frappe-control[data-fieldtype='Color'] { input { - padding-left: 40px; + padding-left: 38px; + } + .control-input { + position: relative; } .selected-color { cursor: pointer; @@ -103,7 +106,7 @@ border-radius: 5px; background-color: red; position: absolute; - top: calc(50% + 1px); + top: 5px; left: 8px; content: ' '; &.no-value { @@ -113,10 +116,9 @@ } .like-disabled-input { .color-value { - padding-left: 25px; + padding-left: 26px; } .selected-color { - top: 20%; cursor: default; } } From 522fb1d6d11799c0c089f66d605883704f8f2d42 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 23 Feb 2022 10:19:00 +0530 Subject: [PATCH 152/176] fix(translation): Remove duplicate entry --- frappe/translations/de.csv | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/translations/de.csv b/frappe/translations/de.csv index 25a33370dc..9a60c42854 100644 --- a/frappe/translations/de.csv +++ b/frappe/translations/de.csv @@ -3732,7 +3732,6 @@ Dr,Soll, Due Date,Fälligkeitsdatum, Duplicate,Duplizieren, Edit Profile,Profil bearbeiten, -Email,Email, End Time,Endzeit, Enter Value,Wert eingeben, Entity Type,Entitätstyp, @@ -4184,7 +4183,7 @@ Phone Number,Telefonnummer, Linked Documents,Verknüpfte Dokumente, Account SID,Konto-SID, Steps,Schritte, -email,Email, +email,E-Mail, Component,Komponente, Subtitle,Untertitel, Global Defaults,Allgemeine Voreinstellungen, From 47893c549362942f1fe2af19b180eb4782e3cca4 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Wed, 23 Feb 2022 12:18:00 +0530 Subject: [PATCH 153/176] fix(ux): instructions/warning for doctype edits --- frappe/core/doctype/doctype/doctype.js | 7 +++++++ frappe/public/js/frappe/form/layout.js | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/frappe/core/doctype/doctype/doctype.js b/frappe/core/doctype/doctype/doctype.js index b907ebc0bc..f250a6a109 100644 --- a/frappe/core/doctype/doctype/doctype.js +++ b/frappe/core/doctype/doctype/doctype.js @@ -33,9 +33,16 @@ frappe.ui.form.on('DocType', { } } + const customize_form_link = "Customize Form"; if(!frappe.boot.developer_mode && !frm.doc.custom) { // make the document read-only frm.set_read_only(); + frm.dashboard.add_comment(__("DocTypes can not be modified, please use {0} instead", [customize_form_link]), "blue", true); + } else if (frappe.boot.developer_mode) { + let msg = __("This site is running in developer mode. Any change made here will be updated in code."); + msg += "
"; + msg += __("If you just want to customize for your site, use {0} instead.", [customize_form_link]); + frm.dashboard.add_comment(msg, "yellow"); } if(frm.is_new()) { diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js index 8c0f8953c5..578956f0ca 100644 --- a/frappe/public/js/frappe/form/layout.js +++ b/frappe/public/js/frappe/form/layout.js @@ -98,7 +98,7 @@ frappe.ui.form.Layout = class Layout { // remove previous color this.message.removeClass(this.message_color); } - this.message_color = (color && ['yellow', 'blue'].includes(color)) ? color : 'blue'; + this.message_color = (color && ['yellow', 'blue', 'red'].includes(color)) ? color : 'blue'; if (html) { if (html.substr(0, 1)!=='<') { // wrap in a block From bedf60280febe7f11e5630574b220b189f5ffb1c Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Wed, 23 Feb 2022 13:21:21 +0530 Subject: [PATCH 154/176] fix(translation): Add all possible views as comment (#16097) --- frappe/public/js/frappe/list/base_list.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js index b7cb5a05df..75063cc53f 100644 --- a/frappe/public/js/frappe/list/base_list.js +++ b/frappe/public/js/frappe/list/base_list.js @@ -204,6 +204,11 @@ frappe.views.BaseList = class BaseList { }; if (frappe.boot.desk_settings.view_switcher) { + /* @preserve + for translation, don't remove + __("List View") __("Report View") __("Dashboard View") __("Gantt View"), + __("Kanban View") __("Calendar View") __("Image View") __("Inbox View"), + __("Tree View") __("Map View") */ this.views_menu = this.page.add_custom_button_group(__('{0} View', [this.view_name]), icon_map[this.view_name] || 'list'); this.views_list = new frappe.views.ListViewSelect({ From f4518e2cf9d8bdb952dd82160ff0fb8cf9eab792 Mon Sep 17 00:00:00 2001 From: HarryPaulo Date: Wed, 23 Feb 2022 05:19:40 -0300 Subject: [PATCH 155/176] fix(print): Added properties page-width, page-height (#16045) --- frappe/utils/pdf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/utils/pdf.py b/frappe/utils/pdf.py index 9a7c0889b5..b8e684869e 100644 --- a/frappe/utils/pdf.py +++ b/frappe/utils/pdf.py @@ -155,7 +155,7 @@ def read_options_from_html(html): toggle_visible_pdf(soup) # use regex instead of soup-parser - for attr in ("margin-top", "margin-bottom", "margin-left", "margin-right", "page-size", "header-spacing", "orientation"): + for attr in ("margin-top", "margin-bottom", "margin-left", "margin-right", "page-size", "header-spacing", "orientation", "page-width", "page-height"): try: pattern = re.compile(r"(\.print-format)([\S|\s][^}]*?)(" + str(attr) + r":)(.+)(mm;)") match = pattern.findall(html) From 2c2d8b8e084c3be88c81404ba4b92dbb2bad005c Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Tue, 22 Feb 2022 20:50:15 +0530 Subject: [PATCH 156/176] fix: explicitly ignore duplicates --- frappe/desk/page/setup_wizard/setup_wizard.py | 2 +- frappe/desk/utils.py | 2 +- frappe/test_runner.py | 2 +- frappe/utils/install.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/desk/page/setup_wizard/setup_wizard.py b/frappe/desk/page/setup_wizard/setup_wizard.py index 0c32e886f4..74101a6e1f 100755 --- a/frappe/desk/page/setup_wizard/setup_wizard.py +++ b/frappe/desk/page/setup_wizard/setup_wizard.py @@ -392,7 +392,7 @@ def make_records(records, debug=False): doc.flags.ignore_mandatory = True try: - doc.insert(ignore_permissions=True) + doc.insert(ignore_permissions=True, ignore_if_duplicate=True) frappe.db.commit() except frappe.DuplicateEntryError as e: diff --git a/frappe/desk/utils.py b/frappe/desk/utils.py index 5908277386..3328d47318 100644 --- a/frappe/desk/utils.py +++ b/frappe/desk/utils.py @@ -20,4 +20,4 @@ def validate_route_conflict(doctype, name): raise frappe.NameError def slug(name): - return name.lower().replace(' ', '-') \ No newline at end of file + return name.lower().replace(' ', '-') diff --git a/frappe/test_runner.py b/frappe/test_runner.py index 20759331c3..932e4c4346 100644 --- a/frappe/test_runner.py +++ b/frappe/test_runner.py @@ -392,7 +392,7 @@ def make_test_objects(doctype, test_records=None, verbose=None, reset=False): try: d.run_method("before_test_insert") - d.insert() + d.insert(ignore_if_duplicate=True) if docstatus == 1: d.submit() diff --git a/frappe/utils/install.py b/frappe/utils/install.py index cf76c9fffc..a5fd39994f 100644 --- a/frappe/utils/install.py +++ b/frappe/utils/install.py @@ -90,7 +90,7 @@ def install_basic_docs(): for d in install_docs: try: - frappe.get_doc(d).insert() + frappe.get_doc(d).insert(ignore_if_duplicate=True) except frappe.NameError: pass From 01dc744aed5174c96976a0dc999b3bf98e9809b9 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Wed, 23 Feb 2022 14:10:52 +0530 Subject: [PATCH 157/176] fix: only check migration_hash on doctype other documents dont have this field, hash based migration is only for doctypes. --- frappe/modules/import_file.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/modules/import_file.py b/frappe/modules/import_file.py index 1219fbb045..92e7523e6d 100644 --- a/frappe/modules/import_file.py +++ b/frappe/modules/import_file.py @@ -115,10 +115,11 @@ def import_file_by_path(path: str,force: bool = False,data_import: bool = False, if not force or db_modified_timestamp: try: - stored_hash = frappe.db.get_value(doc["doctype"], doc["name"], "migration_hash") + stored_hash = None + if doc["doctype"] == "DocType": + stored_hash = frappe.db.get_value(doc["doctype"], doc["name"], "migration_hash") except Exception: frappe.flags.dt += [doc["doctype"]] - stored_hash = None # if hash exists and is equal no need to update if stored_hash and stored_hash == calculated_hash: From 208fc5f0d5b842addf073530dd4d7a3073baa281 Mon Sep 17 00:00:00 2001 From: Wolfram Schmidt Date: Wed, 23 Feb 2022 09:59:46 +0100 Subject: [PATCH 158/176] fix(translation): Field translation (#16010) --- frappe/translations/de.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/translations/de.csv b/frappe/translations/de.csv index 9a60c42854..afd1b101d6 100644 --- a/frappe/translations/de.csv +++ b/frappe/translations/de.csv @@ -1530,7 +1530,7 @@ Main Section,Hauptbereich, Make use of longer keyboard patterns,Nutzen Sie mehr Tastaturmuster, Manage Third Party Apps,Verwalten von Apps von Drittanbietern, Mandatory Information missing:,Pflichtangaben fehlen:, -Mandatory field: set role for,Pflichtfeld: set Rolle für, +Mandatory field: set role for,Pflichtfeld: Rolle anwenden auf, Mandatory field: {0},Pflichtfeld: {0}, "Mandatory fields required in table {0}, Row {1}","Pflichtfelder in der Tabelle erforderlich {0}, Reihe {1}", Mandatory fields required in {0},Für {0} benötigte Pflichtfelder:, @@ -2268,7 +2268,7 @@ Set Permissions,Festlegen von Berechtigungen, Set Permissions on Document Types and Roles,Berechtigungen für Dokumenttypen und Rollen setzen, Set Property After Alert,Setzen Sie die Eigenschaft nach Alert, Set Quantity,Anzahl festlegen, -Set Role For,Set Rolle für, +Set Role For,Rolle anwenden auf, Set User Permissions,Nutzer-Berechtigungen setzen, Set Value,Wert festlegen, Set custom roles for page and report,Legen Sie benutzerdefinierte Rollen für Seite und Bericht, From 14ca1f0dce338b911cb964053c4c3d1d2558791d Mon Sep 17 00:00:00 2001 From: Lev Vereshchagin Date: Wed, 23 Feb 2022 12:47:50 +0300 Subject: [PATCH 159/176] fix(UI): Fix incorrect dark theme text color in user-wise grid column configuration (closes #14572) (cherry picked from commit 5280d60ea93b8690f684dddbad0bda32df3cec04) --- frappe/public/js/frappe/form/grid_row.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js index ec89d26213..cd8bde1f57 100644 --- a/frappe/public/js/frappe/form/grid_row.js +++ b/frappe/public/js/frappe/form/grid_row.js @@ -429,7 +429,7 @@ export default class GridRow {
+ data-fieldname='${docfield.fieldname}' style='background-color: var(--modal-bg); display: inline'>
From 1a348262034e5b5814c1ee7ab52eeea10fd3c9b4 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Mon, 7 Feb 2022 14:00:26 +0530 Subject: [PATCH 160/176] test: use `now` instead of `is_async` in tests --- frappe/model/delete_doc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py index 2cc99575d6..ef73a349cc 100644 --- a/frappe/model/delete_doc.py +++ b/frappe/model/delete_doc.py @@ -115,7 +115,7 @@ def delete_doc(doctype=None, name=None, force=0, ignore_doctypes=None, for_reloa # All the linked docs should be checked beforehand frappe.enqueue('frappe.model.delete_doc.delete_dynamic_links', doctype=doc.doctype, name=doc.name, - is_async=False if frappe.flags.in_test else True) + now=frappe.flags.in_test) # clear cache for Document doc.clear_cache() From 91da5f0363b8fc5f5e9775e8e7d49a98722de9c5 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 23 Feb 2022 17:19:43 +0530 Subject: [PATCH 161/176] refactor(rename_doc): update_document_title API * Remove redundant API arguments * Check for permission on specified document * Maintain backwards compatibility - test_update_document_title_api checks for this * Update desk client usage ;) --- frappe/model/rename_doc.py | 31 +++++++++++++++---------- frappe/public/js/frappe/form/toolbar.js | 6 ++--- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/frappe/model/rename_doc.py b/frappe/model/rename_doc.py index 88752103ae..3f5104540a 100644 --- a/frappe/model/rename_doc.py +++ b/frappe/model/rename_doc.py @@ -19,32 +19,39 @@ if TYPE_CHECKING: def update_document_title( doctype: str, docname: str, - title_field: Optional[str] = None, - old_title: Optional[str] = None, - new_title: Optional[str] = None, - new_name: Optional[str] = None, + title: Optional[str] = None, + name: Optional[str] = None, merge: bool = False, + **kwargs ) -> str: """ Update title from header in form view """ + + # to maintain backwards API compatibility + updated_title = kwargs.get("new_title") or title + updated_name = kwargs.get("new_name") or name + # TODO: omit this after runtime type checking (ref: https://github.com/frappe/frappe/pull/14927) - for obj in [docname, new_name, new_title, old_title]: + for obj in [docname, updated_title, updated_name]: if not isinstance(obj, (str, type(None))): - frappe.throw(f"{obj} must be of type str or None") + frappe.throw(f"{obj=} must be of type str or None") + + doc = frappe.get_doc(doctype, docname) + doc.has_permission(permtype="write") - frappe.has_permission(doctype, ptype="write", throw=True) + title_field = doc.meta.get_title_field() - title_updated = old_title and new_title and (old_title != new_title) - name_updated = new_name and docname and (docname != new_name) + title_updated = (title_field != "name") and (updated_title != doc.get(title_field)) + name_updated = updated_name != doc.name if name_updated: - docname = rename_doc(doctype=doctype, old=docname, new=new_name, merge=merge) + docname = rename_doc(doctype=doctype, old=docname, new=updated_name, merge=merge) if title_updated: try: - frappe.db.set_value(doctype, docname, title_field, new_title) - frappe.msgprint(_('Saved'), alert=True, indicator='green') + frappe.db.set_value(doctype, docname, title_field, updated_title) + frappe.msgprint(_("Saved"), alert=True, indicator="green") except Exception as e: if frappe.db.is_duplicate_entry(e): frappe.throw( diff --git a/frappe/public/js/frappe/form/toolbar.js b/frappe/public/js/frappe/form/toolbar.js index ffcfc349ef..500ec88068 100644 --- a/frappe/public/js/frappe/form/toolbar.js +++ b/frappe/public/js/frappe/form/toolbar.js @@ -101,10 +101,8 @@ frappe.ui.form.Toolbar = class Toolbar { return frappe.xcall("frappe.model.rename_doc.update_document_title", { doctype, docname, - new_name, - title_field, - old_title: this.frm.doc[title_field], - new_title, + name: new_name, + title: new_title, merge }).then(new_docname => { if (new_name != docname) { From c4c3d26b3dec6786b79c8661f74e356a91f3744d Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 23 Feb 2022 18:22:42 +0530 Subject: [PATCH 162/176] fix!: Disallow posiitonal args in update_document_title --- frappe/model/rename_doc.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/model/rename_doc.py b/frappe/model/rename_doc.py index 3f5104540a..c9b4cfdcff 100644 --- a/frappe/model/rename_doc.py +++ b/frappe/model/rename_doc.py @@ -17,6 +17,7 @@ if TYPE_CHECKING: @frappe.whitelist() def update_document_title( + *, doctype: str, docname: str, title: Optional[str] = None, From da260ab778a1d0e3bea30a513f913760885d2c9b Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 23 Feb 2022 18:23:24 +0530 Subject: [PATCH 163/176] test: Use 'Module Def' to test update_document_title --- frappe/tests/test_rename_doc.py | 42 +++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/frappe/tests/test_rename_doc.py b/frappe/tests/test_rename_doc.py index e86bd9cde2..0c1cba31fb 100644 --- a/frappe/tests/test_rename_doc.py +++ b/frappe/tests/test_rename_doc.py @@ -12,7 +12,7 @@ from unittest.mock import patch import frappe from frappe.exceptions import DoesNotExistError, ValidationError from frappe.model.base_document import get_controller -from frappe.model.rename_doc import bulk_rename, get_fetch_fields, update_linked_doctypes +from frappe.model.rename_doc import bulk_rename, get_fetch_fields, update_document_title, update_linked_doctypes from frappe.modules.utils import get_doc_path from frappe.utils import add_to_date, now @@ -186,30 +186,36 @@ class TestRenameDoc(unittest.TestCase): ) def test_update_document_title_api(self): - from frappe.model.rename_doc import update_document_title - allow_rename_prop = frappe.db.get_value("DocType", self.test_doctype, "allow_rename") - frappe.clear_cache() - if not frappe.get_meta(self.test_doctype).allow_rename: - frappe.db.set_value("DocType", self.test_doctype, "allow_rename", 1, update_modified=False) - - dt = self.test_doctype - dn = self.available_documents[0] + test_doctype = "Module Def" + test_doc = frappe.get_doc({ + "doctype": test_doctype, + "module_name": f"Test-test_update_document_title_api-{frappe.generate_hash()}", + "custom": True, + }) + test_doc.insert(ignore_mandatory=True) + + dt = test_doc.doctype + dn = test_doc.name new_name = f"{dn}-new" # pass invalid types to API with self.assertRaises(ValidationError): - update_document_title(dt, dn, {}, {"hack": "this"}) + update_document_title(doctype=dt, docname=dn, title={}, name={"hack": "this"}) + + doc_before = frappe.get_doc(test_doctype, dn) + return_value = update_document_title(doctype=dt, docname=dn, new_name=new_name) + doc_after = frappe.get_doc(test_doctype, return_value) - doc_before = frappe.get_doc(self.test_doctype, dn) - update_document_title(dt, dn, new_name=new_name) - doc_after = frappe.get_doc(self.test_doctype, new_name) + doc_before_dict = doc_before.as_dict(no_nulls=True, no_default_fields=True) + doc_after_dict = doc_after.as_dict(no_nulls=True, no_default_fields=True) + doc_before_dict.pop("module_name") + doc_after_dict.pop("module_name") - self.assertEqual(doc_before.description, doc_after.description) - self.assertEqual(doc_before.creation, doc_after.creation) - self.assertEqual(doc_before.owner, doc_after.owner) + self.assertEqual(new_name, return_value) + self.assertDictEqual(doc_before_dict, doc_after_dict) + self.assertEqual(doc_after.module_name, return_value) - self.available_documents[0] = new_name - frappe.db.set_value("DocType", self.test_doctype, "allow_rename", allow_rename_prop, update_modified=False) + test_doc.delete() def test_bulk_rename(self): input_data = [[x, f"{x}-new"] for x in self.available_documents] From 7da85353c7940a8149626ad9527e6b794f5fca34 Mon Sep 17 00:00:00 2001 From: Benedict Allerberger Date: Wed, 23 Feb 2022 15:22:57 +0100 Subject: [PATCH 164/176] fix: format of ldap_settings.py --- frappe/integrations/doctype/ldap_settings/ldap_settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/integrations/doctype/ldap_settings/ldap_settings.py b/frappe/integrations/doctype/ldap_settings/ldap_settings.py index f16d126440..e04ab2a68b 100644 --- a/frappe/integrations/doctype/ldap_settings/ldap_settings.py +++ b/frappe/integrations/doctype/ldap_settings/ldap_settings.py @@ -50,8 +50,8 @@ class LDAPSettings(Document): title=_("Misconfigured")) if self.ldap_custom_group_search and "{0}" not in self.ldap_custom_group_search: - frappe.throw(_("Custom Group Search if filled needs to contain the user placeholder {0}, eg uid={0},ou=users,dc=example,dc=com"), - title=_("Misconfigured")) + frappe.throw(_("Custom Group Search if filled needs to contain the user placeholder {0}, eg uid={0},ou=users,dc=example,dc=com"), + title=_("Misconfigured")) else: frappe.throw(_("LDAP Search String must be enclosed in '()' and needs to contian the user placeholder {0}, eg sAMAccountName={0}")) From fd57a6f4a3732190ca0e1fb008f76788c23065ac Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 23 Feb 2022 19:23:31 +0530 Subject: [PATCH 165/176] test: Skip test_image_parsing if no mail found * Trimmed trailing whitespaces -_- ref: Flaky test - https://github.com/frappe/frappe/runs/5303629095?check_suite_focus=true --- frappe/tests/test_email.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/frappe/tests/test_email.py b/frappe/tests/test_email.py index ad9f8fdd11..51a0786c2f 100644 --- a/frappe/tests/test_email.py +++ b/frappe/tests/test_email.py @@ -1,9 +1,9 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors +# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and Contributors # License: MIT. See LICENSE import unittest, frappe, re, email -from frappe.email.doctype.email_account.test_email_account import TestEmailAccount +from frappe.email.doctype.email_account.test_email_account import TestEmailAccount test_dependencies = ['Email Account'] @@ -176,7 +176,6 @@ class TestEmail(unittest.TestCase): with open(frappe.get_app_path('frappe', 'tests', 'data', 'email_with_image.txt'), 'r') as raw: messages = { - # append_to = ToDo '"INBOX"': { 'latest_messages': [ raw.read() @@ -185,17 +184,20 @@ class TestEmail(unittest.TestCase): 2: 'UNSEEN' }, 'uid_list': [2] - } + } } email_account = frappe.get_doc("Email Account", "_Test Email Account 1") changed_flag = False - if not email_account.enable_incoming: + if not email_account.enable_incoming: email_account.enable_incoming = True changed_flag = True mails = TestEmailAccount.mocked_get_inbound_mails(email_account, messages) - # mails = email_account.get_inbound_mails(test_mails=[raw.read()]) + # TODO: fix this flaky test! - 'IndexError: list index out of range' for `.process()` line + if not mails: + raise self.skipTest("No inbound mails found / Email Account wasn't patched properly") + communication = mails[0].process() self.assertTrue(re.search(''']*src=["']/private/files/rtco1.png[^>]*>''', communication.content)) From ea7a53568f10e5adc459bf21150fe962189a2d97 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 23 Feb 2022 18:46:50 +0530 Subject: [PATCH 166/176] test(TestFrappeClient): Set Admin password else skip ref: https://github.com/frappe/frappe/runs/5303629148?check_suite_focus=true --- frappe/tests/test_frappe_client.py | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/frappe/tests/test_frappe_client.py b/frappe/tests/test_frappe_client.py index 2d815d0731..e4588a16f1 100644 --- a/frappe/tests/test_frappe_client.py +++ b/frappe/tests/test_frappe_client.py @@ -1,17 +1,30 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors +# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and Contributors # License: MIT. See LICENSE -import unittest, frappe +import base64 +import unittest + +import requests + +import frappe from frappe.core.doctype.user.user import generate_keys -from frappe.frappeclient import FrappeClient, FrappeException +from frappe.frappeclient import AuthError, FrappeClient, FrappeException from frappe.utils.data import get_url -import requests -import base64 class TestFrappeClient(unittest.TestCase): PASSWORD = frappe.conf.admin_password or "admin" + @classmethod + def setUpClass(cls) -> None: + site_url = get_url() + try: + FrappeClient(site_url, "Administrator", cls.PASSWORD, verify=False) + except AuthError: + raise unittest.SkipTest(f"AuthError raised for {site_url} [usr=Administrator, pwd={cls.PASSWORD}]") + + return super().setUpClass() + def test_insert_many(self): server = FrappeClient(get_url(), "Administrator", self.PASSWORD, verify=False) frappe.db.delete("Note", {"title": ("in", ('Sing','a','song','of','sixpence'))}) From fe57111556679d3cf2d0b95742680de1e3dfa40e Mon Sep 17 00:00:00 2001 From: Summayya Date: Thu, 24 Feb 2022 01:26:14 +0530 Subject: [PATCH 167/176] fix: remove padding for mobile view --- frappe/public/scss/website/web_form.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frappe/public/scss/website/web_form.scss b/frappe/public/scss/website/web_form.scss index 8f55bf8104..08c1febbe6 100644 --- a/frappe/public/scss/website/web_form.scss +++ b/frappe/public/scss/website/web_form.scss @@ -50,6 +50,10 @@ &:last-child { padding-right: 0; } + + @include media-breakpoint-down(sm) { + padding: 0; + } } } From 76df55ab25475e417f4028a478cb5a19d5cb7ce7 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Thu, 24 Feb 2022 11:28:14 +0530 Subject: [PATCH 168/176] test: fix flaky email domain test --- frappe/email/doctype/email_domain/test_email_domain.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/frappe/email/doctype/email_domain/test_email_domain.py b/frappe/email/doctype/email_domain/test_email_domain.py index 1064c7684a..7522dd5282 100644 --- a/frappe/email/doctype/email_domain/test_email_domain.py +++ b/frappe/email/doctype/email_domain/test_email_domain.py @@ -20,11 +20,13 @@ class TestDomain(unittest.TestCase): mail_domain = frappe.get_doc("Email Domain", "test.com") mail_account = frappe.get_doc("Email Account", "Test") - # Initially, incoming_port is different in domain and account - self.assertNotEqual(mail_account.incoming_port, mail_domain.incoming_port) + # Ensure a different port + mail_account.incoming_port = int(mail_domain.incoming_port) + 5 + mail_account.save() # Trigger update of accounts using this domain mail_domain.on_update() - mail_account = frappe.get_doc("Email Account", "Test") + + mail_account.reload() # After update, incoming_port in account should match the domain self.assertEqual(mail_account.incoming_port, mail_domain.incoming_port) From 6aec566325c7ff5566a05297a4420766e015838c Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 24 Feb 2022 11:33:29 +0530 Subject: [PATCH 169/176] test(test_api): Use login manager instead of request login Also, move setUp for method into "correct" TestCase class --- frappe/tests/test_api.py | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/frappe/tests/test_api.py b/frappe/tests/test_api.py index 93875f7784..d7d0de6a0d 100644 --- a/frappe/tests/test_api.py +++ b/frappe/tests/test_api.py @@ -72,11 +72,14 @@ class FrappeAPITestCase(unittest.TestCase): @property def sid(self) -> str: if not getattr(self, "_sid", None): - r = self.post("/api/method/login", { - "usr": "Administrator", - "pwd": frappe.conf.admin_password or "admin", - }) - self._sid = r.headers[2][1].split(";")[0].lstrip("sid=") + from frappe.auth import CookieManager, LoginManager + from frappe.utils import set_request + + set_request(path="/") + frappe.local.cookie_manager = CookieManager() + frappe.local.login_manager = LoginManager() + frappe.local.login_manager.login_as('Administrator') + self._sid = frappe.session.sid return self._sid @@ -112,16 +115,6 @@ class TestResourceAPI(FrappeAPITestCase): frappe.delete_doc_if_exists(cls.DOCTYPE, name) frappe.db.commit() - def setUp(self): - # commit to ensure consistency in session (postgres CI randomly fails) - if frappe.conf.db_type == "postgres": - frappe.db.commit() - - if self._testMethodName == "test_auth_cycle": - from frappe.core.doctype.user.user import generate_keys - generate_keys("Administrator") - frappe.db.commit() - def test_unauthorized_call(self): # test 1: fetch documents without auth response = requests.get(f"{self.RESOURCE_URL}/{self.DOCTYPE}") @@ -226,6 +219,12 @@ class TestResourceAPI(FrappeAPITestCase): class TestMethodAPI(FrappeAPITestCase): METHOD_PATH = "/api/method" + def setUp(self): + if self._testMethodName == "test_auth_cycle": + from frappe.core.doctype.user.user import generate_keys + generate_keys("Administrator") + frappe.db.commit() + def test_version(self): # test 1: test for /api/method/version response = self.get(f"{self.METHOD_PATH}/version") From 0859a3060cb5209b8afd437ed0ceac6059fcd2d2 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 24 Feb 2022 11:35:00 +0530 Subject: [PATCH 170/176] chore: Remove comments, trailing whitespaces, etc --- frappe/commands/utils.py | 1 + frappe/core/doctype/user/test_user.py | 2 +- frappe/test_runner.py | 3 --- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py index 7246df8aa7..c0bb44efab 100644 --- a/frappe/commands/utils.py +++ b/frappe/commands/utils.py @@ -640,6 +640,7 @@ def run_tests(context, app=None, module=None, doctype=None, test=(), profile=Fal skip_test_records=False, skip_before_tests=False, failfast=False, case=None): with CodeCoverage(coverage, app): + import frappe import frappe.test_runner tests = test site = get_site(context) diff --git a/frappe/core/doctype/user/test_user.py b/frappe/core/doctype/user/test_user.py index 4676e9daa8..3e6e1ec7e2 100644 --- a/frappe/core/doctype/user/test_user.py +++ b/frappe/core/doctype/user/test_user.py @@ -356,7 +356,7 @@ class TestUser(unittest.TestCase): self.assertEqual(update_password(new_password, key=test_user.reset_password_key), "/") update_password(old_password, old_password=new_password) self.assertEqual( - json.loads(frappe.message_log[0]).get("message"), + json.loads(frappe.message_log[0]).get("message"), "Password reset instructions have been sent to your email" ) diff --git a/frappe/test_runner.py b/frappe/test_runner.py index 05f1ce1cd7..9cdd33c92f 100644 --- a/frappe/test_runner.py +++ b/frappe/test_runner.py @@ -55,9 +55,6 @@ def main(app=None, module=None, doctype=None, verbose=False, tests=(), if not frappe.db: frappe.connect() - # if not frappe.conf.get("db_name").startswith("test_"): - # raise Exception, 'db_name must start with "test_"' - # workaround! since there is no separate test db frappe.clear_cache() scheduler_disabled_by_user = frappe.utils.scheduler.is_scheduler_disabled() From 0d33ca1c608e5fa58014b2769056db9b06d0ccc9 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 24 Feb 2022 13:11:42 +0530 Subject: [PATCH 171/176] fix: Use `sort_by` field instead of non-existent `sort_field` To get proper form navigation --- frappe/public/js/frappe/form/form.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index a11ddce520..56e909dd0c 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -1102,13 +1102,13 @@ frappe.ui.form.Form = class FrappeForm { let list_view = frappe.get_list_view(this.doctype); if (list_view) { filters = list_view.get_filters_for_args(); - sort_field = list_view.sort_field; + sort_field = list_view.sort_by; sort_order = list_view.sort_order; } else { let list_settings = frappe.get_user_settings(this.doctype)['List']; if (list_settings) { filters = list_settings.filters; - sort_field = list_settings.sort_field; + sort_field = list_settings.sort_by; sort_order = list_settings.sort_order; } } From 63e035923b5f737fc5cd155a48ddc393df291e3c Mon Sep 17 00:00:00 2001 From: gavin Date: Thu, 24 Feb 2022 13:34:57 +0530 Subject: [PATCH 172/176] chore: Simplify ldap_custom_group_search resolution --- frappe/integrations/doctype/ldap_settings/ldap_settings.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/frappe/integrations/doctype/ldap_settings/ldap_settings.py b/frappe/integrations/doctype/ldap_settings/ldap_settings.py index e04ab2a68b..cfd6e1e133 100644 --- a/frappe/integrations/doctype/ldap_settings/ldap_settings.py +++ b/frappe/integrations/doctype/ldap_settings/ldap_settings.py @@ -213,9 +213,7 @@ class LDAPSettings(Document): ldap_object_class = self.ldap_group_objectclass ldap_group_members_attribute = self.ldap_group_member_attribute - ldap_custom_group_search = "{0}" - if self.ldap_custom_group_search: - ldap_custom_group_search = self.ldap_custom_group_search + ldap_custom_group_search = self.ldap_custom_group_search or "{0}" user_search_str = ldap_custom_group_search.format(getattr(user, self.ldap_username_field).value) else: From 783a63f8a236f3d8030a5e272cfb0f0b0e372aab Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 24 Feb 2022 17:09:10 +0530 Subject: [PATCH 173/176] fix: Raise PermissionError if user doesnt have access to document --- frappe/model/rename_doc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/model/rename_doc.py b/frappe/model/rename_doc.py index ee2cbfb854..787f276b17 100644 --- a/frappe/model/rename_doc.py +++ b/frappe/model/rename_doc.py @@ -39,7 +39,7 @@ def update_document_title( frappe.throw(f"{obj=} must be of type str or None") doc = frappe.get_doc(doctype, docname) - doc.has_permission(permtype="write") + doc.check_permission(permtype="write") title_field = doc.meta.get_title_field() From 8b2591e2667e6c13d2d476df07ffbb3cdac383bb Mon Sep 17 00:00:00 2001 From: HENRY Florian Date: Thu, 24 Feb 2022 13:26:50 +0100 Subject: [PATCH 174/176] feat(minor): No Copy attribute for custom fields (#15915) Fix #13252 ![image](https://user-images.githubusercontent.com/1050053/153055276-28714781-b142-41e8-9218-d7b8f0f60b22.png) --- .../custom/doctype/customize_form/customize_form.py | 1 + .../doctype/customize_form/test_customize_form.py | 5 +++++ .../customize_form_field/customize_form_field.json | 11 +++++++++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/frappe/custom/doctype/customize_form/customize_form.py b/frappe/custom/doctype/customize_form/customize_form.py index 92a540447f..f1b6ab40ed 100644 --- a/frappe/custom/doctype/customize_form/customize_form.py +++ b/frappe/custom/doctype/customize_form/customize_form.py @@ -540,6 +540,7 @@ docfield_properties = { 'in_global_search': 'Check', 'in_preview': 'Check', 'bold': 'Check', + 'no_copy': 'Check', 'hidden': 'Check', 'collapsible': 'Check', 'collapsible_depends_on': 'Data', diff --git a/frappe/custom/doctype/customize_form/test_customize_form.py b/frappe/custom/doctype/customize_form/test_customize_form.py index d131f06127..2cae69ca21 100644 --- a/frappe/custom/doctype/customize_form/test_customize_form.py +++ b/frappe/custom/doctype/customize_form/test_customize_form.py @@ -97,13 +97,18 @@ class TestCustomizeForm(unittest.TestCase): custom_field = d.get("fields", {"fieldname": "test_custom_field"})[0] custom_field.reqd = 1 + custom_field.no_copy = 1 d.run_method("save_customization") self.assertEqual(frappe.db.get_value("Custom Field", "Event-test_custom_field", "reqd"), 1) + self.assertEqual(frappe.db.get_value("Custom Field", "Event-test_custom_field", "no_copy"), 1) custom_field = d.get("fields", {"is_custom_field": True})[0] custom_field.reqd = 0 + custom_field.no_copy = 0 d.run_method("save_customization") self.assertEqual(frappe.db.get_value("Custom Field", "Event-test_custom_field", "reqd"), 0) + self.assertEqual(frappe.db.get_value("Custom Field", "Event-test_custom_field", "no_copy"), 0) + def test_save_customization_new_field(self): d = self.get_customize_form("Event") 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 4351e76609..5906cd3bcf 100644 --- a/frappe/custom/doctype/customize_form_field/customize_form_field.json +++ b/frappe/custom/doctype/customize_form_field/customize_form_field.json @@ -20,6 +20,7 @@ "in_global_search", "in_preview", "bold", + "no_copy", "allow_in_quick_entry", "translatable", "column_break_7", @@ -437,13 +438,19 @@ "fieldname": "show_dashboard", "fieldtype": "Check", "label": "Show Dashboard" + }, + { + "default": "0", + "fieldname": "no_copy", + "fieldtype": "Check", + "label": "No Copy" } ], "idx": 1, "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2022-01-27 21:45:22.349776", + "modified": "2022-02-08 19:38:16.111199", "modified_by": "Administrator", "module": "Custom", "name": "Customize Form Field", @@ -453,4 +460,4 @@ "sort_field": "modified", "sort_order": "ASC", "states": [] -} \ No newline at end of file +} From dd1abf7f4e9af740ac793f1ccf08b6e8dcedaf47 Mon Sep 17 00:00:00 2001 From: Lev Vereshchagin Date: Wed, 23 Feb 2022 12:34:13 +0300 Subject: [PATCH 175/176] fix(UI): Flaky link preview popover creation (closes #15482) (cherry picked from commit 67e7dd44b5264ad8d3fad8ceb9e12cbe2bdd5d07) --- frappe/public/js/frappe/ui/link_preview.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/ui/link_preview.js b/frappe/public/js/frappe/ui/link_preview.js index 328cd23716..a6a2273161 100644 --- a/frappe/public/js/frappe/ui/link_preview.js +++ b/frappe/public/js/frappe/ui/link_preview.js @@ -73,7 +73,7 @@ frappe.ui.LinkPreview = class { } this.popover_timeout = setTimeout(() => { - if (this.popover) { + if (this.popover && this.popover.options) { let new_content = this.get_popover_html(preview_data); this.popover.options.content = new_content; } else { From cdc6bcadb1ea64b5d3b28ea66ab465e2bf242ca3 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Fri, 25 Feb 2022 09:58:59 +0530 Subject: [PATCH 176/176] fix(cli): Database agnostic options for root db credentials (#15973) * fix(bench): new-site params for root db credentials allow root credentials for postgresql use common cli option name for both database types * fix(bench): backward compatible db params Co-authored-by: gavin * fix(bench): use common db cred params use --db-root-username and --db-root-password * feat(bench): add --set-default to bench new-site * fix: do not set default root user * fix: indentation Co-authored-by: gavin --- frappe/commands/site.py | 58 ++++++++++++++-------------- frappe/database/postgres/setup_db.py | 4 +- frappe/installer.py | 15 ++++--- 3 files changed, 42 insertions(+), 35 deletions(-) diff --git a/frappe/commands/site.py b/frappe/commands/site.py index 1684f26d49..c5d2257d75 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -19,36 +19,38 @@ from frappe.exceptions import SiteNotSpecifiedError @click.option('--db-type', default='mariadb', type=click.Choice(['mariadb', 'postgres']), help='Optional "postgres" or "mariadb". Default is "mariadb"') @click.option('--db-host', help='Database Host') @click.option('--db-port', type=int, help='Database Port') -@click.option('--mariadb-root-username', default='root', help='Root username for MariaDB') -@click.option('--mariadb-root-password', help='Root password for MariaDB') +@click.option('--db-root-username', '--mariadb-root-username', help='Root username for MariaDB or PostgreSQL, Default is "root"') +@click.option('--db-root-password', '--mariadb-root-password', help='Root password for MariaDB or PostgreSQL') @click.option('--no-mariadb-socket', is_flag=True, default=False, help='Set MariaDB host to % and use TCP/IP Socket instead of using the UNIX Socket') @click.option('--admin-password', help='Administrator password for new site', default=None) @click.option('--verbose', is_flag=True, default=False, help='Verbose') @click.option('--force', help='Force restore if site/database already exists', is_flag=True, default=False) @click.option('--source_sql', help='Initiate database with a SQL file') @click.option('--install-app', multiple=True, help='Install app after installation') -def new_site(site, mariadb_root_username=None, mariadb_root_password=None, admin_password=None, - verbose=False, install_apps=None, source_sql=None, force=None, no_mariadb_socket=False, - install_app=None, db_name=None, db_password=None, db_type=None, db_host=None, db_port=None): +@click.option('--set-default', is_flag=True, default=False, help='Set the new site as default site') +def new_site(site, db_root_username=None, db_root_password=None, admin_password=None, + verbose=False, install_apps=None, source_sql=None, force=None, no_mariadb_socket=False, + install_app=None, db_name=None, db_password=None, db_type=None, db_host=None, db_port=None, + set_default=False): "Create a new site" from frappe.installer import _new_site frappe.init(site=site, new_site=True) - _new_site(db_name, site, mariadb_root_username=mariadb_root_username, - mariadb_root_password=mariadb_root_password, admin_password=admin_password, - verbose=verbose, install_apps=install_app, source_sql=source_sql, force=force, - no_mariadb_socket=no_mariadb_socket, db_password=db_password, db_type=db_type, db_host=db_host, - db_port=db_port, new_site=True) + _new_site(db_name, site, db_root_username=db_root_username, + db_root_password=db_root_password, admin_password=admin_password, + verbose=verbose, install_apps=install_app, source_sql=source_sql, force=force, + no_mariadb_socket=no_mariadb_socket, db_password=db_password, db_type=db_type, db_host=db_host, + db_port=db_port, new_site=True) - if len(frappe.utils.get_sites()) == 1: + if set_default: use(site) @click.command('restore') @click.argument('sql-file-path') -@click.option('--mariadb-root-username', default='root', help='Root username for MariaDB') -@click.option('--mariadb-root-password', help='Root password for MariaDB') +@click.option('--db-root-username', '--mariadb-root-username', help='Root username for MariaDB or PostgreSQL, Default is "root"') +@click.option('--db-root-password', '--mariadb-root-password', help='Root password for MariaDB or PostgreSQL') @click.option('--db-name', help='Database name for site in case it is a new one') @click.option('--admin-password', help='Administrator password for new site') @click.option('--install-app', multiple=True, help='Install app after installation') @@ -57,7 +59,7 @@ def new_site(site, mariadb_root_username=None, mariadb_root_password=None, admin @click.option('--force', is_flag=True, default=False, help='Ignore the validations and downgrade warnings. This action is not recommended') @click.option('--encryption-key', help='Backup encryption key') @pass_context -def restore(context, sql_file_path, encryption_key=None, mariadb_root_username=None, mariadb_root_password=None, +def restore(context, sql_file_path, encryption_key=None, db_root_username=None, db_root_password=None, db_name=None, verbose=None, install_app=None, admin_password=None, force=None, with_public_files=None, with_private_files=None): "Restore site database from an sql file" @@ -150,8 +152,8 @@ def restore(context, sql_file_path, encryption_key=None, mariadb_root_username=N try: - _new_site(frappe.conf.db_name, site, mariadb_root_username=mariadb_root_username, - mariadb_root_password=mariadb_root_password, admin_password=admin_password, + _new_site(frappe.conf.db_name, site, db_root_username=db_root_username, + db_root_password=db_root_password, admin_password=admin_password, verbose=context.verbose, install_apps=install_app, source_sql=decompressed_file_name, force=True, db_type=frappe.conf.db_type) @@ -290,16 +292,16 @@ def partial_restore(context, sql_file_path, verbose, encryption_key=None): @click.command('reinstall') @click.option('--admin-password', help='Administrator Password for reinstalled site') -@click.option('--mariadb-root-username', help='Root username for MariaDB') -@click.option('--mariadb-root-password', help='Root password for MariaDB') +@click.option('--db-root-username', '--mariadb-root-username', help='Root username for MariaDB or PostgreSQL, Default is "root"') +@click.option('--db-root-password', '--mariadb-root-password', help='Root password for MariaDB or PostgreSQL') @click.option('--yes', is_flag=True, default=False, help='Pass --yes to skip confirmation') @pass_context -def reinstall(context, admin_password=None, mariadb_root_username=None, mariadb_root_password=None, yes=False): +def reinstall(context, admin_password=None, db_root_username=None, db_root_password=None, yes=False): "Reinstall site ie. wipe all data and start over" site = get_site(context) - _reinstall(site, admin_password, mariadb_root_username, mariadb_root_password, yes, verbose=context.verbose) + _reinstall(site, admin_password, db_root_username, db_root_password, yes, verbose=context.verbose) -def _reinstall(site, admin_password=None, mariadb_root_username=None, mariadb_root_password=None, yes=False, verbose=False): +def _reinstall(site, admin_password=None, db_root_username=None, db_root_password=None, yes=False, verbose=False): from frappe.installer import _new_site if not yes: @@ -319,7 +321,7 @@ def _reinstall(site, admin_password=None, mariadb_root_username=None, mariadb_ro frappe.init(site=site) _new_site(frappe.conf.db_name, site, verbose=verbose, force=True, reinstall=True, install_apps=installed, - mariadb_root_username=mariadb_root_username, mariadb_root_password=mariadb_root_password, + db_root_username=db_root_username, db_root_password=db_root_password, admin_password=admin_password) @click.command('install-app') @@ -656,16 +658,16 @@ def uninstall(context, app, dry_run, yes, no_backup, force): @click.command('drop-site') @click.argument('site') -@click.option('--root-login', default='root') -@click.option('--root-password') +@click.option('--db-root-username', '--mariadb-root-username', '--root-login', help='Root username for MariaDB or PostgreSQL, Default is "root"') +@click.option('--db-root-password', '--mariadb-root-password', '--root-password', help='Root password for MariaDB or PostgreSQL') @click.option('--archived-sites-path') @click.option('--no-backup', is_flag=True, default=False) @click.option('--force', help='Force drop-site even if an error is encountered', is_flag=True, default=False) -def drop_site(site, root_login='root', root_password=None, archived_sites_path=None, force=False, no_backup=False): - _drop_site(site, root_login, root_password, archived_sites_path, force, no_backup) +def drop_site(site, db_root_username='root', db_root_password=None, archived_sites_path=None, force=False, no_backup=False): + _drop_site(site, db_root_username, db_root_password, archived_sites_path, force, no_backup) -def _drop_site(site, root_login='root', root_password=None, archived_sites_path=None, force=False, no_backup=False): +def _drop_site(site, db_root_username=None, db_root_password=None, archived_sites_path=None, force=False, no_backup=False): "Remove site from database and filesystem" from frappe.database import drop_user_and_database from frappe.utils.backups import scheduled_backup @@ -690,7 +692,7 @@ def _drop_site(site, root_login='root', root_password=None, archived_sites_path= click.echo("\n".join(messages)) sys.exit(1) - drop_user_and_database(frappe.conf.db_name, root_login, root_password) + drop_user_and_database(frappe.conf.db_name, db_root_username, db_root_password) archived_sites_path = archived_sites_path or os.path.join(frappe.get_app_path('frappe'), '..', '..', '..', 'archived', 'sites') diff --git a/frappe/database/postgres/setup_db.py b/frappe/database/postgres/setup_db.py index 19ba681237..b3b2e0fd41 100644 --- a/frappe/database/postgres/setup_db.py +++ b/frappe/database/postgres/setup_db.py @@ -4,7 +4,7 @@ import frappe def setup_database(force, source_sql=None, verbose=False): - root_conn = get_root_connection() + root_conn = get_root_connection(frappe.flags.root_login, frappe.flags.root_password) root_conn.commit() root_conn.sql("DROP DATABASE IF EXISTS `{0}`".format(frappe.conf.db_name)) root_conn.sql("DROP USER IF EXISTS {0}".format(frappe.conf.db_name)) @@ -70,7 +70,7 @@ def import_db_from_sql(source_sql=None, verbose=False): print(f"\nSTDOUT by psql:\n{restore_proc.stdout.decode()}\nImported from Database File: {source_sql}") def setup_help_database(help_db_name): - root_conn = get_root_connection() + root_conn = get_root_connection(frappe.flags.root_login, frappe.flags.root_password) root_conn.sql("DROP DATABASE IF EXISTS `{0}`".format(help_db_name)) root_conn.sql("DROP USER IF EXISTS {0}".format(help_db_name)) root_conn.sql("CREATE DATABASE `{0}`".format(help_db_name)) diff --git a/frappe/installer.py b/frappe/installer.py index 20db451d26..6ebab95a7d 100644 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -14,8 +14,8 @@ from frappe.defaults import _clear_cache def _new_site( db_name, site, - mariadb_root_username=None, - mariadb_root_password=None, + db_root_username=None, + db_root_password=None, admin_password=None, verbose=False, install_apps=None, @@ -60,8 +60,8 @@ def _new_site( installing = touch_file(get_site_path("locks", "installing.lock")) install_db( - root_login=mariadb_root_username, - root_password=mariadb_root_password, + root_login=db_root_username, + root_password=db_root_password, db_name=db_name, admin_password=admin_password, verbose=verbose, @@ -92,7 +92,7 @@ def _new_site( print("*** Scheduler is", scheduler_status, "***") -def install_db(root_login="root", root_password=None, db_name=None, source_sql=None, +def install_db(root_login=None, root_password=None, db_name=None, source_sql=None, admin_password=None, verbose=True, force=0, site_config=None, reinstall=False, db_password=None, db_type=None, db_host=None, db_port=None, no_mariadb_socket=False): import frappe.database @@ -101,6 +101,11 @@ def install_db(root_login="root", root_password=None, db_name=None, source_sql=N if not db_type: db_type = frappe.conf.db_type or 'mariadb' + if not root_login and db_type == 'mariadb': + root_login='root' + elif not root_login and db_type == 'postgres': + root_login='postgres' + make_conf(db_name, site_config=site_config, db_password=db_password, db_type=db_type, db_host=db_host, db_port=db_port) frappe.flags.in_install_db = True