@@ -114,37 +126,25 @@ export default class Widget {
}
set_title(max_chars) {
- let base = this.label || this.name;
+ let base = this.title || this.label || this.name;
let title = max_chars ? frappe.ellipsis(base, max_chars) : base;
if (this.icon) {
let icon = frappe.utils.icon(this.icon);
- this.title_field[0].innerHTML = `${icon}
`;
} else {
- this.title_field[0].innerHTML = title;
+ this.title_field[0].innerHTML = `
`;
if (max_chars) {
- this.title_field[0].setAttribute('title', this.label);
+ this.title_field[0].setAttribute('title', this.title || this.label);
}
}
this.subtitle && this.subtitle_field.html(this.subtitle);
}
- add_custom_button(html, action, class_name = "", title="", btn_type) {
- if (!btn_type) btn_type = 'btn-secondary';
- let button = $(
- `
`
- );
- button.click(event => {
- event.stopPropagation();
- action && action();
- });
- button.appendTo(this.action_area);
- }
-
- delete(animate=true) {
+ delete(animate=true, dismissed=false) {
let remove_widget = (setup_new) => {
this.widget.remove();
- this.options.on_delete && this.options.on_delete(this.name, setup_new);
+ !dismissed && this.options.on_delete && this.options.on_delete(this.name, setup_new);
};
if (animate) {
@@ -168,8 +168,9 @@ export default class Widget {
primary_action: (data) => {
Object.assign(this, data);
data.name = this.name;
-
+ this.new = true;
this.refresh();
+ this.options.on_edit && this.options.on_edit(data);
},
primary_action_label: __("Save")
});
diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
index 0c36f013ec..44f3edc038 100644
--- a/frappe/public/js/frappe/widgets/chart_widget.js
+++ b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -349,6 +349,8 @@ export default class ChartWidget extends Widget {
}
setup_filter_button() {
+ if (this.in_customize_mode) return;
+
this.is_document_type =
this.chart_doc.chart_type !== "Report" &&
this.chart_doc.chart_type !== "Custom";
diff --git a/frappe/public/js/frappe/widgets/links_widget.js b/frappe/public/js/frappe/widgets/links_widget.js
index 9d0cadc1d0..cc771b96b5 100644
--- a/frappe/public/js/frappe/widgets/links_widget.js
+++ b/frappe/public/js/frappe/widgets/links_widget.js
@@ -12,14 +12,18 @@ export default class LinksWidget extends Widget {
return {
name: this.name,
links: JSON.stringify(this.links),
+ link_count: this.links.length,
label: this.label,
hidden: this.hidden,
};
}
set_body() {
- this.options = {};
- this.options.links = this.links;
+
+ if (!this.options) {
+ this.options = {};
+ this.options.links = this.links;
+ }
this.widget.addClass("links-widget-box");
const is_link_disabled = item => {
return item.dependencies && item.incomplete_dependencies;
@@ -81,7 +85,9 @@ export default class LinksWidget extends Widget {
${get_link_for_item(item)}
`);
});
-
+ if (this.in_customize_mode) {
+ this.body.empty();
+ }
this.link_list.forEach(link => link.appendTo(this.body));
}
diff --git a/frappe/public/js/frappe/widgets/onboarding_widget.js b/frappe/public/js/frappe/widgets/onboarding_widget.js
index b487c0134f..7237de2fb6 100644
--- a/frappe/public/js/frappe/widgets/onboarding_widget.js
+++ b/frappe/public/js/frappe/widgets/onboarding_widget.js
@@ -3,7 +3,23 @@ import Widget from "./base_widget.js";
frappe.provide("frappe.utils");
export default class OnboardingWidget extends Widget {
+
+ async refresh() {
+ this.new && await this.get_onboarding_data();
+ this.set_title();
+ this.set_actions();
+ this.set_body();
+ this.setup_events();
+ }
+
+ get_config() {
+ return {
+ label: this.onboarding_name
+ };
+ }
+
make_body() {
+ this.body.empty();
this.steps_wrapper = $(`
@@ -477,11 +493,13 @@ export default class OnboardingWidget extends Widget {
}
is_dismissed() {
+ if (this.in_customize_mode) return false;
+
let dismissed = JSON.parse(
localStorage.getItem("dismissed-onboarding") || "{}"
);
- if (Object.keys(dismissed).includes(this.label)) {
- let last_hidden = new Date(dismissed[this.label]);
+ if (Object.keys(dismissed).includes(this.title)) {
+ let last_hidden = new Date(dismissed[this.title]);
let today = new Date();
let diff = frappe.datetime.get_hour_diff(today, last_hidden);
return diff < 24;
@@ -490,6 +508,8 @@ export default class OnboardingWidget extends Widget {
}
set_actions() {
+ if (this.in_customize_mode) return;
+
this.action_area.empty();
const dismiss = $(
`
${__('Dismiss', null, 'Stop showing the onboarding widget.')}
`
@@ -498,14 +518,38 @@ export default class OnboardingWidget extends Widget {
let dismissed = JSON.parse(
localStorage.getItem("dismissed-onboarding") || "{}"
);
- dismissed[this.label] = frappe.datetime.now_datetime();
+ dismissed[this.title] = frappe.datetime.now_datetime();
localStorage.setItem(
"dismissed-onboarding",
JSON.stringify(dismissed)
);
- this.delete();
+ this.delete(true, true);
+ this.widget.closest('.ce-block').hide();
});
dismiss.appendTo(this.action_area);
}
+
+ get_onboarding_data() {
+ return frappe.model
+ .with_doc("Module Onboarding", this.onboarding_name)
+ .then(onboarding_doc => {
+ if (onboarding_doc) {
+ this.onboarding_doc = onboarding_doc;
+ this.label = onboarding_doc.label;
+ this.title = onboarding_doc.title || __("Let's Get Started");
+ this.subtitle = onboarding_doc.subtitle;
+ this.success = onboarding_doc.success;
+ this.docs_url = onboarding_doc.docs_url;
+ this.user_can_dismiss = onboarding_doc.user_can_dismiss;
+ const method =
+ "frappe.desk.doctype.onboarding_step.onboarding_step.get_onboarding_steps";
+ return frappe
+ .xcall(method, { ob_steps: onboarding_doc.steps })
+ .then(steps => {
+ this.steps = steps;
+ });
+ }
+ });
+ }
}
diff --git a/frappe/public/js/frappe/widgets/widget_dialog.js b/frappe/public/js/frappe/widgets/widget_dialog.js
index 3f5a4acd73..9262627f02 100644
--- a/frappe/public/js/frappe/widgets/widget_dialog.js
+++ b/frappe/public/js/frappe/widgets/widget_dialog.js
@@ -124,6 +124,116 @@ class ChartDialog extends WidgetDialog {
}
}
+class OnboardingDialog extends WidgetDialog {
+ constructor(opts) {
+ super(opts);
+ }
+
+ get_fields() {
+ return [
+ {
+ fieldtype: "Link",
+ fieldname: "onboarding_name",
+ label: "Onboarding Name",
+ options: "Module Onboarding",
+ reqd: 1,
+ }
+ ];
+ }
+}
+
+class CardDialog extends WidgetDialog {
+ constructor(opts) {
+ super(opts);
+ }
+
+ get_fields() {
+ let me = this;
+ return [
+ {
+ fieldtype: "Data",
+ fieldname: "label",
+ label: "Label",
+ },
+ {
+ fieldname: 'links',
+ fieldtype: 'Table',
+ label: __('Card Links'),
+ editable_grid: 1,
+ data: me.values ? JSON.parse(me.values.links) : [],
+ get_data: () => {
+ return me.values ? JSON.parse(me.values.links) : [];
+ },
+ fields: [
+ {
+ fieldname: "label",
+ fieldtype: "Data",
+ in_list_view: 1,
+ label: "Label"
+ },
+ {
+ fieldname: "icon",
+ fieldtype: "Data",
+ label: "Icon"
+ },
+ {
+ fieldname: "link_type",
+ fieldtype: "Select",
+ in_list_view: 1,
+ label: "Link Type",
+ options: ["DocType", "Page", "Report"],
+ onchange: (e) => {
+ me.link_to = e.currentTarget.value;
+ }
+ },
+ {
+ fieldname: "link_to",
+ fieldtype: "Dynamic Link",
+ in_list_view: 1,
+ label: "Link To",
+ options: "link_type",
+ get_options: () => {
+ return me.link_to;
+ }
+ },
+ {
+ fieldname: "column_break_7",
+ fieldtype: "Column Break"
+ },
+ {
+ fieldname: "dependencies",
+ fieldtype: "Data",
+ label: "Dependencies"
+ },
+ {
+ fieldname: "only_for",
+ fieldtype: "Link",
+ label: "Only for ",
+ options: "Country"
+ },
+ {
+ default: "0",
+ fieldname: "onboard",
+ fieldtype: "Check",
+ label: "Onboard"
+ },
+ {
+ default: "0",
+ fieldname: "is_query_report",
+ fieldtype: "Check",
+ label: "Is Query Report"
+ }
+ ],
+ },
+ ];
+ }
+
+ process_data(data) {
+ data.label = data.label ? data.label : data.chart_name;
+ return data;
+ }
+}
+
class ShortcutDialog extends WidgetDialog {
constructor(opts) {
super(opts);
@@ -438,6 +548,8 @@ export default function get_dialog_constructor(type) {
chart: ChartDialog,
shortcut: ShortcutDialog,
number_card: NumberCardDialog,
+ links: CardDialog,
+ onboarding: OnboardingDialog
};
return widget_map[type] || WidgetDialog;
diff --git a/frappe/public/js/frappe/widgets/widget_group.js b/frappe/public/js/frappe/widgets/widget_group.js
index 20a8e14540..d8f92edc5d 100644
--- a/frappe/public/js/frappe/widgets/widget_group.js
+++ b/frappe/public/js/frappe/widgets/widget_group.js
@@ -186,4 +186,51 @@ export default class WidgetGroup {
}
}
+export class SingleWidgetGroup {
+ constructor(opts) {
+ Object.assign(this, opts);
+ this.widgets_list = [];
+ this.widgets_dict = {};
+ this.widget_order = [];
+ this.make();
+ }
+
+ make() {
+ this.add_widget(this.widgets);
+ }
+
+ add_widget(widget) {
+ let widget_object = frappe.widget.make_widget({
+ ...widget,
+ widget_type: this.type,
+ container: this.container,
+ height: this.height || null,
+ options: {
+ ...this.options,
+ on_delete: () => this.on_delete(),
+ on_edit: () => this.on_edit(widget_object)
+ }
+ });
+ this.widgets_list.push(widget_object);
+ this.widgets_dict[widget.name] = widget_object;
+
+ return widget_object;
+ }
+
+ on_delete() {
+ this.api.blocks.delete();
+ }
+
+ on_edit(widget_object) {
+ this.block.call("on_edit", widget_object);
+ }
+
+ customize() {
+ this.widgets_list.forEach((wid) => {
+ wid.customize(this.options);
+ });
+ }
+}
+
frappe.widget.WidgetGroup = WidgetGroup;
+frappe.widget.SingleWidgetGroup = SingleWidgetGroup;
diff --git a/frappe/public/scss/desk/desktop.scss b/frappe/public/scss/desk/desktop.scss
index ac3b1a4f7c..49ed07bbce 100644
--- a/frappe/public/scss/desk/desktop.scss
+++ b/frappe/public/scss/desk/desktop.scss
@@ -9,6 +9,11 @@ body {
.standard-sidebar-label {
font-size: var(--text-xs);
text-transform: uppercase;
+ cursor: pointer;
+
+ span {
+ pointer-events: none;
+ }
}
.standard-sidebar-section {
@@ -128,19 +133,25 @@ body {
.widget-head {
@include flex(flex, space-between, center, null);
- .widget-title {
- @include flex(flex, null, center, null);
- font-size: var(--text-lg);
- font-family: inherit;
- font-weight: 500;
- line-height: 1.3em;
- color: var(--heading-color);
+ .widget-label {
+ min-width: 0px;
- svg {
- margin-right: 6px;
- box-shadow: none;
+ .widget-title {
+ @include flex(flex, null, center, null);
+ font-size: var(--text-lg);
+ font-family: inherit;
+ font-weight: 500;
+ line-height: 1.3em;
+ color: var(--heading-color);
+
+ svg {
+ flex: none;
+ margin-right: 6px;
+ box-shadow: none;
+ }
}
}
+
.widget-control {
@include flex(flex, null, center, row-reverse);
@@ -781,4 +792,267 @@ body {
}
}
}
+
+ .block-menu-item-icon svg{
+ width: 12px;
+ height: 12px;
+ margin-right: 5px;
+ }
+
+ .standard-sidebar-item {
+ justify-content: space-between;
+ padding: 0px;
+
+ .sidebar-item-control {
+
+ > * {
+ align-self: center;
+ margin-left: 3px;
+ box-shadow: none;
+ }
+
+ .drag-handle {
+ cursor: all-scroll;
+ cursor: -webkit-grabbing;
+ display: none;
+ }
+
+ .delete-page {
+ display: none;
+ }
+
+ .drop-icon {
+ padding: 10px 12px 10px 2px;
+ }
+
+ .sidebar-info {
+ display: none;
+ }
+
+ svg {
+ margin-right: 0;
+ }
+ }
+
+ .sidebar-item-label {
+ flex: 1;
+ }
+
+ .item-anchor {
+ display: flex;
+ overflow: hidden;
+ padding: 8px 0px 8px 12px;
+ flex: 1;
+ }
+ }
+
+ .sidebar-item-container {
+ .sidebar-item-container{
+ margin-left: 10px;
+
+ .standard-sidebar-item {
+ justify-content: start;
+ }
+ }
+ }
+
+ .standard-sidebar-section.show-control {
+ .desk-sidebar-item.standard-sidebar-item {
+
+ &:hover, &.selected {
+ .drag-handle {
+ display: inline-block;
+ }
+
+ .delete-page {
+ display: inline-block;
+ margin-right: 8px;
+ }
+
+ .sidebar-info {
+ display: inline-block;
+ margin-right: 8px;
+ }
+
+ .drop-icon {
+ padding: 10px 8px 10px 2px;
+ margin-left: -4px;
+ }
+ }
+
+ .block-click {
+ pointer-events:none;
+ }
+ }
+ }
+
+ .codex-editor {
+ min-height: 630px;
+
+ .codex-editor__redactor{
+ display: flex;
+ flex-wrap: wrap;
+ flex-direction: row;
+ margin: 0px -7px;
+ padding-bottom: 20px !important;
+
+ .ce-block{
+ width: 100%;
+ padding-left: 0;
+ padding-right: 0;
+
+ &.ce-block--selected {
+ .ce-block__content {
+ background-color: inherit;
+ }
+ }
+
+ .ce-block__content {
+ max-width: 100%;
+ height: 100%;
+ padding: 7px;
+
+ &> div {
+ height: 100%;
+ }
+
+ .tune-btn > * {
+ pointer-events: none;
+ }
+
+ .ce-header {
+ padding: 0 !important;
+ margin-bottom: 0 !important;
+ flex: 1;
+ }
+
+ .widget{
+ &.header {
+ display: flex;
+ justify-content: center;
+ flex: 1;
+ padding-left: 15px !important;
+ padding-right: 15px !important;
+ min-height: 50px;
+ box-shadow: none;
+ background-color: var(--control-bg);
+ color: var(--text-muted);
+ }
+
+ &:focus {
+ outline: none;
+ }
+
+ &.new-widget {
+ align-items: inherit;
+ }
+
+ &.ce-paragraph {
+ display: block;
+ }
+
+ .paragraph-control {
+ display: flex;
+ flex-direction: row-reverse;
+ position: absolute;
+ right: 20px;
+ gap: 5px;
+ background-color: var(--card-bg);
+ padding-left: 5px;
+
+ .drag-handle {
+ cursor: all-scroll;
+ cursor: -webkit-grabbing;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ svg {
+ fill: none;
+ }
+
+ .ce-toolbar {
+ svg {
+ fill: currentColor;
+ }
+
+ .icon {
+ stroke: none;
+ width: fit-content;
+ height: fit-content;
+ }
+
+ .ce-settings {
+ width: fit-content;
+
+ .ce-settings__button, .cdx-settings-button {
+ color: #707684;
+ }
+
+ .cdx-settings-button--active {
+ color: #388ae5;
+ }
+
+ .cdx-settings-button.disabled{
+ pointer-events: none;
+ opacity: .5
+ }
+ .cdx-settings-sidebar{
+ position: absolute;
+ right: 100%;
+ top:0;
+ background: #fff;
+ width: 108px;
+ height: 145px;
+ box-shadow: 0 3px 15px -3px rgba(13,20,33,.13);
+ border-radius: 0 4px 4px 0;z-index: 0;
+ }
+ }
+
+ .ce-toolbar__settings-btn {
+ display: none;
+ }
+ }
+
+ .ce-inline-tool, .ce-inline-toolbar__dropdown {
+ .icon {
+ fill: currentColor;
+ }
+ }
+
+ @media (min-width: 1199px) {
+ .ce-toolbar__content {
+ max-width: 930px;
+ }
+ }
+ @media (max-width: 995px) {
+ .ce-toolbar__content {
+ max-width: 760px;
+ }
+ }
+
+ @media (max-width: 1199px) {
+ .ce-block.col-4 {
+ flex: 0 0 50%;
+ max-width: 50%;
+ }
+ }
+
+ @media (max-width: 750px) {
+ .ce-block.col-4 {
+ flex: 0 0 100%;
+ max-width: 100%;
+ }
+ }
+ @media (max-width: 750px) {
+ .ce-block.col-6 {
+ flex: 0 0 100%;
+ max-width: 100%;
+ }
+ }
+
+ }
}
diff --git a/frappe/public/scss/desk/global.scss b/frappe/public/scss/desk/global.scss
index d1205e0e38..333ee30e4d 100644
--- a/frappe/public/scss/desk/global.scss
+++ b/frappe/public/scss/desk/global.scss
@@ -126,6 +126,12 @@ pre {
}
}
+.hidden-xl {
+ @include media-breakpoint-up(lg) {
+ display: none !important;
+ }
+}
+
.visible-xs {
@include media-breakpoint-up(sm) {
display: none !important;
diff --git a/frappe/query_builder/__init__.py b/frappe/query_builder/__init__.py
index 798c34b6cc..f1503c88b8 100644
--- a/frappe/query_builder/__init__.py
+++ b/frappe/query_builder/__init__.py
@@ -1 +1 @@
-from frappe.query_builder.utils import get_query_builder
+from frappe.query_builder.utils import get_query_builder, patch_query_execute
diff --git a/frappe/query_builder/builder.py b/frappe/query_builder/builder.py
index da1533fb1a..1d9b9f0e40 100644
--- a/frappe/query_builder/builder.py
+++ b/frappe/query_builder/builder.py
@@ -7,9 +7,10 @@ class Base:
terms = terms
desc = Order.desc
Schema = Schema
+ Table = Table
@staticmethod
- def Table(table_name: str, *args, **kwargs) -> Table:
+ def DocType(table_name: str, *args, **kwargs) -> Table:
table_name = get_table_name(table_name)
return Table(table_name, *args, **kwargs)
@@ -20,7 +21,7 @@ class MariaDB(Base, MySQLQuery):
@classmethod
def from_(cls, table, *args, **kwargs):
if isinstance(table, str):
- table = cls.Table(table)
+ table = cls.DocType(table)
return super().from_(table, *args, **kwargs)
@@ -50,6 +51,6 @@ class Postgres(Base, PostgreSQLQuery):
table = cls.schema_translation[table._table_name]
elif isinstance(table, str):
- table = cls.Table(table)
+ table = cls.DocType(table)
return super().from_(table, *args, **kwargs)
diff --git a/frappe/query_builder/utils.py b/frappe/query_builder/utils.py
index b52a3606e8..67e2c392f3 100644
--- a/frappe/query_builder/utils.py
+++ b/frappe/query_builder/utils.py
@@ -1,5 +1,6 @@
from enum import Enum
-from typing import Any, Callable, Dict
+from typing import Any, Callable, Dict, get_type_hints
+from importlib import import_module
from pypika import Query
@@ -19,6 +20,9 @@ class ImportMapper:
db = db_type_is(frappe.conf.db_type or "mariadb")
return self.func_map[db](*args, **kwds)
+class BuilderIdentificationFailed(Exception):
+ def __init__(self):
+ super().__init__("Couldn't guess builder")
def get_query_builder(type_of_db: str) -> Query:
"""[return the query builder object]
@@ -32,3 +36,25 @@ def get_query_builder(type_of_db: str) -> Query:
db = db_type_is(type_of_db)
picks = {db_type_is.MARIADB: MariaDB, db_type_is.POSTGRES: Postgres}
return picks[db]
+
+def get_attr(method_string):
+ modulename = '.'.join(method_string.split('.')[:-1])
+ methodname = method_string.split('.')[-1]
+ return getattr(import_module(modulename), methodname)
+
+def patch_query_execute():
+ """Patch the Query Builder with helper execute method
+ This excludes the use of `frappe.db.sql` method while
+ executing the query object
+ """
+
+ def execute_query(query, **kwargs):
+ return frappe.db.sql(query, **kwargs)
+
+ query_class = get_attr(str(frappe.qb).split("'")[1])
+ builder_class = get_type_hints(query_class._builder).get('return')
+
+ if not builder_class:
+ raise BuilderIdentificationFailed
+
+ builder_class.run = execute_query
diff --git a/frappe/search/website_search.py b/frappe/search/website_search.py
index 95bc9b9211..ad9d8c3ba8 100644
--- a/frappe/search/website_search.py
+++ b/frappe/search/website_search.py
@@ -98,7 +98,7 @@ def slugs_with_web_view(_items_to_index):
fields=["route", doctype.website_search_field]
filters={doctype.is_published_field: 1},
if doctype.website_search_field:
- docs = frappe.get_all(doctype.name, filters=filters, fields=fields.append("title"))
+ docs = frappe.get_all(doctype.name, filters=filters, fields=fields + ["title"])
for doc in docs:
content = frappe.utils.md_to_html(getattr(doc, doctype.website_search_field))
soup = BeautifulSoup(content, "html.parser")
diff --git a/frappe/tests/test_query_builder.py b/frappe/tests/test_query_builder.py
index d155dd95db..7a0935a63b 100644
--- a/frappe/tests/test_query_builder.py
+++ b/frappe/tests/test_query_builder.py
@@ -38,9 +38,16 @@ class TestCustomFunctionsPostgres(unittest.TestCase):
class TestBuilderBase(object):
def test_adding_tabs(self):
- self.assertEqual("tabNotes", frappe.qb.Table("Notes").get_sql())
- self.assertEqual("__Auth", frappe.qb.Table("__Auth").get_sql())
+ self.assertEqual("tabNotes", frappe.qb.DocType("Notes").get_sql())
+ self.assertEqual("__Auth", frappe.qb.DocType("__Auth").get_sql())
+ self.assertEqual("Notes", frappe.qb.Table("Notes").get_sql())
+ def test_run_patcher(self):
+ query = frappe.qb.from_("ToDo").select("*").limit(1)
+ data = query.run(as_dict=True)
+ self.assertTrue("run" in dir(query))
+ self.assertIsInstance(query.run, Callable)
+ self.assertIsInstance(data, list)
@run_only_if(db_type_is.MARIADB)
class TestBuilderMaria(unittest.TestCase, TestBuilderBase):
diff --git a/frappe/tests/test_website.py b/frappe/tests/test_website.py
index f1c4f3b3f5..818dc8bce6 100644
--- a/frappe/tests/test_website.py
+++ b/frappe/tests/test_website.py
@@ -280,6 +280,16 @@ class TestWebsite(unittest.TestCase):
frappe.flags.force_website_cache = False
+ def test_safe_render(self):
+ content = get_response_content('/_test/_test_safe_render_on')
+ self.assertNotIn("Safe Render On", content)
+ self.assertIn("frappe.exceptions.ValidationError: Illegal template", content)
+
+ content = get_response_content('/_test/_test_safe_render_off')
+ self.assertIn("Safe Render Off", content)
+ self.assertIn("test.__test", content)
+ self.assertNotIn("frappe.exceptions.ValidationError: Illegal template", content)
+
def set_home_page_hook(key, value):
from frappe import hooks
diff --git a/frappe/utils/global_search.py b/frappe/utils/global_search.py
index 072e3a7c62..be941abd51 100644
--- a/frappe/utils/global_search.py
+++ b/frappe/utils/global_search.py
@@ -442,10 +442,10 @@ def search(text, start=0, limit=20, doctype=""):
elif allowed_doctypes:
query = query.where(global_search.doctype.isin(allowed_doctypes))
- if start > 0:
+ if cint(start) > 0:
query = query.offset(start)
- result = frappe.db.sql(query, as_dict=True)
+ result = query.run(as_dict=True)
results.extend(result)
diff --git a/frappe/website/page_renderers/template_page.py b/frappe/website/page_renderers/template_page.py
index 3ece8ff5d0..cf017be30b 100644
--- a/frappe/website/page_renderers/template_page.py
+++ b/frappe/website/page_renderers/template_page.py
@@ -204,7 +204,12 @@ class TemplatePage(BaseTemplatePage):
if self.template_path.endswith('min.js'):
html = self.source # static
else:
- html = frappe.render_template(self.source, self.context)
+ if self.context.safe_render is not None:
+ safe_render = self.context.safe_render
+ else:
+ safe_render = True
+
+ html = frappe.render_template(self.source, self.context, safe_render=safe_render)
return html
diff --git a/frappe/website/report/website_analytics/website_analytics.py b/frappe/website/report/website_analytics/website_analytics.py
index 6cc0fb7f97..b4e76ba9fd 100644
--- a/frappe/website/report/website_analytics/website_analytics.py
+++ b/frappe/website/report/website_analytics/website_analytics.py
@@ -59,12 +59,12 @@ class WebsiteAnalytics(object):
]
def get_data(self):
- WebPageView = frappe.qb.Table("Web Page View")
+ WebPageView = frappe.qb.DocType("Web Page View")
count_all = Count("*").as_("count")
case = frappe.qb.terms.Case().when(WebPageView.is_unique == "1", "1")
count_is_unique = Count(case).as_("unique_count")
- query = (
+ return (
frappe.qb.from_(WebPageView)
.select("path", count_all, count_is_unique)
.where(
@@ -72,8 +72,7 @@ class WebsiteAnalytics(object):
)
.groupby(WebPageView.path)
.orderby("count", Order=frappe.qb.desc)
- )
- return frappe.db.sql(query)
+ ).run()
def _get_query_for_mariadb(self):
filters_range = self.filters.range
diff --git a/frappe/website/workspace/website/website.json b/frappe/website/workspace/website/website.json
index a2a4a299c4..8d22f84b5e 100644
--- a/frappe/website/workspace/website/website.json
+++ b/frappe/website/workspace/website/website.json
@@ -1,20 +1,20 @@
{
- "category": "Modules",
- "charts": [
- {
- "chart_name": "Website Analytics"
- }
- ],
+ "category": "",
+ "charts": [],
+ "content": "[{\"type\": \"onboarding\", \"data\": {\"onboarding_name\":\"Website\", \"col\": 12}}, {\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Blog Post\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Blogger\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Web Page\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Web Form\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Website Settings\", \"col\": 4}}, {\"type\": \"spacer\", \"data\": {\"col\": 12}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Setup\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Blog\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Web Site\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Portal\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Knowledge Base\", \"col\": 4}}]",
"creation": "2020-03-02 14:13:51.089373",
"developer_mode_only": 0,
"disable_user_customization": 0,
"docstatus": 0,
"doctype": "Workspace",
+ "extends": "",
"extends_another_page": 0,
+ "for_user": "",
"hide_custom": 0,
"icon": "website",
"idx": 0,
- "is_standard": 1,
+ "is_default": 0,
+ "is_standard": 0,
"label": "Website",
"links": [
{
@@ -22,6 +22,7 @@
"icon": "setting",
"is_query_report": 0,
"label": "Setup",
+ "link_count": 0,
"onboard": 0,
"type": "Card Break"
},
@@ -30,6 +31,7 @@
"hidden": 0,
"is_query_report": 0,
"label": "Website Settings",
+ "link_count": 0,
"link_to": "Website Settings",
"link_type": "DocType",
"onboard": 1,
@@ -40,6 +42,7 @@
"hidden": 0,
"is_query_report": 0,
"label": "Website Theme",
+ "link_count": 0,
"link_to": "Website Theme",
"link_type": "DocType",
"onboard": 1,
@@ -50,6 +53,7 @@
"hidden": 0,
"is_query_report": 0,
"label": "Website Script",
+ "link_count": 0,
"link_to": "Website Script",
"link_type": "DocType",
"onboard": 0,
@@ -60,6 +64,7 @@
"hidden": 0,
"is_query_report": 0,
"label": "About Us Settings",
+ "link_count": 0,
"link_to": "About Us Settings",
"link_type": "DocType",
"onboard": 0,
@@ -70,6 +75,7 @@
"hidden": 0,
"is_query_report": 0,
"label": "Contact Us Settings",
+ "link_count": 0,
"link_to": "Contact Us Settings",
"link_type": "DocType",
"onboard": 0,
@@ -80,6 +86,7 @@
"icon": "",
"is_query_report": 0,
"label": "Blog",
+ "link_count": 0,
"onboard": 0,
"type": "Card Break"
},
@@ -88,6 +95,7 @@
"hidden": 0,
"is_query_report": 0,
"label": "Blog Post",
+ "link_count": 0,
"link_to": "Blog Post",
"link_type": "DocType",
"onboard": 1,
@@ -98,6 +106,7 @@
"hidden": 0,
"is_query_report": 0,
"label": "Blogger",
+ "link_count": 0,
"link_to": "Blogger",
"link_type": "DocType",
"onboard": 0,
@@ -108,6 +117,7 @@
"hidden": 0,
"is_query_report": 0,
"label": "Blog Category",
+ "link_count": 0,
"link_to": "Blog Category",
"link_type": "DocType",
"onboard": 0,
@@ -118,6 +128,7 @@
"icon": "website",
"is_query_report": 0,
"label": "Web Site",
+ "link_count": 0,
"onboard": 0,
"type": "Card Break"
},
@@ -126,6 +137,7 @@
"hidden": 0,
"is_query_report": 0,
"label": "Web Page",
+ "link_count": 0,
"link_to": "Web Page",
"link_type": "DocType",
"onboard": 1,
@@ -136,6 +148,7 @@
"hidden": 0,
"is_query_report": 0,
"label": "Web Form",
+ "link_count": 0,
"link_to": "Web Form",
"link_type": "DocType",
"onboard": 1,
@@ -146,6 +159,7 @@
"hidden": 0,
"is_query_report": 0,
"label": "Website Sidebar",
+ "link_count": 0,
"link_to": "Website Sidebar",
"link_type": "DocType",
"onboard": 0,
@@ -156,6 +170,7 @@
"hidden": 0,
"is_query_report": 0,
"label": "Website Slideshow",
+ "link_count": 0,
"link_to": "Website Slideshow",
"link_type": "DocType",
"onboard": 0,
@@ -166,6 +181,7 @@
"hidden": 0,
"is_query_report": 0,
"label": "Website Route Meta",
+ "link_count": 0,
"link_to": "Website Route Meta",
"link_type": "DocType",
"onboard": 0,
@@ -176,6 +192,7 @@
"icon": "website",
"is_query_report": 0,
"label": "Portal",
+ "link_count": 0,
"onboard": 0,
"type": "Card Break"
},
@@ -184,6 +201,7 @@
"hidden": 0,
"is_query_report": 0,
"label": "Portal Settings",
+ "link_count": 0,
"link_to": "Portal Settings",
"link_type": "DocType",
"onboard": 1,
@@ -194,6 +212,7 @@
"icon": "project",
"is_query_report": 0,
"label": "Knowledge Base",
+ "link_count": 0,
"onboard": 0,
"type": "Card Break"
},
@@ -202,6 +221,7 @@
"hidden": 0,
"is_query_report": 0,
"label": "Help Category",
+ "link_count": 0,
"link_to": "Help Category",
"link_type": "DocType",
"onboard": 0,
@@ -212,20 +232,26 @@
"hidden": 0,
"is_query_report": 0,
"label": "Help Article",
+ "link_count": 0,
"link_to": "Help Article",
"link_type": "DocType",
"onboard": 0,
"type": "Link"
}
],
- "modified": "2020-12-01 13:38:39.556588",
+ "modified": "2021-08-05 12:16:03.154032",
"modified_by": "Administrator",
"module": "Website",
"name": "Website",
"onboarding": "Website",
"owner": "Administrator",
+ "parent_page": "",
"pin_to_bottom": 0,
"pin_to_top": 0,
+ "public": 1,
+ "restrict_to_domain": "",
+ "roles": [],
+ "sequence_id": 28,
"shortcuts": [
{
"color": "Green",
@@ -261,5 +287,6 @@
"link_to": "Website Settings",
"type": "DocType"
}
- ]
+ ],
+ "title": "Website"
}
\ No newline at end of file
diff --git a/frappe/www/_test/_test_safe_render_off.html b/frappe/www/_test/_test_safe_render_off.html
new file mode 100644
index 0000000000..5ad01d67d5
--- /dev/null
+++ b/frappe/www/_test/_test_safe_render_off.html
@@ -0,0 +1,7 @@
+---
+title: Safe Render Off
+safe_render: false
+---
+
+
{{ title }}
+
test.__test
diff --git a/frappe/www/_test/_test_safe_render_on.html b/frappe/www/_test/_test_safe_render_on.html
new file mode 100644
index 0000000000..d9f02ce081
--- /dev/null
+++ b/frappe/www/_test/_test_safe_render_on.html
@@ -0,0 +1,6 @@
+---
+title: Safe Render On
+---
+
+
{{ title }}
+
test.__test
diff --git a/package.json b/package.json
index c099b14ade..1ddbec178e 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
},
"homepage": "https://frappeframework.com",
"dependencies": {
+ "@editorjs/editorjs": "2.20.0",
"ace-builds": "^1.4.8",
"air-datepicker": "github:frappe/air-datepicker",
"autoprefixer": "^9.8.6",
@@ -30,6 +31,7 @@
"cropperjs": "^1.5.12",
"cssnano": "^5.0.0",
"driver.js": "^0.9.8",
+ "editorjs-undo": "0.1.6",
"express": "^4.17.1",
"fast-deep-equal": "^2.0.1",
"frappe-charts": "^2.0.0-rc13",
@@ -37,6 +39,7 @@
"frappe-gantt": "^0.5.0",
"fuse.js": "^3.4.6",
"highlight.js": "^10.4.1",
+ "html5-qrcode": "^2.0.11",
"jquery": "3.5.0",
"js-sha256": "^0.9.0",
"jsbarcode": "^3.9.0",
diff --git a/yarn.lock b/yarn.lock
index 899e095549..e8f527b7f1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -40,6 +40,14 @@
resolved "https://registry.yarnpkg.com/@deepcode/dcignore/-/dcignore-1.0.2.tgz#39e4a3df7dde8811925330506e4bb3fbf3c288d8"
integrity sha512-DPgxtHuJwBORpqRkPXzzOT+uoPRVJmaN7LR+pmeL6DQM90kj6G6GFUH1i/YpRH8NbML8ZGEDwB9f9u4UwD2pzg==
+"@editorjs/editorjs@2.20.0":
+ version "2.20.0"
+ resolved "https://registry.yarnpkg.com/@editorjs/editorjs/-/editorjs-2.20.0.tgz#1e0dc7e6c1433c34c9d2d3e42153313c2dbb3514"
+ integrity sha512-e6DWi8bMypFhovq9R6cefaDWVfrlVU++Q7ABp79+MxZIuC/SKAW5EtxBbKPL22H/Mc3bJIhZCxOqEl70HBh2yw==
+ dependencies:
+ codex-notifier "^1.1.2"
+ codex-tooltip "^1.0.1"
+
"@nodelib/fs.scandir@2.1.4":
version "2.1.4"
resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69"
@@ -1510,6 +1518,16 @@ code-point-at@^1.0.0:
resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
+codex-notifier@^1.1.2:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/codex-notifier/-/codex-notifier-1.1.2.tgz#a733079185f4c927fa296f1d71eb8753fe080895"
+ integrity sha512-DCp6xe/LGueJ1N5sXEwcBc3r3PyVkEEDNWCVigfvywAkeXcZMk9K41a31tkEFBW0Ptlwji6/JlAb49E3Yrxbtg==
+
+codex-tooltip@^1.0.1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/codex-tooltip/-/codex-tooltip-1.0.2.tgz#81a9d3e2937658c6e5312106b47b9f094ff7be63"
+ integrity sha512-oC+Bu5X/zyhbPydgMSLWKoM/+vkJMqaLWu3Dt/jZgXS3MWK23INwC5DMBrVXZSufAFk0i0SUni38k9rLMyZn/w==
+
color-convert@^1.9.0:
version "1.9.3"
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
@@ -2168,6 +2186,11 @@ ecc-jsbn@~0.1.1:
jsbn "~0.1.0"
safer-buffer "^2.1.0"
+editorjs-undo@0.1.6:
+ version "0.1.6"
+ resolved "https://registry.yarnpkg.com/editorjs-undo/-/editorjs-undo-0.1.6.tgz#823349a1e9a78d8bc68ba8570a2b854063bc804a"
+ integrity sha512-zVHPnBf2mcI8hWT9Eu8H3bGDEcMj4gppXbQjJW11Aa8Kdy2SVBGhM6fS59OUlBsm8iHWLxuoG2NUIfy9Rd30sw==
+
ee-first@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -3183,6 +3206,11 @@ hsla-regex@^1.0.0:
resolved "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz#c1ce7a3168c8c6614033a4b5f7877f3b225f9c38"
integrity sha1-wc56MWjIxmFAM6S194d/OyJfnDg=
+html5-qrcode@^2.0.11:
+ version "2.0.11"
+ resolved "https://registry.yarnpkg.com/html5-qrcode/-/html5-qrcode-2.0.11.tgz#2cc5f63e767be53dd6c6d56b6c4f180a12aa8075"
+ integrity sha512-cCrVOK2yJGPGSTjchqRhkBJIrxvojEwF/pDKLNxmTH1wiAsVc61ZnIqyApIVyNfn5dKRFax70Qpr7pZwbUNiUw==
+
http-cache-semantics@^4.0.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
@@ -5084,9 +5112,9 @@ path-key@^3.1.0:
integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
path-parse@^1.0.6:
- version "1.0.6"
- resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
- integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+ version "1.0.7"
+ resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+ integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
path-to-regexp@0.1.7:
version "0.1.7"