diff --git a/frappe/public/js/frappe/dom.js b/frappe/public/js/frappe/dom.js
index 5d676259a6..0012759e2a 100644
--- a/frappe/public/js/frappe/dom.js
+++ b/frappe/public/js/frappe/dom.js
@@ -324,8 +324,8 @@ frappe.get_data_pill = (
`);
if (remove_action) {
let remove_btn = $(`
-
- ${frappe.utils.icon("close", "sm", "es-icon")}
+
+ ${frappe.utils.icon("x", "sm")}
`);
if (typeof remove_action === "function") {
diff --git a/frappe/public/js/frappe/form/controls/button.js b/frappe/public/js/frappe/form/controls/button.js
index 41fd49b5af..c4f70c5501 100644
--- a/frappe/public/js/frappe/form/controls/button.js
+++ b/frappe/public/js/frappe/form/controls/button.js
@@ -24,7 +24,7 @@ frappe.ui.form.ControlButton = class ControlButton extends frappe.ui.form.Contro
this.$input = $(
``
)
.prependTo(me.input_area)
diff --git a/frappe/public/js/frappe/form/dashboard.js b/frappe/public/js/frappe/form/dashboard.js
index ddb8ba2e02..55015a5103 100644
--- a/frappe/public/js/frappe/form/dashboard.js
+++ b/frappe/public/js/frappe/form/dashboard.js
@@ -270,6 +270,13 @@ frappe.ui.form.Dashboard = class FormDashboard {
if (d.label == group.label) {
group_added.push(d.label);
group.items.push(...d.items);
+
+ if (d.fieldnames) {
+ if (!group.fieldnames) {
+ group.fieldnames = {};
+ }
+ Object.assign(group.fieldnames, d.fieldnames);
+ }
}
});
});
@@ -335,7 +342,9 @@ frappe.ui.form.Dashboard = class FormDashboard {
// bind new
transactions_area_body.find(".btn-new").on("click", function () {
- me.frm.make_new($(this).attr("data-doctype"));
+ const doctype = $(this).attr("data-doctype");
+ const fieldname = $(this).attr("data-fieldname");
+ me.frm.make_new(doctype, fieldname);
});
this.data_rendered = true;
@@ -369,6 +378,11 @@ frappe.ui.form.Dashboard = class FormDashboard {
let doctype = $link.attr("data-doctype"),
names = $link.attr("data-names") || [];
+ const fieldname =
+ $link.find(".document-link-badge").attr("data-fieldname") ||
+ (this.data.non_standard_fieldnames && this.data.non_standard_fieldnames[doctype]) ||
+ this.data.fieldname;
+
if (
this.internal_links_found &&
this.internal_links_found.find((d) => d.doctype === doctype)
@@ -378,8 +392,8 @@ frappe.ui.form.Dashboard = class FormDashboard {
} else {
return false;
}
- } else if (this.data.fieldname) {
- frappe.route_options = this.get_document_filter(doctype);
+ } else if (fieldname) {
+ frappe.route_options = this.get_document_filter(doctype, fieldname);
if (show_open && frappe.ui.notifications) {
frappe.ui.notifications.show_open_count_list(doctype);
}
@@ -388,13 +402,10 @@ frappe.ui.form.Dashboard = class FormDashboard {
frappe.set_route("List", doctype, "List");
}
- get_document_filter(doctype) {
+ get_document_filter(doctype, fieldname) {
// return the default filter for the given document
// like {"customer": frm.doc.name}
- let filter = {};
- let fieldname = this.data.non_standard_fieldnames
- ? this.data.non_standard_fieldnames[doctype] || this.data.fieldname
- : this.data.fieldname;
+ const filter = {};
if (this.data.dynamic_links && this.data.dynamic_links[fieldname]) {
let dynamic_fieldname = this.data.dynamic_links[fieldname][1];
diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index cefd7e1527..2570864ee3 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -783,6 +783,7 @@ frappe.ui.form.Form = class FrappeForm {
this.show_submit_message();
this.clear_custom_buttons();
this.show_web_link();
+ this.show_report_bug_link();
this.show_workflow_read_only_banner();
}
@@ -1280,6 +1281,17 @@ frappe.ui.form.Form = class FrappeForm {
}
}
+ show_report_bug_link() {
+ if (this.meta.beta) {
+ this.add_web_link(
+ "https://github.com/frappe/" +
+ frappe.boot.module_app[frappe.scrub(this.meta.module)] +
+ "/issues/new",
+ __("Report bug")
+ );
+ }
+ }
+
add_web_link(path, label) {
label = __(label) || __("See on Website");
this.web_link = this.sidebar
@@ -2007,7 +2019,7 @@ frappe.ui.form.Form = class FrappeForm {
}
}
- make_new(doctype) {
+ make_new(doctype, fieldname) {
// make new doctype from the current form
// will handover to `make_methods` if defined
// or will create and match link fields
@@ -2021,7 +2033,7 @@ frappe.ui.form.Form = class FrappeForm {
let new_doc = frappe.model.get_new_doc(doctype, null, null, true);
// set link fields (if found)
- me.set_link_field(doctype, new_doc);
+ me.set_link_field(doctype, new_doc, fieldname);
frappe.ui.form.make_quick_entry(doctype, null, null, new_doc);
// frappe.set_route('Form', doctype, new_doc.name);
@@ -2029,16 +2041,27 @@ frappe.ui.form.Form = class FrappeForm {
}
}
- set_link_field(doctype, new_doc) {
+ set_link_field(doctype, new_doc, fieldname) {
let me = this;
frappe.get_meta(doctype).fields.forEach(function (df) {
- if (df.fieldtype === "Link" && df.options === me.doctype) {
+ const isLinkToParent = df.fieldtype === "Link" && df.options === me.doctype;
+
+ if (fieldname) {
+ if (df.fieldname === fieldname && isLinkToParent) {
+ new_doc[df.fieldname] = me.doc.name;
+ }
+ if (df.fieldtype === "Table" && df.options && df.reqd) {
+ me.set_link_field(df.options, new_doc[df.fieldname][0]);
+ }
+ return;
+ }
+
+ if (isLinkToParent) {
new_doc[df.fieldname] = me.doc.name;
} else if (["Link", "Dynamic Link"].includes(df.fieldtype) && me.doc[df.fieldname]) {
new_doc[df.fieldname] = me.doc[df.fieldname];
} else if (df.fieldtype === "Table" && df.options && df.reqd) {
- let row = new_doc[df.fieldname][0];
- me.set_link_field(df.options, row);
+ me.set_link_field(df.options, new_doc[df.fieldname][0]);
}
});
}
diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js
index c0da70f26e..893d8abe3e 100644
--- a/frappe/public/js/frappe/form/layout.js
+++ b/frappe/public/js/frappe/form/layout.js
@@ -121,7 +121,7 @@ frappe.ui.form.Layout = class Layout {
}
// Add close button to block if not permanent
- const close_message = $(`${frappe.utils.icon("close")}
`);
+ const close_message = $(`${frappe.utils.icon("x")}
`);
if (!permanent) {
close_message.appendTo($html);
close_message.on("click", () => $html.remove());
diff --git a/frappe/public/js/frappe/form/sidebar/assign_to.js b/frappe/public/js/frappe/form/sidebar/assign_to.js
index ce4e0ca995..6b867fdf51 100644
--- a/frappe/public/js/frappe/form/sidebar/assign_to.js
+++ b/frappe/public/js/frappe/form/sidebar/assign_to.js
@@ -285,8 +285,8 @@ frappe.ui.form.AssignmentClass = class AssignmentClass {
const row = $(`
- ${frappe.avatar(assignment)}
- ${frappe.user.full_name(assignment)}
+ ${frappe.avatar(assignment, "avatar-smaller")}
+ ${frappe.user.full_name(assignment)}
@@ -297,8 +297,8 @@ frappe.ui.form.AssignmentClass = class AssignmentClass {
if (assignment === frappe.session.user) {
btn_group.append(`
-
- ${frappe.utils.icon("tick", "xs")}
+
+ ${frappe.utils.icon("check")}
`);
btn_group.find(".complete-btn").click(() => {
@@ -324,7 +324,7 @@ frappe.ui.form.AssignmentClass = class AssignmentClass {
if (assignment === frappe.session.user || this.frm.perm[0].write) {
btn_group.append(`
-
+
${frappe.utils.icon("x")}
`);
diff --git a/frappe/public/js/frappe/form/sidebar/form_sidebar.js b/frappe/public/js/frappe/form/sidebar/form_sidebar.js
index 29f26b76db..907c88b1ad 100644
--- a/frappe/public/js/frappe/form/sidebar/form_sidebar.js
+++ b/frappe/public/js/frappe/form/sidebar/form_sidebar.js
@@ -26,6 +26,7 @@ frappe.ui.form.Sidebar = class {
.appendTo(this.page.sidebar.empty());
this.user_actions = this.sidebar.find(".user-actions");
+ this.user_actions_list = this.sidebar.find(".user-actions-list");
this.image_section = this.sidebar.find(".sidebar-image-section");
this.image_wrapper = this.image_section.find(".sidebar-image-wrapper");
this.make_assignments();
@@ -115,7 +116,6 @@ frappe.ui.form.Sidebar = class {
make_like() {
this.like_wrapper = this.sidebar.find(".liked-by");
this.like_icon = this.sidebar.find(".liked-by .like-icon");
- this.like_count = this.sidebar.find(".liked-by .like-count");
frappe.ui.setup_like_popover(this.sidebar.find(".form-stats-likes"), ".like-icon");
this.like_icon.on("click", () => {
@@ -138,8 +138,6 @@ frappe.ui.form.Sidebar = class {
.toggleClass("liked", liked)
.attr("data-doctype", this.frm.doctype)
.attr("data-name", this.frm.doc.name);
-
- this.like_count && this.like_count.text(JSON.parse(this.frm.doc._liked_by || "[]").length);
}
refresh_web_view_count() {
@@ -245,19 +243,23 @@ frappe.ui.form.Sidebar = class {
}
add_user_action(label, click) {
- return $("")
- .html(label)
- .appendTo(
- $('
').appendTo(
- this.user_actions.removeClass("hidden")
- )
+ const parent = this.user_actions_list.length ? this.user_actions_list : this.user_actions;
+ this.user_actions.removeClass("hidden");
+ const row = $('
').appendTo(parent);
+
+ return $(' ${label}
+ ${frappe.utils.icon("external-link", "sm")} `
)
+ .appendTo(row)
.on("click", click);
}
clear_user_actions() {
this.user_actions.addClass("hidden");
- this.user_actions.find(".user-action-row").remove();
+ const parent = this.user_actions_list.length ? this.user_actions_list : this.user_actions;
+ parent.find(".user-action-row").remove();
}
refresh_image() {}
diff --git a/frappe/public/js/frappe/form/templates/form_links.html b/frappe/public/js/frappe/form/templates/form_links.html
index ed6256eaf0..d5788522d4 100644
--- a/frappe/public/js/frappe/form/templates/form_links.html
+++ b/frappe/public/js/frappe/form/templates/form_links.html
@@ -9,8 +9,9 @@
{% for (let j=0; j < transactions[i].items.length; j++) { %}
{% let doctype = transactions[i].items[j]; %}
+ {% let fieldname = (transactions[i].fieldnames && transactions[i].fieldnames[doctype]) || transactions[i].fieldname; %}
-
+
@@ -19,7 +20,8 @@
{% if !internal_links[doctype] %}
+ data-doctype="{{ doctype }}"
+ data-fieldname="{{ fieldname }}">
{% endif %}
diff --git a/frappe/public/js/frappe/form/templates/form_sidebar.html b/frappe/public/js/frappe/form/templates/form_sidebar.html
index a43117a67d..ba71f85f74 100644
--- a/frappe/public/js/frappe/form/templates/form_sidebar.html
+++ b/frappe/public/js/frappe/form/templates/form_sidebar.html
@@ -1,4 +1,3 @@
-
`);
diff --git a/frappe/public/js/frappe/ui/sidebar/sidebar.html b/frappe/public/js/frappe/ui/sidebar/sidebar.html
index ef5e6d630a..20458ff16d 100644
--- a/frappe/public/js/frappe/ui/sidebar/sidebar.html
+++ b/frappe/public/js/frappe/ui/sidebar/sidebar.html
@@ -40,10 +40,11 @@
Save
+
+ ${banner.title}
+
+ `);
+
+ banner_html.prepend(banner.icon);
+ me.$promotional_banners.append(banner_html);
+ });
+ }
+
remove_onboarding_wrapper() {
this.$onboarding.empty();
this.wrapper.find(".onboarding-sidebar").removeClass("hidden");
+
+ if (!this.sidebar_data?.module_onboarding) {
+ this.wrapper.find(".onboarding-sidebar").addClass("hidden");
+ }
}
setup_onboarding() {
@@ -170,6 +256,7 @@ frappe.ui.Sidebar = class Sidebar {
this.sidebar_header = new frappe.ui.SidebarHeader(this);
this.make_sidebar();
this.add_sidebar_cards();
+ this.setup_promotional_banners();
this.setup_onboarding();
this.wrapper.find(".onboarding-sidebar").click(() => {
diff --git a/frappe/public/js/frappe/ui/user_onboarding/OnboardingPanel.vue b/frappe/public/js/frappe/ui/user_onboarding/OnboardingPanel.vue
index 68150e9744..9ee883cf31 100644
--- a/frappe/public/js/frappe/ui/user_onboarding/OnboardingPanel.vue
+++ b/frappe/public/js/frappe/ui/user_onboarding/OnboardingPanel.vue
@@ -170,6 +170,7 @@ function updateSettings(step) {
};
frappe.set_route("Form", step.reference_document);
+ markComplete(step);
}
async function createEntry(step) {
@@ -234,7 +235,7 @@ function markReset(step) {
-
Getting started
+
{{ __("Getting Started") }}
@@ -263,10 +264,10 @@ function markReset(step) {
- {{ __("Reset all") }}
+ {{ __("Reset All") }}
- Skip all
+ {{ __("Skip All") }}
@@ -305,7 +309,7 @@ function markReset(step) {
class="text-base onb-step-text"
style="text-decoration-line: line-through"
>
- {{ step.action_label }}
+ {{ __(step.action_label) }}
diff --git a/frappe/public/js/frappe/ui/user_onboarding/user_onboarding.bundle.js b/frappe/public/js/frappe/ui/user_onboarding/user_onboarding.bundle.js
index 86a994519e..3ed2215733 100644
--- a/frappe/public/js/frappe/ui/user_onboarding/user_onboarding.bundle.js
+++ b/frappe/public/js/frappe/ui/user_onboarding/user_onboarding.bundle.js
@@ -67,7 +67,7 @@ function addStyles() {
position: fixed;
right: 24px;
bottom: 24px;
- width: 380px;
+ width: 310px;
max-height: 80vh;
background: #fff;
border-radius: 16px;
@@ -215,6 +215,46 @@ function addStyles() {
color: #6b7280;
font-size: 14px;
}
+
+ [data-theme="dark"] .onb-panel {
+ background-color: #232323;
+ color: #e5e7eb;
+ box-shadow: 0 12px 40px rgba(0,0,0,0.6);
+ }
+
+ [data-theme="dark"] .text-base {
+ color: #e5e7eb;
+ }
+
+ [data-theme="dark"] .onb-skip {
+ color: #9ca3af;
+ }
+
+ [data-theme="dark"] .onb-skip:hover {
+ color: #f3f4f6;
+ }
+
+ [data-theme="dark"] .onb-title-steps,
+ [data-theme="dark"] .onb-progress-text {
+ color: #9ca3af;
+ }
+
+ [data-theme="dark"] .onb-group:hover {
+ background: #374151;
+ color: #f3f4f6;
+ }
+
+ [data-theme="dark"] .onb-progress-badge {
+ background: rgba(245,158,11,0.15);
+ color: #fbbf24;
+ }
+
+ [data-theme="dark"] .onb-progress-badge-complete {
+ background: rgba(16,185,129,0.15);
+ color: #34d399;
+ }
+
+
`;
document.head.appendChild(style);
diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js
index bfc1d0ad38..e61e0f3b78 100644
--- a/frappe/public/js/frappe/utils/utils.js
+++ b/frappe/public/js/frappe/utils/utils.js
@@ -1575,7 +1575,8 @@ Object.assign(frappe.utils, {
if (item.is_query_report) {
route = "query-report/" + item.name;
} else if (!item.is_query_report && item.report_ref_doctype) {
- route = frappe.router.slug(item.report_ref_doctype) + "/view/report/";
+ route =
+ frappe.router.slug(item.report_ref_doctype) + "/view/report/" + item.name;
} else {
route = "report/" + item.name;
}
@@ -1909,7 +1910,13 @@ Object.assign(frappe.utils, {
process_filter_expression(filter) {
let filters = [];
- filters = filter ? new Function(`return ${filter}`)() : [];
+ if (filter) {
+ try {
+ filters = JSON.parse(filter);
+ } catch {
+ console.warn("Invalid JSON in filter expression", filter);
+ }
+ }
return this.cleanup_filters(filters);
},
cleanup_filters(filters) {
@@ -2222,4 +2229,16 @@ Object.assign(frappe.utils, {
}
return value;
},
+ get_installed_apps() {
+ return frappe.boot.app_data.map((app) => {
+ return app.app_name;
+ });
+ },
+ is_sub_array(big, small) {
+ let i = 0;
+ for (let num of big) {
+ if (num === small[i]) i++;
+ }
+ return i === small.length;
+ },
});
diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index bfa1706f11..528b5f81a3 100755
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -62,6 +62,7 @@ frappe.views.CommunicationComposer = class {
{
fieldtype: "Button",
label: frappe.utils.icon("down", "xs"),
+ title: __("More Options"),
fieldname: "option_toggle_button",
click: () => {
this.toggle_more_options();
@@ -496,7 +497,11 @@ frappe.views.CommunicationComposer = class {
},
];
- frappe.utils.add_select_group_button(clear_and_add_template, email_template_actions);
+ frappe.utils.add_select_group_button(
+ clear_and_add_template,
+ email_template_actions,
+ "btn-default"
+ );
$(fields.use_html.wrapper).addClass("mt-2 text-center").appendTo(clear_and_add_template);
}
diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js
index 76e6691336..8ecde380be 100644
--- a/frappe/public/js/frappe/views/workspace/workspace.js
+++ b/frappe/public/js/frappe/views/workspace/workspace.js
@@ -493,6 +493,7 @@ frappe.views.Workspace = class Workspace {
let blocks = [
{
type: "header",
+
data: { text: values.title },
},
];
@@ -666,7 +667,6 @@ frappe.views.Workspace = class Workspace {
spacer: this.blocks["spacer"],
HeaderSize: frappe.workspace_block.tunes["header_size"],
};
-
this.editor = new EditorJS({
data: {
blocks: blocks || [],
@@ -676,6 +676,26 @@ frappe.views.Workspace = class Workspace {
readOnly: true,
logLevel: "ERROR",
});
+ if (blocks.length == 0) {
+ let message = __("Welcome to the {0} workspace", [this.page.title]);
+ let default_block = [
+ {
+ type: "header",
+ data: { text: message },
+ },
+ ];
+ if (this.has_access) {
+ default_block.push({
+ type: "paragraph",
+ data: {
+ text: __("Click on {0} to edit", [frappe.utils.icon("ellipsis")]),
+ },
+ });
+ }
+ this.editor.isReady.then(() => {
+ this.editor.render({ blocks: default_block });
+ });
+ }
}
save_page(page) {
diff --git a/frappe/public/scss/common/modal.scss b/frappe/public/scss/common/modal.scss
index 3cb388a3fd..9cd60935c2 100644
--- a/frappe/public/scss/common/modal.scss
+++ b/frappe/public/scss/common/modal.scss
@@ -243,10 +243,6 @@ body.modal-open[style^="padding-right"] {
}
.frappe-control:last-child {
margin-left: 10px;
- button {
- // same as form-control input
- height: calc(1.5em + 0.7rem);
- }
}
}
}
@@ -268,7 +264,19 @@ body.modal-open[style^="padding-right"] {
}
.frappe-control:last-child {
- margin-top: -14px;
+ margin-top: 10px;
+ }
+ }
+}
+
+.modal .frappe-control[data-fieldname="option_toggle_button"] {
+ margin-top: 10px;
+ .form-group {
+ margin-bottom: 0;
+
+ button {
+ width: 28px;
+ height: 28px;
}
}
}
@@ -299,6 +307,9 @@ body.modal-open[style^="padding-right"] {
}
.assignee {
flex: 1;
+ display: flex;
+ gap: 8px;
+ align-items: center;
}
&:hover {
.btn-group {
@@ -306,9 +317,6 @@ body.modal-open[style^="padding-right"] {
transition: opacity 0.1s ease-in-out;
}
}
- .avatar {
- margin-right: var(--margin-md);
- }
}
// Stack minimized modals
diff --git a/frappe/public/scss/desk/avatar.scss b/frappe/public/scss/desk/avatar.scss
index 7fd2a321e2..059518c414 100644
--- a/frappe/public/scss/desk/avatar.scss
+++ b/frappe/public/scss/desk/avatar.scss
@@ -98,6 +98,16 @@
}
}
+.avatar-smaller {
+ width: 22px;
+ height: 22px;
+ text-align: center;
+
+ .standard-image {
+ @include get_textstyle("xs", "regular");
+ }
+}
+
.avatar-medium {
width: 28px;
height: 28px;
diff --git a/frappe/public/scss/desk/form_sidebar.scss b/frappe/public/scss/desk/form_sidebar.scss
index fceffe52d7..02c7411027 100644
--- a/frappe/public/scss/desk/form_sidebar.scss
+++ b/frappe/public/scss/desk/form_sidebar.scss
@@ -20,6 +20,10 @@
flex-wrap: wrap;
color: var(--text-light);
+ .icon {
+ stroke: var(--text-light);
+ }
+
.icon-btn {
height: unset;
}
@@ -38,6 +42,82 @@
}
}
+ .user-actions {
+ display: flex;
+ flex-direction: column;
+ gap: 8px;
+ padding: var(--padding-md);
+
+ .user-actions-list {
+ display: flex;
+ flex-direction: column;
+ gap: 6px;
+ }
+
+ .user-action-row {
+ margin: 0;
+ }
+
+ .user-action-link {
+ display: flex;
+ align-items: center;
+ text-decoration: underline;
+ justify-content: space-between;
+ gap: var(--margin-sm);
+ width: 100%;
+ padding: 4px 8px;
+ margin-left: -6px;
+ margin-right: -8px;
+ border-radius: var(--border-radius-md);
+ transition: background-color 120ms ease;
+
+ &:hover,
+ &:focus-visible {
+ background: var(--subtle-fg);
+ }
+
+ &:focus-visible {
+ outline: none;
+ }
+
+ .user-action-external-icon {
+ display: none;
+ line-height: 0;
+
+ .icon {
+ margin: 0;
+ --icon-stroke: var(--text-muted);
+ }
+ }
+
+ &[target="_blank"] .user-action-external-icon {
+ display: inline-flex;
+ align-items: center;
+ opacity: 0;
+ transform: translateX(-2px);
+ transition: opacity 120ms ease, transform 120ms ease;
+ }
+
+ &[target="_blank"]:hover .user-action-external-icon,
+ &[target="_blank"]:focus-visible .user-action-external-icon {
+ opacity: 1;
+ transform: translateX(0);
+ }
+ }
+
+ .user-action-label {
+ display: block;
+ max-width: 100%;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+ }
+
+ .sidebar-section.user-actions.border-bottom {
+ padding-bottom: 15px;
+ }
+
.form-tags {
.tag-area {
margin-top: -3px;
@@ -141,8 +221,13 @@
}
}
+ .form-title-text {
+ // to match the actions button height for center alignment
+ line-height: 28px;
+ }
+
.form-stats-likes {
- gap: 8px;
+ gap: 2px;
.form-print {
button:hover {
background: var(--btn-default-hover-bg);
@@ -318,30 +403,56 @@ body[data-route^="Form"] {
.attachment-row,
.form-tag-row {
- margin: var(--margin-xs) 0;
- max-width: 100%;
+ margin: 4px 0;
+
.data-pill {
@include get_textstyle("sm", "regular");
justify-content: space-between;
box-shadow: none;
+ display: flex;
+ align-items: center;
+ height: 24px;
+ padding: 0px 6px !important;
+
+ .pill-label {
+ color: inherit !important;
+ }
+
+ .icon {
+ stroke: currentColor;
+ }
}
}
.attachment-row {
+ margin-left: -6px;
+ margin-right: 0px;
+
.data-pill {
+ display: flex;
+ align-items: center;
+ height: 28px;
+ border-radius: var(--border-radius-md);
+ padding: 0px 6px !important;
background-color: unset;
box-shadow: none;
- padding-left: 0px !important;
width: 100%;
+ &:hover,
+ &:focus-within {
+ background-color: var(--subtle-fg);
+ }
+
&:active {
background-color: transparent !important;
box-shadow: none !important;
}
+ > div {
+ gap: 8px;
+ }
+
.attachment-file-label {
display: block;
- margin-left: var(--margin-xs);
- padding-right: var(--padding-xs);
text-align: left;
}
.attachment-icon {
@@ -377,13 +488,58 @@ body[data-route^="Form"] {
.form-attachments,
.form-tags,
.form-shared {
- padding: 8px;
+ padding: var(--padding-sm) var(--padding-md);
}
+
+.form-attachments {
+ // to add gap between attachment section label and attachments
+ // without affecting empty state
+ .attachments-actions + .attachment-row {
+ margin-top: 8px;
+ }
+}
+
+.form-tags {
+ // to add gap between tag section label and tags
+ // without affecting empty state
+ :not(.form-tag-row) + .form-tag-row {
+ margin-top: 8px;
+ }
+}
+
.form-assignments,
.form-shared {
.assignments,
.shares {
- margin: var(--margin-xs) 0px;
+ margin-top: 8px;
+
+ .dialog-assignment-row {
+ display: flex;
+ align-items: center;
+ height: 28px;
+ border-radius: var(--border-radius-md);
+ padding: 0px 6px;
+ margin-left: -8px;
+ margin-right: 0px;
+
+ &:hover,
+ &:focus-within {
+ background-color: var(--subtle-fg);
+ }
+
+ &:not(:last-child) {
+ margin-bottom: 4px;
+ }
+
+ .btn-group {
+ margin-right: -4px;
+ }
+ }
+
+ .view-all-assignment {
+ display: block;
+ margin-top: var(--padding-xs);
+ }
}
}
.add-assignment-btn,
@@ -415,17 +571,43 @@ body[data-route^="Form"] {
}
}
+.liked-by {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ width: 28px;
+ height: 28px;
+}
+
.liked-by-popover {
+ max-width: 240px;
+ border-radius: var(--border-radius-md);
+ box-shadow: var(--shadow-md);
+ overflow: hidden;
+
.popover-body {
- min-height: 30px;
padding: 0px;
+ .liked-by-popover-summary {
+ padding: 4px 10px;
+ margin: 0;
+ color: var(--text-muted);
+ border-bottom: 1px solid var(--subtle-accent);
+ @include get_textstyle("sm", "regular");
+ }
+
ul.list-unstyled {
margin-bottom: 0px;
+ padding: 4px;
li {
- padding: var(--padding-xs) var(--padding-sm);
- margin: 2px;
+ display: flex;
+ align-items: center;
+ gap: var(--padding-xs);
+ padding: var(--padding-xs);
+ margin: 0;
+ border-radius: var(--border-radius-sm);
+ cursor: pointer;
&:hover {
background-color: var(--fg-hover-color);
diff --git a/frappe/public/scss/desk/sidebar.scss b/frappe/public/scss/desk/sidebar.scss
index 739e2c3b16..5f8c479268 100644
--- a/frappe/public/scss/desk/sidebar.scss
+++ b/frappe/public/scss/desk/sidebar.scss
@@ -127,7 +127,15 @@
}
}
- .onboarding-sidebar {
+ .promotional-banners {
+ display: flex;
+ flex-direction: column;
+ gap: 4px;
+ margin: var(--margin-sm) 0;
+ }
+
+ .onboarding-sidebar,
+ .promotional-banner {
text-decoration: none;
font-size: var(--text-sm);
display: flex;
@@ -287,9 +295,8 @@
width: auto;
}
}
- .collapse-sidebar-link {
- display: none;
- }
+ .promotional-banners,
+ .collapse-sidebar-link,
.dropdown-navbar-user {
display: none;
}
diff --git a/frappe/public/scss/desk/timeline.scss b/frappe/public/scss/desk/timeline.scss
index e5de39caf7..20d6f98e13 100644
--- a/frappe/public/scss/desk/timeline.scss
+++ b/frappe/public/scss/desk/timeline.scss
@@ -96,6 +96,11 @@ $threshold: 34;
max-width: var(--timeline-content-max-width);
padding: var(--padding-sm);
margin-left: var(--margin-md);
+
+ > .ql-editor {
+ display: inline-flex;
+ }
+
&.frappe-card {
color: var(--text-neutral);
background-color: var(--bg-color);
diff --git a/frappe/website/js/bootstrap-4.js b/frappe/website/js/bootstrap-4.js
index e525d423b6..b95d42ac6a 100644
--- a/frappe/website/js/bootstrap-4.js
+++ b/frappe/website/js/bootstrap-4.js
@@ -27,7 +27,7 @@ frappe.get_modal = function (title, content) {
diff --git a/frappe/website/page_renderers/not_found_page.py b/frappe/website/page_renderers/not_found_page.py
index 704dca77d1..9b980f5d51 100644
--- a/frappe/website/page_renderers/not_found_page.py
+++ b/frappe/website/page_renderers/not_found_page.py
@@ -2,6 +2,7 @@ import os
from urllib.parse import urlparse
import frappe
+from frappe.website.page_renderers.document_page import _find_matching_document_webview
from frappe.website.page_renderers.template_page import TemplatePage
from frappe.website.utils import can_cache
@@ -26,10 +27,26 @@ class NotFoundPage(TemplatePage):
def can_cache_404(self):
# do not cache 404 for custom homepages
- return can_cache() and self.request_url and not self.is_custom_home_page()
+ # also skip caching docs with website permission checks (access is dynamic)
+ return (
+ can_cache()
+ and self.request_url
+ and not self.is_custom_home_page()
+ and not self.has_website_permission_check()
+ )
def is_custom_home_page(self):
url_parts = urlparse(self.request_url)
request_url = os.path.splitext(url_parts.path)[0]
request_path = os.path.splitext(self.request_path)[0]
return request_url in HOMEPAGE_PATHS and request_path not in HOMEPAGE_PATHS
+
+ def has_website_permission_check(self):
+ request_path = os.path.splitext(self.request_path)[0]
+ if not (document := _find_matching_document_webview(request_path)):
+ return False
+ doctype, docname = document
+ doc = frappe.get_cached_doc(doctype, docname)
+ return hasattr(doc, "has_website_permission") or bool(
+ frappe.get_hooks("has_website_permission", {}).get(doctype)
+ )
diff --git a/frappe/workflow/doctype/workflow_action/workflow_action.py b/frappe/workflow/doctype/workflow_action/workflow_action.py
index 6735fac903..1f972beece 100644
--- a/frappe/workflow/doctype/workflow_action/workflow_action.py
+++ b/frappe/workflow/doctype/workflow_action/workflow_action.py
@@ -207,17 +207,61 @@ def return_action_confirmation_page(doc, action, action_link, alert_doc_change=F
def return_link_expired_page(doc, doc_workflow_state):
+ user_full_name = get_user_who_set_workflow_state(doc, doc_workflow_state) or frappe.get_value(
+ "User", doc.get("modified_by"), "full_name"
+ )
frappe.respond_as_web_page(
_("Link Expired"),
_("Document {0} has been set to state {1} by {2}").format(
frappe.bold(doc.get("name")),
frappe.bold(doc_workflow_state),
- frappe.bold(frappe.get_value("User", doc.get("modified_by"), "full_name")),
+ frappe.bold(
+ user_full_name
+ if user_full_name
+ else frappe.get_value("User", doc.get("modified_by"), "full_name")
+ ),
),
indicator_color="blue",
)
+def get_user_who_set_workflow_state(doc, doc_workflow_state):
+ """Get the full name of the user who triggered the workflow action that set the document to the given state.
+ Falls back to None if no completed Workflow Action is found (e.g. state was set without workflow).
+ """
+ workflow_name = get_workflow_name(doc.get("doctype"))
+ if not workflow_name:
+ return None
+
+ # Get states that have a transition to the current workflow state
+ from_states = frappe.get_all(
+ "Workflow Transition",
+ filters={"parent": workflow_name, "next_state": doc_workflow_state},
+ pluck="state",
+ )
+ if not from_states:
+ return None
+
+ # Find the most recently completed Workflow Action that led to this state
+ WorkflowAction = DocType("Workflow Action")
+ completed_by = (
+ frappe.qb.from_(WorkflowAction)
+ .select(WorkflowAction.completed_by)
+ .where(
+ (WorkflowAction.reference_doctype == doc.get("doctype"))
+ & (WorkflowAction.reference_name == doc.get("name"))
+ & (WorkflowAction.status == "Completed")
+ & (WorkflowAction.workflow_state.isin(from_states))
+ )
+ .orderby(WorkflowAction.modified, order=frappe.qb.desc)
+ .limit(1)
+ ).run()
+
+ if completed_by and completed_by[0][0]:
+ return frappe.get_value("User", completed_by[0][0], "full_name")
+ return None
+
+
def update_completed_workflow_actions(doc, user=None, workflow=None, workflow_state=None):
allowed_roles = get_allowed_roles(user, workflow, workflow_state)
# There is no transaction leading upto this state
diff --git a/frappe/www/printview.html b/frappe/www/printview.html
index c3c557c8e4..17e6380baa 100644
--- a/frappe/www/printview.html
+++ b/frappe/www/printview.html
@@ -18,7 +18,7 @@
{{ _("Print") }}
+ href="/api/method/frappe.utils.print_format.download_pdf?doctype={{doctype|e}}&name={{name|e}}&format={{print_format|e}}&letterhead={{letterhead|e}}&no_letterhead={{no_letterhead|e}}&_lang={{lang|e}}&key={{key|e}}&pdf_generator={{pdf_generator|e}}">
{{ _('Get PDF') }}