vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #38192 from sokumon/hide-session

Browse source
This commit is contained in:
Soham Kulkarni 2026-03-24 21:35:06 +05:30 • committed by GitHub
commit 5f73586e63
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 63 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
frappe/public/js/frappe/desk.js
View file

@ -287,6 +287,7 @@ frappe.Application = class Application {
} else {
this.set_as_guest();
}
frappe.ui.toolbar.fetch_session_defaults();
}
setup_workspaces() {
@ -377,7 +378,6 @@ frappe.Application = class Application {
logout() {
var me = this;
me.logged_out = true;
frappe.confirm(__("Are you sure you want to log out?"), function () {
return frappe.call({
method: "logout",
callback: function (r) {
@ -388,7 +388,6 @@ frappe.Application = class Application {
me.redirect_to_login();
},
});
});
}
handle_session_expired() {
frappe.app.redirect_to_login();

3
frappe/public/js/frappe/ui/sidebar/sidebar_header.js
View file

@ -60,6 +60,9 @@ frappe.ui.SidebarHeader = class SidebarHeader {
label: "Session Defaults",
action: "frappe.ui.toolbar.setup_session_defaults()",
is_standard: 1,
condition: function () {
return frappe.boot.session_defaults.length != 0;
},
icon: "sliders-horizontal",
},
{

23
frappe/public/js/frappe/ui/toolbar/toolbar.js
View file

@ -279,13 +279,18 @@ frappe.ui.toolbar.view_website = function () {
website_tab.location = "/index";
};
frappe.ui.toolbar.setup_session_defaults = function () {
let fields = [];
frappe.ui.toolbar.fetch_session_defaults = function () {
frappe.call({
method: "frappe.core.doctype.session_default_settings.session_default_settings.get_session_default_values",
callback: function (data) {
fields = JSON.parse(data.message);
frappe.boot.session_defaults = JSON.parse(data.message);
},
});
};
frappe.ui.toolbar.setup_session_defaults = function () {
let perms = frappe.perm.get_perm("Session Default Settings");
let fields = frappe.boot.session_defaults;
//add settings button only if user is a System Manager or has permission on 'Session Default Settings'
if (frappe.user_roles.includes("System Manager") || perms[0].read == 1) {
fields[fields.length] = {
@ -293,11 +298,7 @@ frappe.ui.toolbar.setup_session_defaults = function () {
fieldtype: "Button",
label: __("Settings"),
click: () => {
frappe.set_route(
"Form",
"Session Default Settings",
"Session Default Settings"
);
frappe.set_route("Form", "Session Default Settings", "Session Default Settings");
},
};
}
@ -324,9 +325,7 @@ frappe.ui.toolbar.setup_session_defaults = function () {
frappe.ui.toolbar.clear_cache();
} else {
frappe.show_alert({
message: __(
"An error occurred while setting Session Defaults"
),
message: __("An error occurred while setting Session Defaults"),
indicator: "red",
});
}
@ -336,6 +335,4 @@ frappe.ui.toolbar.setup_session_defaults = function () {
__("Session Defaults"),
__("Save")
);
},
});
};