-
-
- 
- ${__("No Data")}
+
- ${__("No Data")}
+
+
diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js
index 65f7be3dd1..4a30ad68e0 100644
--- a/frappe/public/js/frappe/form/grid_row.js
+++ b/frappe/public/js/frappe/form/grid_row.js
@@ -254,7 +254,7 @@ export default class GridRow {
).appendTo(this.row);
this.row_index = $(
- `
+
+
+
+
+
+ ${__("No Data")}
+
+ ${__("No Data")}
+
+ `
-
${txt}
`
)
@@ -268,7 +268,7 @@ export default class GridRow {
this.row_check = $(``).appendTo(this.row);
this.row_index = $(
- `
+ `
`
).appendTo(this.row);
@@ -327,7 +327,7 @@ export default class GridRow {
if (this.doc && !this.grid.df.in_place_edit) {
// remove row
if (!this.open_form_button) {
- this.open_form_button = $('').appendTo(this.row);
+ this.open_form_button = $('').appendTo(this.row);
if (!this.configure_columns) {
this.open_form_button = $(`
@@ -356,7 +356,7 @@ export default class GridRow {
if (this.configure_columns && this.frm) {
this.configure_columns_button = $(`
-
-
+
`)
@@ -366,7 +366,7 @@ export default class GridRow {
});
} else if (this.configure_columns && !this.frm) {
this.configure_columns_button = $(`
-
+
`).appendTo(this.row);
}
}
@@ -688,7 +688,7 @@ export default class GridRow {
if (this.show_search) {
// last empty column
- $(``).appendTo(this.row);
+ $(``).appendTo(this.row);
}
}
@@ -835,6 +835,60 @@ export default class GridRow {
: "";
add_class += ["Check"].indexOf(df.fieldtype) !== -1 ? " text-center" : "";
+ let grid;
+ let grid_container;
+
+ let inital_position_x = 0;
+ let start_x = 0;
+ let start_y = 0;
+
+ let input_in_focus = false;
+
+ let vertical = false;
+ let horizontal = false;
+
+ // prevent random layout shifts caused by widgets and on click position elements inside view (UX).
+ function on_input_focus(el) {
+ input_in_focus = true;
+
+ let container_width = grid_container.getBoundingClientRect().width;
+ let container_left = grid_container.getBoundingClientRect().left;
+ let grid_left = parseFloat(grid.style.left);
+ let element_left = el.offset().left;
+ let fieldtype = el.data("fieldtype");
+
+ let offset_right = container_width - (element_left + el.width());
+ let offset_left = 0;
+ let element_screen_x = element_left - container_left;
+ let element_position_x = container_width - (element_left - container_left);
+
+ if (["Date", "Time", "Datetime"].includes(fieldtype)) {
+ offset_left = element_position_x - 220;
+ }
+ if (["Link", "Dynamic Link"].includes(fieldtype)) {
+ offset_left = element_position_x - 250;
+ }
+ if (element_screen_x < 0) {
+ grid.style.left = `${grid_left - element_screen_x}px`;
+ } else if (offset_left < 0) {
+ grid.style.left = `${grid_left + offset_left}px`;
+ } else if (offset_right < 0) {
+ grid.style.left = `${grid_left + offset_right}px`;
+ }
+ }
+
+ // Delay date_picker widget to prevent temparary layout shift (UX).
+ function handle_date_picker() {
+ let date_time_picker = document.querySelectorAll(".datepicker.active")[0];
+
+ date_time_picker.classList.remove("active");
+ date_time_picker.style.width = "220px";
+
+ setTimeout(() => {
+ date_time_picker.classList.add("active");
+ }, 600);
+ }
+
var $col = $(
''
)
@@ -842,15 +896,68 @@ export default class GridRow {
.attr("data-fieldtype", df.fieldtype)
.data("df", df)
.appendTo(this.row)
- .on("click", function () {
- if (frappe.ui.form.editable_row === me) {
- return;
+ // initialize grid for horizontal scroll on mobile devices.
+ .on("touchstart", function (event) {
+ grid_container = $(event.currentTarget).closest(".form-grid-container")[0];
+ grid = $(event.currentTarget).closest(".form-grid")[0];
+
+ grid.style.position != "relative" && $(grid).css("position", "relative");
+ !grid.style.left && $(grid).css("left", 0);
+
+ start_x = event.touches[0].clientX;
+ start_y = event.touches[0].clientY;
+
+ inital_position_x = -parseFloat(grid.style.left || 0) + start_x;
+ })
+ // calculate X and Y movement based on touch events.
+ .on("touchmove", function (event) {
+ if (input_in_focus) return;
+
+ let moved_x;
+ let moved_y;
+
+ if (!horizontal && !vertical) {
+ moved_x = Math.abs(start_x - event.touches[0].clientX);
+ moved_y = Math.abs(start_y - event.touches[0].clientY);
+ }
+
+ if (!vertical && moved_x > 16) {
+ horizontal = true;
+ } else if (!horizontal && moved_y > 16) {
+ vertical = true;
+ }
+ if (horizontal) {
+ event.preventDefault();
+
+ let grid_start = inital_position_x - event.touches[0].clientX;
+ let grid_end = grid.clientWidth - grid_container.clientWidth + 2;
+
+ if (grid_start < 0) {
+ grid_start = 0;
+ } else if (grid_start > grid_end) {
+ grid_start = grid_end;
+ }
+ grid.style.left = `-${grid_start}px`;
+ }
+ })
+ .on("touchend", function () {
+ vertical = false;
+ horizontal = false;
+ })
+ .on("click", function () {
+ if (frappe.ui.form.editable_row !== me) {
+ var out = me.toggle_editable_row();
}
- var out = me.toggle_editable_row();
var col = this;
- setTimeout(function () {
- $(col).find('input[type="Text"]:first').focus();
- }, 500);
+ let first_input_field = $(col).find('input[type="Text"]:first');
+
+ first_input_field.length && on_input_focus(first_input_field);
+
+ first_input_field.trigger("focus");
+ first_input_field.one("blur", () => (input_in_focus = false));
+
+ first_input_field.data("fieldtype") == "Date" && handle_date_picker();
+
return out;
});
@@ -1149,6 +1256,10 @@ export default class GridRow {
return this;
}
show_form() {
+ if (frappe.utils.is_xs()) {
+ $(this.grid.form_grid).css("min-width", "0");
+ $(this.grid.form_grid).css("position", "unset");
+ }
if (!this.grid_form) {
this.grid_form = new GridRowForm({
row: this,
@@ -1187,6 +1298,10 @@ export default class GridRow {
}
}
hide_form() {
+ if (frappe.utils.is_xs()) {
+ $(this.grid.form_grid).css("min-width", "738px");
+ $(this.grid.form_grid).css("position", "relative");
+ }
frappe.dom.unfreeze();
this.row.toggle(true);
if (!frappe.dom.is_element_in_modal(this.row)) {
diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js
index 508d35b462..01bc7cb51d 100644
--- a/frappe/public/js/frappe/form/layout.js
+++ b/frappe/public/js/frappe/form/layout.js
@@ -144,8 +144,16 @@ frappe.ui.form.Layout = class Layout {
fieldname: "__details",
};
let first_tab = this.fields[1].fieldtype === "Tab Break" ? this.fields[1] : null;
+
if (!first_tab) {
- this.fields.splice(1, 0, default_tab);
+ this.fields.splice(0, 0, default_tab);
+ } else {
+ // reshuffle __newname field to accomodate under 1st Tab Break
+ let newname_field = this.fields.find((df) => df.fieldname === "__newname");
+ if (newname_field && newname_field.get_status(this) === "Write") {
+ this.fields.splice(0, 1);
+ this.fields.splice(1, 0, newname_field);
+ }
}
}
diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js
index c8d8000a9e..2bf738d28b 100644
--- a/frappe/public/js/frappe/list/base_list.js
+++ b/frappe/public/js/frappe/list/base_list.js
@@ -196,7 +196,7 @@ frappe.views.BaseList = class BaseList {
Map: "map",
};
- if (frappe.boot.desk_settings.view_switcher) {
+ if (frappe.boot.desk_settings.view_switcher && !this.meta.force_re_route_to_default_view) {
/* @preserve
for translation, don't remove
__("List View") __("Report View") __("Dashboard View") __("Gantt View"),
diff --git a/frappe/public/js/frappe/microtemplate.js b/frappe/public/js/frappe/microtemplate.js
index be1f05177b..4e0bd76601 100644
--- a/frappe/public/js/frappe/microtemplate.js
+++ b/frappe/public/js/frappe/microtemplate.js
@@ -175,6 +175,7 @@ frappe.render_template = function (name, data) {
w.document.write(tree);
w.document.close();
});
+
frappe.render_pdf = function (html, opts = {}) {
//Create a form to place the HTML content
var formData = new FormData();
@@ -197,8 +198,17 @@ frappe.render_pdf = function (html, opts = {}) {
var blob = new Blob([success.currentTarget.response], { type: "application/pdf" });
var objectUrl = URL.createObjectURL(blob);
- //Open report in a new window
- window.open(objectUrl);
+ // Create a hidden a tag to force set report name
+ // https://stackoverflow.com/questions/19327749/javascript-blob-filename-without-link
+ let hidden_a_tag = document.createElement("a");
+ document.body.appendChild(hidden_a_tag);
+ hidden_a_tag.style = "display: none";
+ hidden_a_tag.href = objectUrl;
+ hidden_a_tag.download = opts.report_name || "report.pdf";
+
+ // Open report in a new window
+ hidden_a_tag.click();
+ window.URL.revokeObjectURL(objectUrl);
}
};
xhr.send(formData);
diff --git a/frappe/public/js/frappe/model/model.js b/frappe/public/js/frappe/model/model.js
index 41faa0217c..99553f470c 100644
--- a/frappe/public/js/frappe/model/model.js
+++ b/frappe/public/js/frappe/model/model.js
@@ -349,7 +349,7 @@ $.extend(frappe.model, {
is_tree: function (doctype) {
if (!doctype) return false;
- return frappe.boot.treeviews.indexOf(doctype) != -1;
+ return locals.DocType[doctype] && locals.DocType[doctype].is_tree;
},
is_fresh(doc) {
@@ -754,6 +754,42 @@ $.extend(frappe.model, {
}
return frappe.model.numeric_fieldtypes.includes(fieldtype);
},
+
+ set_default_views_for_doctype(doctype, frm) {
+ frappe.model.with_doctype(doctype, () => {
+ let meta = frappe.get_meta(doctype);
+ let default_views = ["List", "Report", "Dashboard", "Kanban"];
+
+ if (meta.is_calendar_and_gantt && frappe.views.calendar[doctype]) {
+ let views = ["Calendar", "Gantt"];
+ default_views.push(...views);
+ }
+
+ if (meta.is_tree) {
+ default_views.push("Tree");
+ }
+
+ if (frm.doc.image_field) {
+ default_views.push("Image");
+ }
+
+ if (doctype === "Communication" && frappe.boot.email_accounts.length) {
+ default_views.push("Inbox");
+ }
+
+ if (
+ (frm.doc.fields.find((i) => i.fieldname === "latitude") &&
+ frm.doc.fields.find((i) => i.fieldname === "longitude")) ||
+ frm.doc.fields.find(
+ (i) => i.fieldname === "location" && i.fieldtype == "Geolocation"
+ )
+ ) {
+ default_views.push("Map");
+ }
+
+ frm.set_df_property("default_view", "options", default_views);
+ });
+ },
});
// legacy
diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js
index fe09b82377..c453fcad6e 100644
--- a/frappe/public/js/frappe/router.js
+++ b/frappe/public/js/frappe/router.js
@@ -89,6 +89,18 @@ frappe.router = {
"image",
"inbox",
],
+ list_views_route: {
+ list: "List",
+ kanban: "Kanban",
+ report: "Report",
+ calendar: "Calendar",
+ tree: "Tree",
+ gantt: "Gantt",
+ dashboard: "Dashboard",
+ image: "Image",
+ inbox: "Inbox",
+ file: "Home",
+ },
layout_mapped: {},
is_app_route(path) {
@@ -115,7 +127,7 @@ frappe.router = {
}
},
- route() {
+ async route() {
// resolve the route from the URL or hash
// translate it so the objects are well defined
// and render the page as required
@@ -126,22 +138,22 @@ frappe.router = {
if (this.re_route(sub_path)) return;
this.current_sub_path = sub_path;
- this.current_route = this.parse();
+ this.current_route = await this.parse();
this.set_history(sub_path);
this.render();
this.set_title(sub_path);
this.trigger("change");
},
- parse(route) {
+ async parse(route) {
route = this.get_sub_path_string(route).split("/");
if (!route) return [];
route = $.map(route, this.decode_component);
this.set_route_options_from_url();
- return this.convert_to_standard_route(route);
+ return await this.convert_to_standard_route(route);
},
- convert_to_standard_route(route) {
+ async convert_to_standard_route(route) {
// /app/settings = ["Workspaces", "Settings"]
// /app/private/settings = ["Workspaces", "private", "Settings"]
// /app/user = ["List", "User"]
@@ -161,7 +173,7 @@ frappe.router = {
route = ["Workspaces", "private", frappe.workspaces[private_workspace].title];
} else if (this.routes[route[0]]) {
// route
- route = this.set_doctype_route(route);
+ route = await this.set_doctype_route(route);
}
return route;
@@ -174,36 +186,85 @@ frappe.router = {
set_doctype_route(route) {
let doctype_route = this.routes[route[0]];
- // doctype route
- if (route[1]) {
- if (route[2] && route[1] === "view") {
- route = this.get_standard_route_for_list(route, doctype_route);
- } else {
+
+ return frappe.model.with_doctype(doctype_route.doctype).then(() => {
+ // doctype route
+ let meta = frappe.get_meta(doctype_route.doctype);
+
+ if (route[1] && route[1] === "view" && route[2]) {
+ route = this.get_standard_route_for_list(
+ route,
+ doctype_route,
+ meta.force_re_route_to_default_view && meta.default_view
+ ? meta.default_view
+ : null
+ );
+ } else if (route[1] && route[1] !== "view" && !route[2]) {
let docname = route[1];
if (route.length > 2) {
docname = route.slice(1).join("/");
}
route = ["Form", doctype_route.doctype, docname];
+ } else if (frappe.model.is_single(doctype_route.doctype)) {
+ route = ["Form", doctype_route.doctype, doctype_route.doctype];
+ } else if (meta.default_view) {
+ route = [
+ "List",
+ doctype_route.doctype,
+ this.list_views_route[meta.default_view.toLowerCase()],
+ ];
+ } else {
+ route = ["List", doctype_route.doctype, "List"];
}
- } else if (frappe.model.is_single(doctype_route.doctype)) {
- route = ["Form", doctype_route.doctype, doctype_route.doctype];
- } else {
- route = ["List", doctype_route.doctype, "List"];
- }
- // reset the layout to avoid using incorrect views
- this.doctype_layout = doctype_route.doctype_layout;
- return route;
+ // reset the layout to avoid using incorrect views
+ this.doctype_layout = doctype_route.doctype_layout;
+ return route;
+ });
},
- get_standard_route_for_list(route, doctype_route) {
+ get_standard_route_for_list(route, doctype_route, default_view) {
let standard_route;
- if (route[2].toLowerCase() === "tree") {
+ let _route = default_view || route[2] || "";
+
+ if (_route.toLowerCase() === "tree") {
standard_route = ["Tree", doctype_route.doctype];
} else {
- standard_route = ["List", doctype_route.doctype, frappe.utils.to_title_case(route[2])];
+ let new_route = this.list_views_route[_route.toLowerCase()];
+ let re_route = route[2].toLowerCase() !== new_route.toLowerCase();
+
+ if (re_route) {
+ /**
+ * In case of force_re_route, the url of the route should change,
+ * if the _route and route[2] are different, it means there is a default_view
+ * with force_re_route enabled.
+ *
+ * To change the url, to the correct view, the route[2] is changed with default_view
+ *
+ * Eg: If default_view is set to Report with force_re_route enabled and user routes
+ * to List,
+ * route: [todo, view, list]
+ * default_view: report
+ *
+ * replaces the list to report and re-routes to the new route but should be replaced in
+ * the history since the list route should not exist in history as we are rerouting it to
+ * report
+ */
+ frappe.route_flags.replace_route = true;
+
+ route[2] = _route.toLowerCase();
+ this.set_route(route);
+ }
+
+ standard_route = [
+ "List",
+ doctype_route.doctype,
+ this.list_views_route[_route.toLowerCase()],
+ ];
+
// calendar / kanban / dashboard / folder
if (route[3]) standard_route.push(...route.slice(3, route.length));
}
+
return standard_route;
},
@@ -345,6 +406,7 @@ frappe.router = {
} else if (view === "tree") {
new_route = [this.slug(route[1]), "view", "tree"];
}
+
return new_route;
},
diff --git a/frappe/public/js/frappe/ui/toolbar/search_utils.js b/frappe/public/js/frappe/ui/toolbar/search_utils.js
index e3a34b2111..434fb888fc 100644
--- a/frappe/public/js/frappe/ui/toolbar/search_utils.js
+++ b/frappe/public/js/frappe/ui/toolbar/search_utils.js
@@ -208,13 +208,10 @@ frappe.search.utils = {
},
});
}
- if (in_list(frappe.boot.treeviews, item)) {
- out.push(option("Tree", ["Tree", item], 0.05));
- } else {
- out.push(option("List", ["List", item], 0.05));
- if (frappe.model.can_get_report(item)) {
- out.push(option("Report", ["List", item, "Report"], 0.04));
- }
+
+ out.push(option("List", ["List", item], 0.05));
+ if (frappe.model.can_get_report(item)) {
+ out.push(option("Report", ["List", item, "Report"], 0.04));
}
}
}
diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js
index 12c6e12697..3d17e8a8f6 100644
--- a/frappe/public/js/frappe/utils/utils.js
+++ b/frappe/public/js/frappe/utils/utils.js
@@ -1260,20 +1260,12 @@ Object.assign(frappe.utils, {
if (frappe.model.is_single(item.doctype)) {
route = doctype_slug;
} else {
- if (!item.doc_view) {
- if (frappe.model.is_tree(item.doctype)) {
- item.doc_view = "Tree";
- } else {
- item.doc_view = "List";
- }
- }
-
switch (item.doc_view) {
case "List":
if (item.filters) {
frappe.route_options = item.filters;
}
- route = doctype_slug;
+ route = `${doctype_slug}/view/list`;
break;
case "Tree":
route = `${doctype_slug}/view/tree`;
@@ -1290,12 +1282,11 @@ Object.assign(frappe.utils, {
case "Calendar":
route = `${doctype_slug}/view/calendar/default`;
break;
+ case "Kanban":
+ route = `${doctype_slug}/view/kanban`;
+ break;
default:
- frappe.throw({
- message: __("Not a valid view:") + item.doc_view,
- title: __("Unknown View"),
- });
- route = "";
+ route = doctype_slug;
}
}
} else if (type === "report") {
diff --git a/frappe/public/js/frappe/views/breadcrumbs.js b/frappe/public/js/frappe/views/breadcrumbs.js
index f15ef2adc2..5236c21ac2 100644
--- a/frappe/public/js/frappe/views/breadcrumbs.js
+++ b/frappe/public/js/frappe/views/breadcrumbs.js
@@ -143,7 +143,7 @@ frappe.breadcrumbs = {
} else {
let route;
const doctype_route = frappe.router.slug(frappe.router.doctype_layout || doctype);
- if (frappe.boot.treeviews.indexOf(doctype) !== -1) {
+ if (doctype_meta.is_tree) {
let view = frappe.model.user_settings[doctype].last_view || "Tree";
route = `${doctype_route}/view/${view}`;
} else {
diff --git a/frappe/public/js/frappe/views/file/file_view.js b/frappe/public/js/frappe/views/file/file_view.js
index 122be935d7..2c54011e8a 100644
--- a/frappe/public/js/frappe/views/file/file_view.js
+++ b/frappe/public/js/frappe/views/file/file_view.js
@@ -74,7 +74,7 @@ frappe.views.FileView = class FileView extends frappe.views.ListView {
this.page_title = __("File Manager");
const route = frappe.get_route();
- this.current_folder = route.slice(2).join("/");
+ this.current_folder = route.slice(2).join("/") || "Home";
this.filters = [["File", "folder", "=", this.current_folder, true]];
this.order_by = this.view_user_settings.order_by || "file_name asc";
@@ -286,7 +286,7 @@ frappe.views.FileView = class FileView extends frappe.views.ListView {
}
get_breadcrumbs_html() {
- const route = frappe.router.parse();
+ const route = frappe.get_route();
const folders = route.slice(2);
return folders
diff --git a/frappe/public/js/frappe/views/kanban/kanban_view.js b/frappe/public/js/frappe/views/kanban/kanban_view.js
index 677cc5d5e6..7eccd7ebf8 100644
--- a/frappe/public/js/frappe/views/kanban/kanban_view.js
+++ b/frappe/public/js/frappe/views/kanban/kanban_view.js
@@ -9,14 +9,9 @@ frappe.views.KanbanView = class KanbanView extends frappe.views.ListView {
const doctype = route[1];
const user_settings = frappe.get_user_settings(doctype)["Kanban"] || {};
if (!user_settings.last_kanban_board) {
- frappe.msgprint({
- title: __("Error"),
- indicator: "red",
- message: __("Missing parameter Kanban Board Name"),
- });
- frappe.set_route("List", doctype, "List");
- return true;
+ return new frappe.views.KanbanView({ doctype: doctype });
}
+
route.push(user_settings.last_kanban_board);
frappe.set_route(route);
return true;
@@ -28,9 +23,35 @@ frappe.views.KanbanView = class KanbanView extends frappe.views.ListView {
return "Kanban";
}
+ show() {
+ frappe.views.KanbanView.get_kanbans(this.doctype).then((kanbans) => {
+ if (!kanbans.length) {
+ return frappe.views.KanbanView.show_kanban_dialog(this.doctype, true);
+ } else if (kanbans.length && frappe.get_route().length !== 4) {
+ return frappe.views.KanbanView.show_kanban_dialog(this.doctype, true);
+ } else {
+ this.kanbans = kanbans;
+
+ return frappe.run_serially([
+ () => this.show_skeleton(),
+ () => this.fetch_meta(),
+ () => this.hide_skeleton(),
+ () => this.check_permissions(),
+ () => this.init(),
+ () => this.before_refresh(),
+ () => this.refresh(),
+ ]);
+ }
+ });
+ }
+
setup_defaults() {
return super.setup_defaults().then(() => {
- this.board_name = frappe.get_route()[3];
+ let get_board_name = () => {
+ return this.kanbans.length && this.kanbans[0].name;
+ };
+
+ this.board_name = frappe.get_route()[3] || get_board_name() || null;
this.page_title = __(this.board_name);
this.card_meta = this.get_card_meta();
this.page_length = 0;
@@ -143,21 +164,22 @@ frappe.views.KanbanView = class KanbanView extends frappe.views.ListView {
render() {
const board_name = this.board_name;
- if (this.kanban && board_name === this.kanban.board_name) {
- this.kanban.update(this.data);
- return;
+ if (!this.kanban) {
+ this.kanban = new frappe.views.KanbanBoard({
+ doctype: this.doctype,
+ board: this.board,
+ board_name: board_name,
+ cards: this.data,
+ card_meta: this.card_meta,
+ wrapper: this.$result,
+ cur_list: this,
+ user_settings: this.view_user_settings,
+ });
}
- this.kanban = new frappe.views.KanbanBoard({
- doctype: this.doctype,
- board: this.board,
- board_name: board_name,
- cards: this.data,
- card_meta: this.card_meta,
- wrapper: this.$result,
- cur_list: this,
- user_settings: this.view_user_settings,
- });
+ if (this.kanban && board_name === this.kanban.board_name) {
+ this.kanban.update(this.data);
+ }
}
get_card_meta() {
diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index 8a103f7186..1febf11b6c 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -1383,6 +1383,14 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
layout_direction: frappe.utils.is_rtl() ? "rtl" : "ltr",
});
+ let filter_values = [],
+ name_len = 0;
+ for (var key of Object.keys(applied_filters)) {
+ name_len = name_len + applied_filters[key].toString().length;
+ if (name_len > 200) break;
+ filter_values.push(applied_filters[key]);
+ }
+ print_settings.report_name = `${__(this.report_name)}_${filter_values.join("_")}.pdf`;
frappe.render_pdf(html, print_settings);
}
diff --git a/frappe/public/js/frappe/views/treeview.js b/frappe/public/js/frappe/views/treeview.js
index 96e3bf7227..6cbc02c649 100644
--- a/frappe/public/js/frappe/views/treeview.js
+++ b/frappe/public/js/frappe/views/treeview.js
@@ -37,6 +37,10 @@ frappe.views.TreeFactory = class TreeFactory extends frappe.views.Factory {
let treeview = frappe.views.trees[route[1]];
treeview && treeview.make_tree();
}
+
+ get view_name() {
+ return "Tree";
+ }
};
frappe.views.TreeView = class TreeView {
@@ -196,6 +200,7 @@ frappe.views.TreeView = class TreeView {
});
cur_tree = this.tree;
+ cur_tree.view_name = "Tree";
this.post_render();
}
diff --git a/frappe/public/js/frappe/widgets/widget_dialog.js b/frappe/public/js/frappe/widgets/widget_dialog.js
index b577700715..db7336a883 100644
--- a/frappe/public/js/frappe/widgets/widget_dialog.js
+++ b/frappe/public/js/frappe/widgets/widget_dialog.js
@@ -384,18 +384,22 @@ class ShortcutDialog extends WidgetDialog {
onchange: () => {
if (this.dialog.get_value("type") == "DocType") {
let doctype = this.dialog.get_value("link_to");
- if (doctype && frappe.boot.single_types.includes(doctype)) {
- this.hide_filters();
- } else if (doctype) {
- this.setup_filter(doctype);
- this.show_filters();
- }
+ frappe.model.with_doctype(doctype, () => {
+ let meta = frappe.get_meta(doctype);
- const views = ["List", "Report Builder", "Dashboard", "New"];
- if (frappe.boot.treeviews.includes(doctype)) views.push("Tree");
- if (frappe.boot.calendars.includes(doctype)) views.push("Calendar");
+ if (doctype && frappe.boot.single_types.includes(doctype)) {
+ this.hide_filters();
+ } else if (doctype) {
+ this.setup_filter(doctype);
+ this.show_filters();
+ }
- this.dialog.set_df_property("doc_view", "options", views.join("\n"));
+ const views = ["List", "Report Builder", "Dashboard", "New"];
+ if (meta.is_tree === "Tree") views.push("Tree");
+ if (frappe.boot.calendars.includes(doctype)) views.push("Calendar");
+
+ this.dialog.set_df_property("doc_view", "options", views.join("\n"));
+ });
} else {
this.hide_filters();
}
@@ -405,7 +409,7 @@ class ShortcutDialog extends WidgetDialog {
fieldtype: "Select",
fieldname: "doc_view",
label: "DocType View",
- options: "List\nReport Builder\nDashboard\nTree\nNew\nCalendar",
+ options: "List\nReport Builder\nDashboard\nTree\nNew\nCalendar\nKanban",
description: __(
"Which view of the associated DocType should this shortcut take you to?"
),
diff --git a/frappe/public/scss/common/grid.scss b/frappe/public/scss/common/grid.scss
index 965652ffee..ac15894670 100644
--- a/frappe/public/scss/common/grid.scss
+++ b/frappe/public/scss/common/grid.scss
@@ -268,8 +268,8 @@
.editable-row .frappe-control {
padding-top: 0px !important;
padding-bottom: 0px !important;
- margin-left: -5px !important;
- margin-right: -5px !important;
+ margin-left: -1px !important;
+ margin-right: -1px !important;
}
}
@@ -484,6 +484,31 @@
margin-bottom: 4px;
}
+@media (max-width: map-get($grid-breakpoints, "md")) {
+ .form-grid-container {
+ overflow-x: clip;
+
+ .form-grid {
+ min-width: 738px;
+ }
+ }
+
+ .form-column.col-sm-6 .form-grid {
+ .row-index {
+ display: block;
+ }
+ }
+}
+
+@media (min-width: map-get($grid-breakpoints, "md")) {
+ .form-grid-container {
+ overflow-x: unset!important;
+
+ .form-grid {
+ position: unset!important;
+ }
+ }
+}
@media (max-width: map-get($grid-breakpoints, "sm")) {
.form-in-grid .form-section .form-column {
diff --git a/frappe/share.py b/frappe/share.py
index 711693cd50..2556d1d484 100644
--- a/frappe/share.py
+++ b/frappe/share.py
@@ -13,7 +13,22 @@ from frappe.utils import cint
@frappe.whitelist()
-def add(
+def add(doctype, name, user=None, read=1, write=0, submit=0, share=0, everyone=0, notify=0):
+ """Expose function without flags to the client-side"""
+ return add_docshare(
+ doctype,
+ name,
+ user=user,
+ read=read,
+ write=write,
+ submit=submit,
+ share=share,
+ everyone=everyone,
+ notify=notify,
+ )
+
+
+def add_docshare(
doctype, name, user=None, read=1, write=0, submit=0, share=0, everyone=0, flags=None, notify=0
):
"""Share the given document with a user."""
@@ -66,21 +81,29 @@ def remove(doctype, name, user, flags=None):
@frappe.whitelist()
def set_permission(doctype, name, user, permission_to, value=1, everyone=0):
+ """Expose function without flags to the client-side"""
+ set_docshare_permission(doctype, name, user, permission_to, value=value, everyone=everyone)
+
+
+def set_docshare_permission(doctype, name, user, permission_to, value=1, everyone=0, flags=None):
"""Set share permission."""
- check_share_permission(doctype, name)
+ if not (flags or {}).get("ignore_share_permission"):
+ check_share_permission(doctype, name)
share_name = get_share_name(doctype, name, user, everyone)
value = int(value)
if not share_name:
if value:
- share = add(doctype, name, user, everyone=everyone, **{permission_to: 1})
+ share = add_docshare(doctype, name, user, everyone=everyone, **{permission_to: 1}, flags=flags)
else:
# no share found, nothing to remove
share = {}
pass
else:
share = frappe.get_doc("DocShare", share_name)
+ if flags:
+ share.flags.update(flags)
share.flags.ignore_permissions = True
share.set(permission_to, value)
diff --git a/frappe/tests/test_client.py b/frappe/tests/test_client.py
index 93a2ce93a1..bd80e7d5f3 100644
--- a/frappe/tests/test_client.py
+++ b/frappe/tests/test_client.py
@@ -1,5 +1,7 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+from unittest.mock import patch
+
import frappe
from frappe.tests.utils import FrappeTestCase
@@ -15,12 +17,26 @@ class TestClient(FrappeTestCase):
def test_delete(self):
from frappe.client import delete
+ from frappe.desk.doctype.note.note import Note
- todo = frappe.get_doc(dict(doctype="ToDo", description="description")).insert()
- delete("ToDo", todo.name)
+ note = frappe.get_doc(
+ doctype="Note",
+ title=frappe.generate_hash(length=8),
+ content="test",
+ seen_by=[{"user": "Administrator"}],
+ ).insert()
- self.assertFalse(frappe.db.exists("ToDo", todo.name))
- self.assertRaises(frappe.DoesNotExistError, delete, "ToDo", todo.name)
+ child_row_name = note.seen_by[0].name
+
+ with patch.object(Note, "save") as save:
+ delete("Note Seen By", child_row_name)
+ save.assert_called()
+
+ delete("Note", note.name)
+
+ self.assertFalse(frappe.db.exists("Note", note.name))
+ self.assertRaises(frappe.DoesNotExistError, delete, "Note", note.name)
+ self.assertRaises(frappe.DoesNotExistError, delete, "Note Seen By", child_row_name)
def test_http_valid_method_access(self):
from frappe.client import delete
diff --git a/frappe/tests/test_config.py b/frappe/tests/test_config.py
index d2b1196f52..c7b99dbed3 100644
--- a/frappe/tests/test_config.py
+++ b/frappe/tests/test_config.py
@@ -9,8 +9,6 @@ class TestConfig(FrappeTestCase):
def test_get_modules(self):
frappe_modules = frappe.get_all("Module Def", filters={"app_name": "frappe"}, pluck="name")
all_modules_data = get_modules_from_all_apps_for_user()
- first_module_entry = all_modules_data[0]
all_modules = [x["module_name"] for x in all_modules_data]
- self.assertIn("links", first_module_entry)
self.assertIsInstance(all_modules_data, list)
self.assertFalse([x for x in frappe_modules if x not in all_modules])
diff --git a/frappe/tests/test_document.py b/frappe/tests/test_document.py
index 6080df48d3..cec7ee3bb0 100644
--- a/frappe/tests/test_document.py
+++ b/frappe/tests/test_document.py
@@ -163,6 +163,12 @@ class TestDocument(FrappeTestCase):
self.assertRaises(frappe.ValidationError, d.run_method, "validate")
self.assertRaises(frappe.ValidationError, d.save)
+ def test_db_set_no_query_on_new_docs(self):
+ user = frappe.new_doc("User")
+ user.db_set("user_type", "Magical Wizard")
+ with self.assertQueryCount(0):
+ user.db_set("user_type", "Magical Wizard")
+
def test_update_after_submit(self):
d = self.test_insert()
d.starts_on = "2014-09-09"
diff --git a/frappe/tests/test_search.py b/frappe/tests/test_search.py
index 1137c42ebb..82c2f4c567 100644
--- a/frappe/tests/test_search.py
+++ b/frappe/tests/test_search.py
@@ -3,8 +3,11 @@
import frappe
+from frappe.app import make_form_dict
from frappe.desk.search import get_names_for_mentions, search_link, search_widget
from frappe.tests.utils import FrappeTestCase
+from frappe.utils import set_request
+from frappe.website.serve import get_response
class TestSearch(FrappeTestCase):
@@ -235,3 +238,22 @@ def teardown_test_link_field_order(TestCase):
)
TestCase.tree_doc.delete()
+
+
+class TestWebsiteSearch(FrappeTestCase):
+ def get(self, path, user="Guest"):
+ frappe.set_user(user)
+ set_request(method="GET", path=path)
+ make_form_dict(frappe.local.request)
+ response = get_response()
+ frappe.set_user("Administrator")
+ return response
+
+ def test_basic_search(self):
+
+ no_search = self.get("/search")
+ self.assertEqual(no_search.status_code, 200)
+
+ response = self.get("/search?q=b")
+ self.assertEqual(response.status_code, 200)
+ self.assertIn("Search Results", response.get_data(as_text=True))
diff --git a/frappe/tests/test_website.py b/frappe/tests/test_website.py
index aeb208c5a2..4cd39f4dd5 100644
--- a/frappe/tests/test_website.py
+++ b/frappe/tests/test_website.py
@@ -317,6 +317,22 @@ class TestWebsite(FrappeTestCase):
self.assertIn('', content)
self.assertIn('', content)
+ def test_resolve_class(self):
+ from frappe.utils.jinja_globals import resolve_class
+
+ context = frappe._dict(primary=True)
+ self.assertEqual(resolve_class("test"), "test")
+ self.assertEqual(resolve_class("test", "test-2"), "test test-2")
+ self.assertEqual(resolve_class("test", {"test-2": False, "test-3": True}), "test test-3")
+ self.assertEqual(
+ resolve_class(["test1", "test2", context.primary and "primary"]), "test1 test2 primary"
+ )
+
+ content = 'Test'
+ self.assertEqual(
+ frappe.render_template(content, context), 'Test'
+ )
+
def set_home_page_hook(key, value):
from frappe import hooks
diff --git a/frappe/tests/ui_test_helpers.py b/frappe/tests/ui_test_helpers.py
index cb8fe8e70a..297d9f5b12 100644
--- a/frappe/tests/ui_test_helpers.py
+++ b/frappe/tests/ui_test_helpers.py
@@ -43,16 +43,32 @@ def create_todo_records():
frappe.db.truncate("ToDo")
frappe.get_doc(
- {"doctype": "ToDo", "date": add_to_date(now(), days=7), "description": "this is first todo"}
+ {
+ "doctype": "ToDo",
+ "date": add_to_date(now(), days=7),
+ "description": "this is first todo",
+ }
).insert()
frappe.get_doc(
- {"doctype": "ToDo", "date": add_to_date(now(), days=-7), "description": "this is second todo"}
+ {
+ "doctype": "ToDo",
+ "date": add_to_date(now(), days=-7),
+ "description": "this is second todo",
+ }
).insert()
frappe.get_doc(
- {"doctype": "ToDo", "date": add_to_date(now(), months=2), "description": "this is third todo"}
+ {
+ "doctype": "ToDo",
+ "date": add_to_date(now(), months=2),
+ "description": "this is third todo",
+ }
).insert()
frappe.get_doc(
- {"doctype": "ToDo", "date": add_to_date(now(), months=-2), "description": "this is fourth todo"}
+ {
+ "doctype": "ToDo",
+ "date": add_to_date(now(), months=-2),
+ "description": "this is fourth todo",
+ }
).insert()
@@ -431,3 +447,134 @@ def create_test_user():
user.append("roles", {"role": role})
user.save()
+
+
+@frappe.whitelist()
+def setup_tree_doctype():
+ frappe.delete_doc_if_exists("DocType", "Custom Tree")
+
+ frappe.get_doc(
+ {
+ "doctype": "DocType",
+ "module": "Core",
+ "custom": 1,
+ "fields": [
+ {"fieldname": "tree", "fieldtype": "Data", "label": "Tree"},
+ ],
+ "permissions": [{"role": "System Manager", "read": 1}],
+ "name": "Custom Tree",
+ "is_tree": True,
+ "naming_rule": "By fieldname",
+ "autoname": "field:tree",
+ }
+ ).insert()
+
+ if not frappe.db.exists("Custom Tree", "All Trees"):
+ frappe.get_doc({"doctype": "Custom Tree", "tree": "All Trees"}).insert()
+
+
+@frappe.whitelist()
+def setup_image_doctype():
+ frappe.delete_doc_if_exists("DocType", "Custom Image")
+
+ frappe.get_doc(
+ {
+ "doctype": "DocType",
+ "module": "Core",
+ "custom": 1,
+ "fields": [
+ {"fieldname": "image", "fieldtype": "Attach Image", "label": "Image"},
+ ],
+ "permissions": [{"role": "System Manager", "read": 1}],
+ "name": "Custom Image",
+ "image_field": "image",
+ }
+ ).insert()
+
+
+@frappe.whitelist()
+def setup_inbox():
+ frappe.db.sql("DELETE FROM `tabUser Email`")
+
+ user = frappe.get_doc("User", frappe.session.user)
+ user.append("user_emails", {"email_account": "Email Linking"})
+ user.save()
+
+
+@frappe.whitelist()
+def setup_default_view(view, force_reroute=None):
+ frappe.delete_doc_if_exists("Property Setter", "Event-main-default_view")
+ frappe.delete_doc_if_exists("Property Setter", "Event-main-force_re_route_to_default_view")
+
+ frappe.get_doc(
+ {
+ "is_system_generated": 0,
+ "doctype_or_field": "DocType",
+ "doc_type": "Event",
+ "property": "default_view",
+ "property_type": "Select",
+ "value": view,
+ "doctype": "Property Setter",
+ }
+ ).insert()
+
+ if force_reroute:
+ frappe.get_doc(
+ {
+ "is_system_generated": 0,
+ "doctype_or_field": "DocType",
+ "doc_type": "Event",
+ "property": "force_re_route_to_default_view",
+ "property_type": "Check",
+ "value": "1",
+ "doctype": "Property Setter",
+ }
+ ).insert()
+
+
+@frappe.whitelist()
+def create_note():
+ if not frappe.db.exists("Note", "Routing Test"):
+ frappe.get_doc({"doctype": "Note", "title": "Routing Test"}).insert()
+
+
+@frappe.whitelist()
+def create_kanban():
+ if not frappe.db.exists("Custom Field", "Note-kanban"):
+ frappe.get_doc(
+ {
+ "is_system_generated": 0,
+ "dt": "Note",
+ "label": "Kanban",
+ "fieldname": "kanban",
+ "insert_after": "seen_by",
+ "fieldtype": "Select",
+ "options": "Open\nClosed",
+ "doctype": "Custom Field",
+ }
+ ).insert()
+
+ if not frappe.db.exists("Kanban Board", "_Note _Kanban"):
+ frappe.get_doc(
+ {
+ "doctype": "Kanban Board",
+ "name": "_Note _Kanban",
+ "kanban_board_name": "_Note _Kanban",
+ "reference_doctype": "Note",
+ "field_name": "kanban",
+ "private": 1,
+ "show_labels": 0,
+ "columns": [
+ {
+ "column_name": "Open",
+ "status": "Active",
+ "indicator": "Gray",
+ },
+ {
+ "column_name": "Closed",
+ "status": "Active",
+ "indicator": "Gray",
+ },
+ ],
+ }
+ ).insert()
diff --git a/frappe/tests/utils.py b/frappe/tests/utils.py
index a56fe28d87..8d30284cbd 100644
--- a/frappe/tests/utils.py
+++ b/frappe/tests/utils.py
@@ -69,16 +69,18 @@ class FrappeTestCase(unittest.TestCase):
@contextmanager
def assertQueryCount(self, count):
+ queries = []
+
def _sql_with_count(*args, **kwargs):
- frappe.db.sql_query_count += 1
- return orig_sql(*args, **kwargs)
+ ret = orig_sql(*args, **kwargs)
+ queries.append(frappe.db.last_query)
+ return ret
try:
orig_sql = frappe.db.sql
- frappe.db.sql_query_count = 0
frappe.db.sql = _sql_with_count
yield
- self.assertLessEqual(frappe.db.sql_query_count, count)
+ self.assertLessEqual(len(queries), count, msg="Queries executed: " + "\n\n".join(queries))
finally:
frappe.db.sql = orig_sql
diff --git a/frappe/translations/de.csv b/frappe/translations/de.csv
index 2df384bc43..ed7110467b 100644
--- a/frappe/translations/de.csv
+++ b/frappe/translations/de.csv
@@ -1527,6 +1527,7 @@ Looks like something is wrong with this site's payment gateway configuration. No
Madam,gnädige Frau,
Main Section,Hauptbereich,
"Make ""name"" searchable in Global Search",Machen Sie "name" durchsuchbar in Global Search,
+Make Attachments Public by Default, Anhänge im Standard als öffentlich markieren,
Make use of longer keyboard patterns,Nutzen Sie mehr Tastaturmuster,
Manage Third Party Apps,Verwalten von Apps von Drittanbietern,
Mandatory Information missing:,Pflichtangaben fehlen:,
@@ -4727,8 +4728,12 @@ Copy,Kopieren,
Hide Saved,Gespeicherte ausblenden,
Show Saved,Gespeicherte anzeigen,
{0} created this {1},{0} erstellte dies {1},
+{0} created this,{0} erstellte dies,
+You created this,Sie erstellten dies,
{0} edited this {1},{0} bearbeitete dies {1},
+You edited this {0},Sie bearbeiteten dies {0},
{0} viewed this {1},{0} sah sich dies {1} an,
+You viewed this {0},Sie sahen sich dies {0} an,
Toggle Full Width,Toggle Volle Breite,
Documentation,Dokumentation,
About,Über,
diff --git a/frappe/utils/boilerplate.py b/frappe/utils/boilerplate.py
index f0f3173425..d472f96e56 100644
--- a/frappe/utils/boilerplate.py
+++ b/frappe/utils/boilerplate.py
@@ -136,12 +136,6 @@ def _create_app_boilerplate(dest, hooks, no_git=False):
touch_file(os.path.join(dest, hooks.app_name, hooks.app_name, "patches.txt"))
- with open(os.path.join(dest, hooks.app_name, hooks.app_name, "config", "desktop.py"), "w") as f:
- f.write(frappe.as_unicode(desktop_template.format(**hooks)))
-
- with open(os.path.join(dest, hooks.app_name, hooks.app_name, "config", "docs.py"), "w") as f:
- f.write(frappe.as_unicode(docs_template.format(**hooks)))
-
app_directory = os.path.join(dest, hooks.app_name)
if hooks.create_github_workflow:
@@ -381,18 +375,6 @@ app_license = "{app_license}"
# ]
"""
-desktop_template = """from frappe import _
-
-def get_data():
- return [
- {{
- "module_name": "{app_title}",
- "type": "module",
- "label": _("{app_title}")
- }}
- ]
-"""
-
setup_template = """from setuptools import setup, find_packages
with open("requirements.txt") as f:
@@ -419,21 +401,7 @@ gitignore_template = """.DS_Store
*.egg-info
*.swp
tags
-{app_name}/docs/current
-node_modules/"""
-
-docs_template = '''"""
-Configuration for docs
-"""
-
-# source_link = "https://github.com/[org_name]/{app_name}"
-# headline = "App that does everything"
-# sub_heading = "Yes, you got that right the first time, everything"
-
-def get_context(context):
- context.brand_html = "{app_title}"
-'''
-
+node_modules"""
github_workflow_template = """
name: CI
diff --git a/frappe/utils/file_manager.py b/frappe/utils/file_manager.py
index 875ca10c63..ae53f8d9f7 100644
--- a/frappe/utils/file_manager.py
+++ b/frappe/utils/file_manager.py
@@ -54,19 +54,12 @@ def upload():
comment = {}
if dt and dn:
+ file_url = file_doc.file_url.replace("#", "%23") if file_doc.file_name else file_doc.file_url
+ icon = ' ' if file_doc.is_private else ""
+ file_name = file_doc.file_name or file_doc.file_url
comment = frappe.get_doc(dt, dn).add_comment(
"Attachment",
- _("added {0}").format(
- "{file_name}{icon}".format(
- **{
- "icon": ' ' if file_doc.is_private else "",
- "file_url": file_doc.file_url.replace("#", "%23")
- if file_doc.file_name
- else file_doc.file_url,
- "file_name": file_doc.file_name or file_doc.file_url,
- }
- )
- ),
+ f"{file_name}{icon}",
)
return {
@@ -295,7 +288,7 @@ def remove_file(
ignore_permissions = True
if not file_name:
file_name = frappe.db.get_value("File", fid, "file_name")
- comment = doc.add_comment("Attachment Removed", _("Removed {0}").format(file_name))
+ comment = doc.add_comment("Attachment Removed", file_name)
frappe.delete_doc(
"File", fid, ignore_permissions=ignore_permissions, delete_permanently=delete_permanently
)
diff --git a/frappe/utils/jinja_globals.py b/frappe/utils/jinja_globals.py
index 1265bd4d42..878d96e2bc 100644
--- a/frappe/utils/jinja_globals.py
+++ b/frappe/utils/jinja_globals.py
@@ -2,12 +2,14 @@
# License: MIT. See LICENSE
-def resolve_class(classes):
+def resolve_class(*classes):
+ if classes and len(classes) == 1:
+ classes = classes[0]
+
if classes is None:
return ""
-
- if isinstance(classes, str):
- return classes
+ if classes is False:
+ return ""
if isinstance(classes, (list, tuple)):
return " ".join(resolve_class(c) for c in classes).strip()
diff --git a/frappe/utils/redis_wrapper.py b/frappe/utils/redis_wrapper.py
index 915f792180..e470c83d75 100644
--- a/frappe/utils/redis_wrapper.py
+++ b/frappe/utils/redis_wrapper.py
@@ -218,7 +218,7 @@ class RedisWrapper(redis.Redis):
except redis.exceptions.ConnectionError:
pass
- if value:
+ if value is not None:
value = pickle.loads(value)
frappe.local.cache[_name][key] = value
elif generator:
diff --git a/frappe/website/doctype/blog_category/blog_category.json b/frappe/website/doctype/blog_category/blog_category.json
index a65a7cba29..1c2f535605 100644
--- a/frappe/website/doctype/blog_category/blog_category.json
+++ b/frappe/website/doctype/blog_category/blog_category.json
@@ -8,9 +8,12 @@
"document_type": "Setup",
"engine": "InnoDB",
"field_order": [
- "title",
"published",
- "route"
+ "title",
+ "description",
+ "column_break_4",
+ "route",
+ "preview_image"
],
"fields": [
{
@@ -35,6 +38,20 @@
"label": "Route",
"read_only": 1,
"unique": 1
+ },
+ {
+ "fieldname": "description",
+ "fieldtype": "Small Text",
+ "label": "Description"
+ },
+ {
+ "fieldname": "column_break_4",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "preview_image",
+ "fieldtype": "Attach Image",
+ "label": "Preview Image"
}
],
"has_web_view": 1,
@@ -42,8 +59,15 @@
"idx": 1,
"index_web_pages_for_search": 1,
"is_published_field": "published",
- "links": [],
- "modified": "2020-09-29 10:48:36.886753",
+ "links": [
+ {
+ "group": "Posts",
+ "link_doctype": "Blog Post",
+ "link_fieldname": "blog_category"
+ }
+ ],
+ "make_attachments_public": 1,
+ "modified": "2022-10-18 15:43:39.789982",
"modified_by": "Administrator",
"module": "Website",
"name": "Blog Category",
@@ -71,6 +95,7 @@
"quick_entry": 1,
"sort_field": "modified",
"sort_order": "DESC",
+ "states": [],
"title_field": "title",
"track_changes": 1
}
\ No newline at end of file
diff --git a/frappe/website/doctype/blog_post/blog_post.json b/frappe/website/doctype/blog_post/blog_post.json
index dff5daf752..8b5ab54ba8 100644
--- a/frappe/website/doctype/blog_post/blog_post.json
+++ b/frappe/website/doctype/blog_post/blog_post.json
@@ -94,11 +94,11 @@
"label": "Blog Intro"
},
{
- "default": "Rich Text",
+ "default": "Markdown",
"fieldname": "content_type",
"fieldtype": "Select",
"label": "Content Type",
- "options": "Rich Text\nMarkdown\nHTML",
+ "options": "Markdown\nRich Text\nHTML",
"reqd": 1
},
{
@@ -215,7 +215,7 @@
"is_published_field": "published",
"links": [],
"make_attachments_public": 1,
- "modified": "2022-08-24 07:10:08.620136",
+ "modified": "2022-10-18 10:09:10.550734",
"modified_by": "Administrator",
"module": "Website",
"name": "Blog Post",
diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py
index a3c302e01b..9175ed6246 100644
--- a/frappe/website/doctype/blog_post/blog_post.py
+++ b/frappe/website/doctype/blog_post/blog_post.py
@@ -204,13 +204,19 @@ def get_list_context(context=None):
title=_("Blog"),
)
- category = frappe.utils.escape_html(
+ blog_settings = frappe.get_doc("Blog Settings").as_dict(no_default_fields=True)
+ list_context.update(blog_settings)
+
+ category_name = frappe.utils.escape_html(
frappe.local.form_dict.blog_category or frappe.local.form_dict.category
)
- if category:
- category_title = get_blog_category(category)
- list_context.sub_title = _("Posts filed under {0}").format(category_title)
- list_context.title = category_title
+ if category_name:
+ category = frappe.get_doc("Blog Category", category_name)
+ list_context.blog_introduction = category.description or _("Posts filed under {0}").format(
+ category.title
+ )
+ list_context.blog_title = category.title
+ list_context.preview_image = category.preview_image
elif frappe.local.form_dict.blogger:
blogger = frappe.db.get_value("Blogger", {"name": frappe.local.form_dict.blogger}, "full_name")
@@ -225,12 +231,16 @@ def get_list_context(context=None):
else:
list_context.parents = [{"name": _("Home"), "route": "/"}]
- blog_settings = frappe.get_doc("Blog Settings").as_dict(no_default_fields=True)
- list_context.update(blog_settings)
-
if blog_settings.browse_by_category:
list_context.blog_categories = get_blog_categories()
+ list_context.metatags = {
+ "name": list_context.blog_title,
+ "title": list_context.blog_title,
+ "description": list_context.blog_introduction,
+ "image": list_context.preview_image,
+ }
+
return list_context
@@ -265,10 +275,6 @@ def clear_blog_cache():
clear_cache("writers")
-def get_blog_category(route):
- return frappe.db.get_value("Blog Category", {"name": route}, "title") or route
-
-
def get_blog_list(
doctype, txt=None, filters=None, limit_start=0, limit_page_length=20, order_by=None
):
diff --git a/frappe/website/doctype/blog_post/templates/blog_post_list.html b/frappe/website/doctype/blog_post/templates/blog_post_list.html
index 4cb53d065c..dcc3901d74 100644
--- a/frappe/website/doctype/blog_post/templates/blog_post_list.html
+++ b/frappe/website/doctype/blog_post/templates/blog_post_list.html
@@ -12,29 +12,30 @@
{{ blog_introduction or '' }}
+
{%- if browse_by_category -%}
-
-
+
+
+
+
{%- endif -%}
-
+
{% if not result -%}
{{ no_result_message or _("Nothing to show") }}
@@ -54,10 +55,10 @@
{% block script %}