From 2379a1c25b2a02a869cc1e33005f20b0415abe6c Mon Sep 17 00:00:00 2001 From: Altahir Hassan Date: Tue, 20 Jan 2026 14:04:18 +0400 Subject: [PATCH] feat: Add support team link to sidebar menu and remove unnecessary console logs --- .../expert_theme/static/src/js/expert_theme_dynamic.js | 1 - .../odex_sidebar_backend_theme2/__manifest__.py | 1 + .../data/system_parameters.xml | 7 +++++++ .../models/res_config_settings.py | 7 ++++++- .../static/src/js/sidebar_css_loader.js | 10 ++++------ .../static/src/js/sidebar_menu.js | 9 +++++++++ .../static/src/xml/sidebar_menu_template.xml | 4 ++-- 7 files changed, 29 insertions(+), 10 deletions(-) create mode 100644 odex30_base/odex_sidebar_backend_theme2/data/system_parameters.xml diff --git a/odex30_base/expert_theme/static/src/js/expert_theme_dynamic.js b/odex30_base/expert_theme/static/src/js/expert_theme_dynamic.js index d3bffc1..a9e86d9 100644 --- a/odex30_base/expert_theme/static/src/js/expert_theme_dynamic.js +++ b/odex30_base/expert_theme/static/src/js/expert_theme_dynamic.js @@ -67,7 +67,6 @@ window.expertThemeApplyColors = async function() { root.style.setProperty(property, value); } }); - console.log('Expert Theme colors applied successfully!'); } } catch (error) { console.error('Error applying Expert Theme colors:', error); diff --git a/odex30_base/odex_sidebar_backend_theme2/__manifest__.py b/odex30_base/odex_sidebar_backend_theme2/__manifest__.py index 9fff9d6..94401df 100644 --- a/odex30_base/odex_sidebar_backend_theme2/__manifest__.py +++ b/odex30_base/odex_sidebar_backend_theme2/__manifest__.py @@ -31,6 +31,7 @@ 'base', ], 'data': [ + 'data/system_parameters.xml', 'views/res_config_settings.xml', ], 'assets': { diff --git a/odex30_base/odex_sidebar_backend_theme2/data/system_parameters.xml b/odex30_base/odex_sidebar_backend_theme2/data/system_parameters.xml new file mode 100644 index 0000000..0b514c6 --- /dev/null +++ b/odex30_base/odex_sidebar_backend_theme2/data/system_parameters.xml @@ -0,0 +1,7 @@ + + + + odex_sidebar_backend_theme2.odex_support_team_link + https://odex.sa/support + + diff --git a/odex30_base/odex_sidebar_backend_theme2/models/res_config_settings.py b/odex30_base/odex_sidebar_backend_theme2/models/res_config_settings.py index 0700a5b..e4a2fda 100644 --- a/odex30_base/odex_sidebar_backend_theme2/models/res_config_settings.py +++ b/odex30_base/odex_sidebar_backend_theme2/models/res_config_settings.py @@ -98,5 +98,10 @@ class ResConfigSettings(models.TransientModel): sidebar_enabled = IrConfigParam.get_param('odex_sidebar_backend_theme2.sidebar_menu_enable') == 'True' sidebar_icon_url = IrConfigParam.get_param('odex_sidebar_backend_theme2.sidebar_menu_icon_url') uncollapsed_sidebar_overlay = IrConfigParam.get_param('odex_sidebar_backend_theme2.uncollapsed_sidebar_overlay') == 'True' + support_team_link = IrConfigParam.get_param('odex_sidebar_backend_theme2.odex_support_team_link') or 'https://odex.sa/support' - return {'sidebar_enabled': sidebar_enabled, 'sidebar_icon_url': sidebar_icon_url, 'uncollapsed_sidebar_overlay': uncollapsed_sidebar_overlay} \ No newline at end of file + return {'sidebar_enabled': sidebar_enabled, + 'sidebar_icon_url': sidebar_icon_url, + 'uncollapsed_sidebar_overlay': uncollapsed_sidebar_overlay, + 'support_team_link': support_team_link + } \ No newline at end of file diff --git a/odex30_base/odex_sidebar_backend_theme2/static/src/js/sidebar_css_loader.js b/odex30_base/odex_sidebar_backend_theme2/static/src/js/sidebar_css_loader.js index d48afe9..5a3e89f 100644 --- a/odex30_base/odex_sidebar_backend_theme2/static/src/js/sidebar_css_loader.js +++ b/odex30_base/odex_sidebar_backend_theme2/static/src/js/sidebar_css_loader.js @@ -19,8 +19,6 @@ export function loadSidebarCSS() { kwargs: {}, } ); - - console.log('Fetched sidebar CSS:', css); if (css && css.trim()) { // Create a style element and inject the CSS @@ -29,7 +27,7 @@ export function loadSidebarCSS() { style.id = 'sidebar-dynamic-css'; style.innerHTML = css; document.head.appendChild(style); - console.log('Sidebar CSS injected successfully'); + console.error('Error loading sidebar CSS:', error); } } catch (error) { console.error('Error loading sidebar CSS:', error); @@ -45,9 +43,9 @@ export function loadSidebarCSS() { } // Initialize on module load -registry.category("web_tour.tours").add("sidebar_css_loader", { - steps: [], -}); +// registry.category("web_tour.tours").add("sidebar_css_loader", { +// steps: [], +// }); // Auto-load CSS on page load loadSidebarCSS(); diff --git a/odex30_base/odex_sidebar_backend_theme2/static/src/js/sidebar_menu.js b/odex30_base/odex_sidebar_backend_theme2/static/src/js/sidebar_menu.js index 71c3b62..cca769f 100644 --- a/odex30_base/odex_sidebar_backend_theme2/static/src/js/sidebar_menu.js +++ b/odex30_base/odex_sidebar_backend_theme2/static/src/js/sidebar_menu.js @@ -24,6 +24,7 @@ export class SidebarMenu extends Component { sidebarEnabled: false, sidebarMenuIconUrl: null, overlayEnabled: false, + supportTeamLink: null, }); this.loadSidebarSetting() @@ -48,6 +49,12 @@ export class SidebarMenu extends Component { if (actionManager) actionManager.style.marginInlineStart = '90px'; if (mainNavbar) mainNavbar.style.marginInlineStart = '90px'; } + + if (!isOpen) { + // If sidebar is closed, remove margin + if (actionManager) actionManager.style.marginInlineStart = '0px'; + if (mainNavbar) mainNavbar.style.marginInlineStart = '0px'; + } }; // Use useEffect to monitor changes in open and collapse states @@ -125,6 +132,8 @@ export class SidebarMenu extends Component { // Load overlay setting this.state.overlayEnabled = result.uncollapsed_sidebar_overlay === true || result.uncollapsed_sidebar_overlay === 'True'; + // Load support team link + this.state.supportTeamLink = result.support_team_link || 'https://odex.sa/support'; } catch (error) { console.error('Error loading sidebar setting:', error); // Default to enabled if setting cannot be loaded diff --git a/odex30_base/odex_sidebar_backend_theme2/static/src/xml/sidebar_menu_template.xml b/odex30_base/odex_sidebar_backend_theme2/static/src/xml/sidebar_menu_template.xml index a91ffa1..331ba80 100644 --- a/odex30_base/odex_sidebar_backend_theme2/static/src/xml/sidebar_menu_template.xml +++ b/odex30_base/odex_sidebar_backend_theme2/static/src/xml/sidebar_menu_template.xml @@ -36,7 +36,7 @@
- Support + Support @@ -45,7 +45,7 @@