From a580a79ab565686971fa38a2447e4c686803f742 Mon Sep 17 00:00:00 2001 From: Brian Read Date: Tue, 23 Apr 2024 09:28:31 +0100 Subject: [PATCH] * Tue Apr 23 2024 Brian Read 11.0.0-4.sme - add in Nav numbers for Legacypanels.pm and ignore it when generating nav menu [SME:12643] --- root/usr/share/smanager/lib/SrvMngr.pm | 2 +- .../usr/share/smanager/lib/SrvMngr/Controller/Legacypanel.pm | 5 +++++ smeserver-manager.spec | 5 ++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/root/usr/share/smanager/lib/SrvMngr.pm b/root/usr/share/smanager/lib/SrvMngr.pm index 30844aa..31c0d7b 100644 --- a/root/usr/share/smanager/lib/SrvMngr.pm +++ b/root/usr/share/smanager/lib/SrvMngr.pm @@ -535,7 +535,7 @@ sub getNavigation { # Determine the directory where the functions are kept #----------------------------------------------------- my $navigation_ctlr_ignore = - "(\.\.?|Swttheme\.pm|Login\.pm|Request\.pm|Modules\.pm(-.*)?)"; + "(\.\.?|Swttheme\.pm|Login\.pm|Request\.pm|Modules\.pm|Legacypanel\.pm(-.*)?)"; # "(\.\.?|Initial\.pm|Manual\.pm|Swttheme\.pm|Request\.pm|Modules\.pm(-.*)?)"; my $navigation_cgi_ignore = "(\.\.?|navigation|noframes|online-manual|(internal|pleasewait)(-.*)?)"; diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Legacypanel.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Legacypanel.pm index 0887641..580243b 100644 --- a/root/usr/share/smanager/lib/SrvMngr/Controller/Legacypanel.pm +++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Legacypanel.pm @@ -1,5 +1,10 @@ package SrvMngr::Controller::Legacypanel; +#---------------------------------------------------------------------- +# heading : Legacy +# description : Legacy panel +# navigation : 99999 9999 +#---------------------------------------------------------------------- #---------------------------------------------------------------------- # name : legacypanel, method : get, url : /legacypanel, ctlact : Legacypanel#main # diff --git a/smeserver-manager.spec b/smeserver-manager.spec index 0f24f0f..00526ee 100644 --- a/smeserver-manager.spec +++ b/smeserver-manager.spec @@ -2,7 +2,7 @@ Summary: Sme server navigation module : manager 2 %define name smeserver-manager Name: %{name} %define version 11.0.0 -%define release 3 +%define release 4 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -108,6 +108,9 @@ true %defattr(-,root,root) %changelog +* Tue Apr 23 2024 Brian Read 11.0.0-4.sme +- add in Nav numbers for Legacypanels.pm and ignore it when generating nav menu [SME:12643] + * Thu Apr 04 2024 Brian Read 11.0.0-3.sme - Set license file to GPL2.0 [SME: 12577]