- {% if(image_url) { %}
-
-
-
- {% } %}
-
-
+
+ {% if(image_url) { %}
+
+
+
+ {% } %}
+
-
-
\ No newline at end of file
+
+
diff --git a/frappe/public/js/frappe/views/kanban/kanban_settings.js b/frappe/public/js/frappe/views/kanban/kanban_settings.js
new file mode 100644
index 0000000000..b41922e544
--- /dev/null
+++ b/frappe/public/js/frappe/views/kanban/kanban_settings.js
@@ -0,0 +1,264 @@
+export default class KanbanSettings {
+ constructor({ kanbanview, doctype, meta, settings }) {
+ if (!doctype) {
+ frappe.throw(__("DocType required"));
+ }
+
+ this.kanbanview = kanbanview;
+ this.doctype = doctype;
+ this.meta = meta;
+ this.settings = settings;
+ this.dialog = null;
+ this.fields = this.settings && this.settings.fields;
+
+ frappe.model.with_doctype("List View Settings", () => {
+ this.make();
+ this.get_fields();
+ this.setup_fields();
+ this.setup_remove_fields();
+ this.add_new_fields();
+ this.show_dialog();
+ });
+ }
+
+ make() {
+ this.dialog = new frappe.ui.Dialog({
+ title: __("{0} Settings", [__(this.doctype)]),
+ fields: [
+ {
+ fieldname: "show_labels",
+ label: __("Show Labels"),
+ fieldtype: "Check",
+ },
+ {
+ fieldname: "fields_html",
+ fieldtype: "HTML"
+ },
+ {
+ fieldname: "fields",
+ fieldtype: "Code",
+ hidden: 1
+ }
+ ]
+ });
+ this.dialog.set_values(this.settings);
+ this.dialog.set_primary_action(__("Save"), () => {
+ frappe.show_alert({
+ message: __("Saving"),
+ indicator: "green"
+ });
+
+ frappe.call({
+ method:
+ "frappe.desk.doctype.kanban_board.kanban_board.save_settings",
+ args: {
+ board_name: this.settings.name,
+ settings: this.dialog.get_values()
+ },
+ callback: r => {
+ this.kanbanview.board = r.message;
+ this.kanbanview.render();
+ this.dialog.hide();
+ }
+ });
+ });
+ }
+
+ refresh() {
+ this.setup_fields();
+ this.add_new_fields();
+ this.setup_remove_fields();
+ }
+
+ show_dialog() {
+ if (!this.settings.fields) {
+ this.update_fields();
+ }
+
+ this.dialog.show();
+ }
+
+ setup_fields() {
+ const fields_html = this.dialog.get_field("fields_html");
+ const wrapper = fields_html.$wrapper[0];
+ let fields = "";
+
+ for (let fieldname of this.fields) {
+ let field = this.get_docfield(fieldname);
+
+ fields += `
+
`;
+ }
+
+ fields_html.html(`
+
+ `);
+
+ new Sortable(
+ wrapper.getElementsByClassName("control-input-wrapper")[0],
+ {
+ handle: ".sortable-handle",
+ draggable: ".sortable",
+ onUpdate: params => {
+ this.fields.splice(
+ params.newIndex,
+ 0,
+ this.fields.splice(params.oldIndex, 1)[0]
+ );
+ this.dialog.set_value(
+ "fields",
+ JSON.stringify(this.fields)
+ );
+ this.refresh();
+ }
+ }
+ );
+ }
+
+ add_new_fields() {
+ let add_new_fields = this.get_dialog_fields_wrapper().getElementsByClassName(
+ "add-new-fields"
+ )[0];
+ add_new_fields.onclick = () => this.show_column_selector();
+ }
+
+ setup_remove_fields() {
+ let remove_fields = this.get_dialog_fields_wrapper().getElementsByClassName(
+ "remove-field"
+ );
+
+ for (let idx = 0; idx < remove_fields.length; idx++) {
+ remove_fields.item(idx).onclick = () =>
+ this.remove_fields(
+ remove_fields.item(idx).getAttribute("data-fieldname")
+ );
+ }
+ }
+
+ get_dialog_fields_wrapper() {
+ return this.dialog.get_field("fields_html").$wrapper[0];
+ }
+
+ remove_fields(fieldname) {
+ this.fields = this.fields.filter(field => field !== fieldname);
+ this.dialog.set_value("fields", JSON.stringify(this.fields));
+ this.refresh();
+ }
+
+ update_fields() {
+ const wrapper = this.dialog.get_field("fields_html").$wrapper[0];
+ let fields_order = wrapper.getElementsByClassName("fields_order");
+ this.fields = [];
+
+ for (let idx = 0; idx < fields_order.length; idx++) {
+ this.fields.push(
+ fields_order.item(idx).getAttribute("data-fieldname")
+ );
+ }
+
+ this.dialog.set_value("fields", JSON.stringify(this.fields));
+ }
+
+ show_column_selector() {
+ let dialog = new frappe.ui.Dialog({
+ title: __("{0} Fields", [__(this.doctype)]),
+ fields: [
+ {
+ label: __("Select Fields"),
+ fieldtype: "MultiCheck",
+ fieldname: "fields",
+ options: this.get_multiselect_fields(),
+ columns: 2
+ }
+ ]
+ });
+ dialog.set_primary_action(__("Save"), () => {
+ this.fields = dialog.get_values().fields || [];
+ this.dialog.set_value("fields", JSON.stringify(this.fields));
+ this.refresh();
+ dialog.hide();
+ });
+ dialog.show();
+ }
+
+ get_fields() {
+ this.fields = this.settings.fields;
+ this.fields.uniqBy(f => f.fieldname);
+ }
+
+ get_docfield(field_name) {
+ return (
+ frappe.meta.get_docfield(this.doctype, field_name) ||
+ frappe.model.get_std_field(field_name)
+ );
+ }
+
+ get_multiselect_fields() {
+ const ignore_fields = [
+ "idx",
+ "lft",
+ "rgt",
+ "old_parent",
+ "_user_tags",
+ "_liked_by",
+ "_comments",
+ "_assign",
+ this.meta.title_field || "name"
+ ];
+
+ const ignore_fieldtypes = [
+ "Attach Image",
+ "Text Editor",
+ "HTML Editor",
+ "Code",
+ "Color",
+ ...frappe.model.no_value_type
+ ];
+
+ return frappe.model.std_fields
+ .concat(this.kanbanview.get_fields_in_list_view())
+ .filter(
+ field =>
+ !ignore_fields.includes(field.fieldname) &&
+ !ignore_fieldtypes.includes(field.fieldtype)
+ )
+ .map(field => {
+ return {
+ label: __(field.label),
+ value: field.fieldname,
+ checked: this.fields.includes(field.fieldname)
+ };
+ });
+ }
+}
diff --git a/frappe/public/js/frappe/views/kanban/kanban_view.js b/frappe/public/js/frappe/views/kanban/kanban_view.js
index 3bf3a16189..b546365fd9 100644
--- a/frappe/public/js/frappe/views/kanban/kanban_view.js
+++ b/frappe/public/js/frappe/views/kanban/kanban_view.js
@@ -1,3 +1,5 @@
+import KanbanSettings from "./kanban_settings";
+
frappe.provide('frappe.views');
frappe.views.KanbanView = class KanbanView extends frappe.views.ListView {
@@ -57,6 +59,7 @@ frappe.views.KanbanView = class KanbanView extends frappe.views.ListView {
.then(board => {
this.board = board;
this.board.filters_array = JSON.parse(this.board.filters || '[]');
+ this.board.fields = JSON.parse(this.board.fields || '[]');
this.filters = this.board.filters_array;
});
}
@@ -187,6 +190,25 @@ frappe.views.KanbanView = class KanbanView extends frappe.views.ListView {
};
}
+ get_view_settings() {
+ return {
+ label: __("Kanban Settings", null, "Button in kanban view menu"),
+ action: () => this.show_kanban_settings(),
+ standard: true,
+ };
+ }
+
+ show_kanban_settings() {
+ frappe.model.with_doctype(this.doctype, () => {
+ new KanbanSettings({
+ kanbanview: this,
+ doctype: this.doctype,
+ settings: this.board,
+ meta: frappe.get_meta(this.doctype)
+ });
+ });
+ }
+
get required_libs() {
return [
'assets/frappe/js/lib/fluxify.min.js',
diff --git a/frappe/public/js/frappe/views/workspace/blocks/block.js b/frappe/public/js/frappe/views/workspace/blocks/block.js
index 9605d30c81..1df6b707fe 100644
--- a/frappe/public/js/frappe/views/workspace/blocks/block.js
+++ b/frappe/public/js/frappe/views/workspace/blocks/block.js
@@ -7,7 +7,7 @@ export default class Block {
make(block, block_name, widget_type = block) {
let block_data = this.config.page_data[block+'s'].items.find(obj => {
- return frappe.utils.unescape_html(obj.label) == frappe.utils.unescape_html(block_name);
+ return frappe.utils.unescape_html(obj.label) == frappe.utils.unescape_html(__(block_name));
});
if (!block_data) return false;
this.wrapper.innerHTML = '';
diff --git a/frappe/public/js/frappe/views/workspace/blocks/card.js b/frappe/public/js/frappe/views/workspace/blocks/card.js
index 9ce6ce8b4d..4b46b12890 100644
--- a/frappe/public/js/frappe/views/workspace/blocks/card.js
+++ b/frappe/public/js/frappe/views/workspace/blocks/card.js
@@ -31,7 +31,7 @@ export default class Card extends Block {
this.new('card', 'links');
if (this.data && this.data.card_name) {
- let has_data = this.make('card', __(this.data.card_name), 'links');
+ let has_data = this.make('card', this.data.card_name, 'links');
if (!has_data) return;
}
diff --git a/frappe/public/js/frappe/views/workspace/blocks/chart.js b/frappe/public/js/frappe/views/workspace/blocks/chart.js
index ccef1fa15f..cb688f48ed 100644
--- a/frappe/public/js/frappe/views/workspace/blocks/chart.js
+++ b/frappe/public/js/frappe/views/workspace/blocks/chart.js
@@ -32,7 +32,7 @@ export default class Chart extends Block {
this.new('chart');
if (this.data && this.data.chart_name) {
- let has_data = this.make('chart', __(this.data.chart_name));
+ let has_data = this.make('chart', this.data.chart_name);
if (!has_data) return;
}
diff --git a/frappe/public/js/frappe/views/workspace/blocks/onboarding.js b/frappe/public/js/frappe/views/workspace/blocks/onboarding.js
index c0ba529853..c76141996f 100644
--- a/frappe/public/js/frappe/views/workspace/blocks/onboarding.js
+++ b/frappe/public/js/frappe/views/workspace/blocks/onboarding.js
@@ -73,7 +73,7 @@ export default class Onboarding extends Block {
make(block, block_name) {
let block_data = this.config.page_data['onboardings'].items.find(obj => {
- return obj.label == block_name;
+ return obj.label == __(block_name);
});
if (!block_data) return false;
this.wrapper.innerHTML = '';
diff --git a/frappe/public/js/frappe/views/workspace/blocks/shortcut.js b/frappe/public/js/frappe/views/workspace/blocks/shortcut.js
index 2be5da0d4b..ef9bfa8cf9 100644
--- a/frappe/public/js/frappe/views/workspace/blocks/shortcut.js
+++ b/frappe/public/js/frappe/views/workspace/blocks/shortcut.js
@@ -51,7 +51,7 @@ export default class Shortcut extends Block {
this.new('shortcut');
if (this.data && this.data.shortcut_name) {
- let has_data = this.make('shortcut', __(this.data.shortcut_name));
+ let has_data = this.make('shortcut', this.data.shortcut_name);
if (!has_data) return;
}
diff --git a/frappe/public/js/frappe/widgets/widget_dialog.js b/frappe/public/js/frappe/widgets/widget_dialog.js
index d1ba75227b..bba29ffaf9 100644
--- a/frappe/public/js/frappe/widgets/widget_dialog.js
+++ b/frappe/public/js/frappe/widgets/widget_dialog.js
@@ -228,30 +228,35 @@ class CardDialog extends WidgetDialog {
}
process_data(data) {
- data.links.map((item, idx) => {
- let message = '';
- let row = idx+1;
+ let message = '';
- if (!item.link_type) {
- message = "Following fields have missing values:
";
- message += `- Link Type in Row ${row}
`;
- }
+ if (!data.links) {
+ message = "You must add atleast one link.";
+ } else {
+ data.links.map((item, idx) => {
+ let row = idx+1;
- if (!item.link_to) {
- message += `- Link To in Row ${row}
`;
- }
+ if (!item.link_type) {
+ message = "Following fields have missing values:
";
+ message += `- Link Type in Row ${row}
`;
+ }
- if (message) {
- message += "
";
- frappe.throw({
- message: __(message),
- title: __("Missing Values Required"),
- indicator: 'orange'
- });
- }
+ if (!item.link_to) {
+ message += `- Link To in Row ${row}
`;
+ }
- item.label = item.label ? item.label : item.link_to;
- });
+ item.label = item.label ? item.label : item.link_to;
+ });
+ }
+
+ if (message) {
+ message += "
";
+ frappe.throw({
+ message: __(message),
+ title: __("Missing Values Required"),
+ indicator: 'orange'
+ });
+ }
data.label = data.label ? data.label : data.chart_name;
return data;
diff --git a/frappe/public/scss/common/controls.scss b/frappe/public/scss/common/controls.scss
index fcc924650e..9df89f23e1 100644
--- a/frappe/public/scss/common/controls.scss
+++ b/frappe/public/scss/common/controls.scss
@@ -343,11 +343,10 @@ textarea.form-control {
.duration-picker {
position: absolute;
z-index: 999;
-
border-radius: var(--border-radius);
box-shadow: var(--shadow-sm);
background: var(--popover-bg);
-
+ width: max-content;
&:after,
&:before {
border: solid transparent;
@@ -466,4 +465,4 @@ button.data-pill {
top: 0;
right: 0;
cursor: pointer;
-}
\ No newline at end of file
+}
diff --git a/frappe/public/scss/common/quill.scss b/frappe/public/scss/common/quill.scss
index 3d5ce61c15..9aab2e9fcd 100644
--- a/frappe/public/scss/common/quill.scss
+++ b/frappe/public/scss/common/quill.scss
@@ -7,6 +7,7 @@
font-family: inherit;
}
+/*rtl:begin:ignore*/
.ql-editor {
font-family: var(--font-stack);
color: var(--text-color);
@@ -22,7 +23,15 @@
a[href] {
text-decoration: underline;
}
+ .ql-direction-rtl {
+ direction: rtl;
+ + .table {
+ direction: ltr;
+ }
+ }
}
+/*rtl:end:ignore*/
+
.ql-toolbar.ql-snow {
border-top-left-radius: var(--border-radius);
@@ -70,6 +79,7 @@
min-height: 0;
max-height: none;
overflow: hidden;
+ resize: none;
}
}
diff --git a/frappe/public/scss/desk/kanban.scss b/frappe/public/scss/desk/kanban.scss
index 41bd0b2859..8f286b7b35 100644
--- a/frappe/public/scss/desk/kanban.scss
+++ b/frappe/public/scss/desk/kanban.scss
@@ -139,6 +139,7 @@
}
.kanban-cards {
+ height: 100%;
max-height: calc(100vh - 250px);
margin: -5px;
padding: 5px;
@@ -149,39 +150,120 @@
&::-webkit-scrollbar {
display: none;
}
- }
- .kanban-card {
- @include flex(flex, space-between, null, column);
- margin-top: var(--margin-sm);
- min-height: 100px;
- @include card(
- $padding: 0,
- $background-color: var(--kanban-card-bg)
- );
- .kanban-card-body {
- padding: var(--padding-sm);
+ .kanban-card-wrapper {
+ position: relative;
+ display: block;
+
+ &:last-child .kanban-card {
+ margin-bottom: var(--margin-xl);
+ }
+ .kanban-card {
+ @include flex(flex, space-between, null, column);
+ margin-top: var(--margin-sm);
+ min-height: 100px;
+ @include card(
+ $padding: 0,
+ $background-color: var(--kanban-card-bg)
+ );
+
+ .kanban-image {
+ height: 125px;
+
+ img {
+ border-radius: var(--border-radius) var(--border-radius) 0 0;
+ object-position: top;
+ object-fit: cover;
+ margin: 0 auto;
+ height: 100%;
+ width: 100%;
+ min-width: 100%;
+ color: transparent;
+ position: relative;
+ }
+
+ @include broken-img(
+ $height: 125px,
+ $top: -4px,
+ )
+ }
+
+ .kanban-card-body {
+ cursor: grab;
+ padding: var(--padding-sm);
+
+ .kanban-title-area {
+ margin-bottom: 12px;
+ max-width: 90%;
+ font-size: var(--text-md);
+ font-weight: 500;
+
+ .kanban-card-doc {
+ .text-muted div {
+ display: inline;
+ }
+ }
+
+ .kanban-card-creation {
+ font-size: var(--text-md);
+ color: var(--text-muted);
+ margin-top: var(--margin-xs);
+ }
+ }
+
+ .kanban-card-meta {
+
+ .list-comment-count {
+ width: 30px;
+ }
+
+ .like-action:not(.liked) {
+ .icon use {
+ stroke: var(--text-muted);
+ }
+ }
+
+ .kanban-tags {
+ font-size: var(--text-sm);
+ margin-bottom: 8px;
+
+ .tag-pill {
+ border-radius: 100px;
+ height: 22px;
+ width: auto;
+ padding: 2px 8px;
+ margin-bottom: var(--margin-xs);
+ margin-right: var(--margin-xs);
+ }
+ }
+
+ .kanban-assignments {
+ display: flex;
+ float: right;
+
+ .avatar {
+ cursor: default;
+ width: 22px;
+ height: 22px;
+ }
+
+ .avatar-action {
+ width: 22px;
+ height: 22px;
+
+ .icon {
+ width: 12px;
+ height: 12px;
+ }
+ }
+ }
+ }
+ }
+ }
}
}
}
- .kanban-card-wrapper {
- position: relative;
-
- .kanban-card-redirect {
- display: block;
-
- &:hover,
- &:focus {
- text-decoration: none;
- }
- }
-
- &:last-child .kanban-card {
- margin-bottom: var(--margin-xl);
- }
- }
-
.kanban-card:hover,
.new-card-area,
.edit-card-area {
@@ -189,7 +271,6 @@
}
.kanban-card-wrapper:hover {
- cursor: pointer;
text-decoration: none;
.kanban-card-edit {
@@ -197,43 +278,6 @@
}
}
- .kanban-title-area {
- margin-bottom: 12px;
-
- .kanban-card-title {
- max-width: 90%;
- font-size: var(--text-md);
- font-weight: 500;
- }
-
- .kanban-card-creation {
- font-size: var(--text-md);
- color: var(--text-muted);
- margin-top: var(--margin-xs);
- }
- }
-
- .kanban-image {
- height: 125px;
-
- img {
- border-radius: var(--border-radius) var(--border-radius) 0 0;
- object-position: top;
- object-fit: cover;
- margin: 0 auto;
- height: 100%;
- width: 100%;
- min-width: 100%;
- color: transparent;
- position: relative;
- }
-
- @include broken-img(
- $height: 125px,
- $top: -4px,
- )
- }
-
.kanban-card-edit {
position: absolute;
right: 10px;
@@ -291,54 +335,6 @@
}
}
- .kanban-card-meta {
-
- .list-comment-count {
- width: 30px;
- }
-
- .like-action:not(.liked) {
- .icon use {
- stroke: var(--text-muted);
- }
- }
-
- .kanban-tags {
- font-size: var(--text-sm);
- margin-bottom: 8px;
-
- .tag-pill {
- border-radius: 100px;
- height: 22px;
- width: auto;
- padding: 2px 8px;
- margin-bottom: var(--margin-xs);
- margin-right: var(--margin-xs);
- }
- }
-
- .kanban-assignments {
- display: flex;
- float: right;
-
- .avatar {
- cursor: default;
- width: 22px;
- height: 22px;
- }
-
- .avatar-action {
- width: 22px;
- height: 22px;
-
- .icon {
- width: 12px;
- height: 12px;
- }
- }
- }
- }
-
.kanban-empty-state {
width: 100%;
line-height: 400px;
diff --git a/frappe/public/scss/website/my_account.scss b/frappe/public/scss/website/my_account.scss
index 58075580a2..82c4164a31 100644
--- a/frappe/public/scss/website/my_account.scss
+++ b/frappe/public/scss/website/my_account.scss
@@ -30,6 +30,7 @@
.my-account-container {
max-width: 800px;
margin: auto;
+ margin-bottom: 4rem;
}
.account-info {
diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.py b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
index a36581ec4c..9d393dde48 100644
--- a/frappe/social/doctype/energy_point_rule/energy_point_rule.py
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
@@ -57,7 +57,7 @@ class EnergyPointRule(Document):
self.apply_only_once,
)
except Exception as e:
- frappe.log_error(frappe.get_traceback(), "apply_energy_point")
+ self.log_error("Energy points failed")
def rule_condition_satisfied(self, doc):
if self.for_doc_event == "New":
diff --git a/frappe/test_runner.py b/frappe/test_runner.py
index 5fa9f60197..509be36f86 100644
--- a/frappe/test_runner.py
+++ b/frappe/test_runner.py
@@ -15,6 +15,7 @@ import frappe
import frappe.utils.scheduler
from frappe.model.naming import revert_series_if_last
from frappe.modules import get_module_name, load_doctype_module
+from frappe.utils import cint
unittest_runner = unittest.TextTestRunner
SLOW_TEST_THRESHOLD = 2
@@ -177,10 +178,13 @@ def run_all_tests(
_add_test(app, path, filename, verbose, test_suite, ui_tests)
if junit_xml_output:
- runner = unittest_runner(verbosity=1 + (verbose and 1 or 0), failfast=failfast)
+ runner = unittest_runner(verbosity=1 + cint(verbose), failfast=failfast)
else:
runner = unittest_runner(
- resultclass=TimeLoggingTestResult, verbosity=1 + (verbose and 1 or 0), failfast=failfast
+ resultclass=TimeLoggingTestResult,
+ verbosity=1 + cint(verbose),
+ failfast=failfast,
+ tb_locals=verbose,
)
if profile:
@@ -279,10 +283,13 @@ def _run_unittest(
test_suite.addTest(module_test_cases)
if junit_xml_output:
- runner = unittest_runner(verbosity=1 + (verbose and 1 or 0), failfast=failfast)
+ runner = unittest_runner(verbosity=1 + cint(verbose), failfast=failfast)
else:
runner = unittest_runner(
- resultclass=TimeLoggingTestResult, verbosity=1 + (verbose and 1 or 0), failfast=failfast
+ resultclass=TimeLoggingTestResult,
+ verbosity=1 + cint(verbose),
+ failfast=failfast,
+ tb_locals=verbose,
)
if profile:
diff --git a/frappe/tests/test_client.py b/frappe/tests/test_client.py
index c86c482651..677f59a366 100644
--- a/frappe/tests/test_client.py
+++ b/frappe/tests/test_client.py
@@ -141,3 +141,40 @@ class TestClient(unittest.TestCase):
self.assertEqual(get("ToDo", filters=filters_json).description, "test")
todo.delete()
+
+ def test_client_insert(self):
+ from frappe.client import insert
+
+ def get_random_title():
+ return "test-{0}".format(frappe.generate_hash())
+
+ # test insert dict
+ doc = {"doctype": "Note", "title": get_random_title(), "content": "test"}
+ note1 = insert(doc)
+ self.assertTrue(note1)
+
+ # test insert json
+ doc["title"] = get_random_title()
+ json_doc = frappe.as_json(doc)
+ note2 = insert(json_doc)
+ self.assertTrue(note2)
+
+ # test insert child doc without parent fields
+ child_doc = {"doctype": "Note Seen By", "user": "Administrator"}
+ with self.assertRaises(frappe.ValidationError):
+ insert(child_doc)
+
+ # test insert child doc with parent fields
+ child_doc = {
+ "doctype": "Note Seen By",
+ "user": "Administrator",
+ "parenttype": "Note",
+ "parent": note1.name,
+ "parentfield": "seen_by",
+ }
+ note3 = insert(child_doc)
+ self.assertTrue(note3)
+
+ # cleanup
+ frappe.delete_doc("Note", note1.name)
+ frappe.delete_doc("Note", note2.name)
diff --git a/frappe/tests/test_db.py b/frappe/tests/test_db.py
index f722ad1d65..5b469cd5db 100644
--- a/frappe/tests/test_db.py
+++ b/frappe/tests/test_db.py
@@ -4,6 +4,7 @@
import datetime
import inspect
import unittest
+from math import ceil
from random import choice
from unittest.mock import patch
@@ -445,6 +446,33 @@ class TestDB(unittest.TestCase):
self.assertEqual(frappe.db.exists(dt, [["name", "=", dn]]), dn)
+ def test_bulk_insert(self):
+ current_count = frappe.db.count("ToDo")
+ test_body = f"test_bulk_insert - {random_string(10)}"
+ chunk_size = 10
+
+ for number_of_values in (1, 2, 5, 27):
+ current_transaction_writes = frappe.db.transaction_writes
+
+ frappe.db.bulk_insert(
+ "ToDo",
+ ["name", "description"],
+ [[f"ToDo Test Bulk Insert {i}", test_body] for i in range(number_of_values)],
+ ignore_duplicates=True,
+ chunk_size=chunk_size,
+ )
+
+ # check that all records were inserted
+ self.assertEqual(number_of_values, frappe.db.count("ToDo") - current_count)
+
+ # check if inserts were done in chunks
+ expected_number_of_writes = ceil(number_of_values / chunk_size)
+ self.assertEqual(
+ expected_number_of_writes, frappe.db.transaction_writes - current_transaction_writes
+ )
+
+ frappe.db.delete("ToDo", {"description": test_body})
+
@run_only_if(db_type_is.MARIADB)
class TestDDLCommandsMaria(unittest.TestCase):
diff --git a/frappe/tests/ui_test_helpers.py b/frappe/tests/ui_test_helpers.py
index 4cb3e95a6d..494ba8872d 100644
--- a/frappe/tests/ui_test_helpers.py
+++ b/frappe/tests/ui_test_helpers.py
@@ -137,12 +137,10 @@ def create_contact_records():
@frappe.whitelist()
def create_multiple_todo_records():
- values = []
if frappe.db.get_all("ToDo", {"description": "Multiple ToDo 1"}):
return
- for index in range(1, 1002):
- values.append(("100{}".format(index), "Multiple ToDo {}".format(index)))
+ values = [("100{}".format(i), "Multiple ToDo {}".format(i)) for i in range(1, 1002)]
frappe.db.bulk_insert("ToDo", fields=["name", "description"], values=set(values))
diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py
index 3e62589664..13e6911634 100644
--- a/frappe/utils/__init__.py
+++ b/frappe/utils/__init__.py
@@ -18,6 +18,7 @@ from typing import Generator, Iterable
from urllib.parse import quote, urlparse
from redis.exceptions import ConnectionError
+from traceback_with_variables import iter_exc_lines
from werkzeug.test import Client
import frappe
@@ -255,7 +256,7 @@ def get_gravatar(email):
return gravatar_url
-def get_traceback() -> str:
+def get_traceback(with_context=False) -> str:
"""
Returns the traceback of the Exception
"""
@@ -264,14 +265,19 @@ def get_traceback() -> str:
if not any([exc_type, exc_value, exc_tb]):
return ""
- trace_list = traceback.format_exception(exc_type, exc_value, exc_tb)
- bench_path = get_bench_path() + "/"
+ if with_context:
+ trace_list = iter_exc_lines()
+ tb = "\n".join(trace_list)
+ else:
+ trace_list = traceback.format_exception(exc_type, exc_value, exc_tb)
+ tb = "".join(cstr(t) for t in trace_list)
- return "".join(cstr(t) for t in trace_list).replace(bench_path, "")
+ bench_path = get_bench_path() + "/"
+ return tb.replace(bench_path, "")
def log(event, details):
- frappe.logger().info(details)
+ frappe.logger(event).info(details)
def dict_to_str(args, sep="&"):
diff --git a/frappe/utils/print_format.py b/frappe/utils/print_format.py
index 35842217d1..87fb646f47 100644
--- a/frappe/utils/print_format.py
+++ b/frappe/utils/print_format.py
@@ -92,7 +92,12 @@ def download_multi_pdf(doctype, name, format=None, no_letterhead=False, options=
pdf_options=options,
)
except Exception:
- frappe.log_error("Permission Error on doc {} of doctype {}".format(doc_name, doctype_name))
+ frappe.log_error(
+ title="Error in Multi PDF download",
+ message="Permission Error on doc {} of doctype {}".format(doc_name, doctype_name),
+ reference_doctype=doctype_name,
+ reference_name=doc_name,
+ )
frappe.local.response.filename = "{}.pdf".format(name)
frappe.local.response.filecontent = read_multi_pdf(output)
diff --git a/frappe/utils/safe_exec.py b/frappe/utils/safe_exec.py
index aa6fa8b67f..fc53243021 100644
--- a/frappe/utils/safe_exec.py
+++ b/frappe/utils/safe_exec.py
@@ -15,6 +15,9 @@ import frappe.utils.data
from frappe import _
from frappe.frappeclient import FrappeClient
from frappe.handler import execute_cmd
+from frappe.model.delete_doc import delete_doc
+from frappe.model.mapper import get_mapped_doc
+from frappe.model.rename_doc import rename_doc
from frappe.modules import scrub
from frappe.utils.background_jobs import enqueue, get_jobs
from frappe.website.utils import get_next_link, get_shade, get_toc
@@ -110,12 +113,16 @@ def get_safe_globals():
errprint=frappe.errprint,
qb=frappe.qb,
get_meta=frappe.get_meta,
+ new_doc=frappe.new_doc,
get_doc=frappe.get_doc,
+ get_mapped_doc=get_mapped_doc,
+ get_last_doc=frappe.get_last_doc,
get_cached_doc=frappe.get_cached_doc,
get_list=frappe.get_list,
get_all=frappe.get_all,
get_system_settings=frappe.get_system_settings,
- rename_doc=frappe.rename_doc,
+ rename_doc=rename_doc,
+ delete_doc=delete_doc,
utils=datautils,
get_url=frappe.utils.get_url,
render_template=frappe.render_template,
diff --git a/frappe/website/doctype/web_form/templates/web_form.html b/frappe/website/doctype/web_form/templates/web_form.html
index 2a02aa5f2b..6e0374abdb 100644
--- a/frappe/website/doctype/web_form/templates/web_form.html
+++ b/frappe/website/doctype/web_form/templates/web_form.html
@@ -70,6 +70,8 @@ data-web-form="{{ name }}" data-web-form-doctype="{{ doc_type }}" data-login-req
+{%- else -%}
+
{%- endif %} {# comments #}
{% endblock page_content %}
diff --git a/frappe/website/serve.py b/frappe/website/serve.py
index b30f3f1047..2c33b5df51 100644
--- a/frappe/website/serve.py
+++ b/frappe/website/serve.py
@@ -20,6 +20,7 @@ def get_response(path=None, http_status_code=200):
except frappe.PermissionError as e:
response = NotPermittedPage(endpoint, http_status_code, exception=e).render()
except Exception as e:
+ frappe.log_error(f"{path} failed")
response = ErrorPage(exception=e).render()
return response
diff --git a/requirements.txt b/requirements.txt
index c77ab1d424..6878bd8bcd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -63,10 +63,11 @@ semantic-version~=2.8.5
sqlparse~=0.4.1
stripe~=2.56.0
terminaltables~=3.1.0
+traceback-with-variables~=2.0.4
urllib3~=1.26.4
Werkzeug~=2.0.3
Whoosh~=2.7.4
-wrapt~=1.12.1
+wrapt~=1.14.0
xlrd~=2.0.1
zxcvbn-python~=4.4.24
tenacity~=8.0.1