Merge branch 'frappe:develop' into fix-child-relink-attachments
This commit is contained in:
commit
0483c58591
32 changed files with 32911 additions and 22620 deletions
|
|
@ -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."
|
||||
)
|
||||
);
|
||||
},
|
||||
});
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
1981
frappe/locale/ar.po
1981
frappe/locale/ar.po
File diff suppressed because it is too large
Load diff
1983
frappe/locale/bs.po
1983
frappe/locale/bs.po
File diff suppressed because it is too large
Load diff
1979
frappe/locale/cs.po
1979
frappe/locale/cs.po
File diff suppressed because it is too large
Load diff
1979
frappe/locale/da.po
1979
frappe/locale/da.po
File diff suppressed because it is too large
Load diff
1983
frappe/locale/de.po
1983
frappe/locale/de.po
File diff suppressed because it is too large
Load diff
1983
frappe/locale/eo.po
1983
frappe/locale/eo.po
File diff suppressed because it is too large
Load diff
1983
frappe/locale/es.po
1983
frappe/locale/es.po
File diff suppressed because it is too large
Load diff
1981
frappe/locale/fa.po
1981
frappe/locale/fa.po
File diff suppressed because it is too large
Load diff
1983
frappe/locale/fr.po
1983
frappe/locale/fr.po
File diff suppressed because it is too large
Load diff
1983
frappe/locale/hr.po
1983
frappe/locale/hr.po
File diff suppressed because it is too large
Load diff
1983
frappe/locale/hu.po
1983
frappe/locale/hu.po
File diff suppressed because it is too large
Load diff
1983
frappe/locale/id.po
1983
frappe/locale/id.po
File diff suppressed because it is too large
Load diff
1981
frappe/locale/it.po
1981
frappe/locale/it.po
File diff suppressed because it is too large
Load diff
1979
frappe/locale/my.po
1979
frappe/locale/my.po
File diff suppressed because it is too large
Load diff
1983
frappe/locale/nb.po
1983
frappe/locale/nb.po
File diff suppressed because it is too large
Load diff
1983
frappe/locale/nl.po
1983
frappe/locale/nl.po
File diff suppressed because it is too large
Load diff
1979
frappe/locale/pl.po
1979
frappe/locale/pl.po
File diff suppressed because it is too large
Load diff
1981
frappe/locale/pt.po
1981
frappe/locale/pt.po
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
1983
frappe/locale/ru.po
1983
frappe/locale/ru.po
File diff suppressed because it is too large
Load diff
1979
frappe/locale/sl.po
1979
frappe/locale/sl.po
File diff suppressed because it is too large
Load diff
1983
frappe/locale/sr.po
1983
frappe/locale/sr.po
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
1995
frappe/locale/sv.po
1995
frappe/locale/sv.po
File diff suppressed because it is too large
Load diff
1981
frappe/locale/th.po
1981
frappe/locale/th.po
File diff suppressed because it is too large
Load diff
1983
frappe/locale/tr.po
1983
frappe/locale/tr.po
File diff suppressed because it is too large
Load diff
1983
frappe/locale/vi.po
1983
frappe/locale/vi.po
File diff suppressed because it is too large
Load diff
1983
frappe/locale/zh.po
1983
frappe/locale/zh.po
File diff suppressed because it is too large
Load diff
|
|
@ -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) {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue