Merge branch 'frappe:develop' into fix-child-relink-attachments

This commit is contained in:
Shaikh Abdul Mannan 2026-02-24 12:40:09 +05:30 committed by GitHub
commit 0483c58591
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
32 changed files with 32911 additions and 22620 deletions

View file

@ -2,7 +2,11 @@
// For license information, please see license.txt
frappe.ui.form.on("Translation", {
refresh: function () {
//
refresh: function (frm) {
frm.set_intro(
__(
"Translations can be viewed by guests, avoid storing private details in translations."
)
);
},
});

View file

@ -23,7 +23,7 @@
"default": "1",
"fieldname": "enabled",
"fieldtype": "Check",
"label": "Enabled System Notification"
"label": "Enable System Notification"
},
{
"fieldname": "subscribed_documents",
@ -98,7 +98,7 @@
"in_create": 1,
"index_web_pages_for_search": 1,
"links": [],
"modified": "2026-02-17 13:39:35.159083",
"modified": "2026-02-24 11:06:24.112935",
"modified_by": "Administrator",
"module": "Desk",
"name": "Notification Settings",

View file

@ -265,6 +265,10 @@ def run_doc_method(method, docs=None, dt=None, dn=None, arg=None, args=None):
if dt: # not called from a doctype (from a page)
if not dn:
dn = dt # single
if not isinstance(dn, str | int):
frappe.throw("'dn' must be a string or an integer")
doc = frappe.get_doc(dt, dn, check_permission=True)
else:

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -145,7 +145,14 @@ frappe.request.call = function (opts) {
opts.error_callback && opts.error_callback();
},
403: function (xhr) {
if (frappe.session.user === "Guest" && frappe.session.logged_in_user !== "Guest") {
const user_id = document.cookie
.split(";")
.find((c) => c.trim().startsWith("user_id="))
?.split("=")[1];
if (
user_id === "Guest" ||
(frappe.session.user === "Guest" && frappe.session.logged_in_user !== "Guest")
) {
// session expired
frappe.app.handle_session_expired();
} else if (xhr.responseJSON && xhr.responseJSON._error_message) {