From 1a8f935431fed1ca292a25888bf10d22acc63d58 Mon Sep 17 00:00:00 2001 From: Brian Read Date: Thu, 12 Jun 2025 18:15:41 +0100 Subject: [PATCH] * Thu Jun 12 2025 Brian Read 11.0.0-89.sme - rework navigation weights to avoid duplicates [SME: 12996] --- root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm | 2 +- root/usr/share/smanager/lib/SrvMngr/Controller/Bugreport.pm | 2 +- root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm | 4 ++-- root/usr/share/smanager/lib/SrvMngr/Controller/Directory.pm | 2 +- .../share/smanager/lib/SrvMngr/Controller/Emailsettings.pm | 2 +- root/usr/share/smanager/lib/SrvMngr/Controller/Logout.pm | 2 +- root/usr/share/smanager/lib/SrvMngr/Controller/Printers.pm | 2 +- root/usr/share/smanager/lib/SrvMngr/Controller/Proxy.pm | 2 +- root/usr/share/smanager/lib/SrvMngr/Controller/Pseudonyms.pm | 2 +- root/usr/share/smanager/lib/SrvMngr/Controller/Quota.pm | 2 +- root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm | 2 +- root/usr/share/smanager/lib/SrvMngr/Controller/Yum.pm | 2 +- smeserver-manager.spec | 5 ++++- 13 files changed, 17 insertions(+), 14 deletions(-) diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm index 6cb8f15..532376b 100644 --- a/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm +++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm @@ -3,7 +3,7 @@ package SrvMngr::Controller::Backup; #---------------------------------------------------------------------- # heading : System # description : Backup or restore -# navigation : 4000 200 +# navigation : 4000 100 # Copyright (C) 2002 Mitel Networks Corporation #---------------------------------------------------------------------- # routes : end diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Bugreport.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Bugreport.pm index 1d5384b..ecf7cb9 100644 --- a/root/usr/share/smanager/lib/SrvMngr/Controller/Bugreport.pm +++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Bugreport.pm @@ -3,7 +3,7 @@ package SrvMngr::Controller::Bugreport; #---------------------------------------------------------------------- # heading : Investigation # description : Report a bug -# navigation : 7000 500 +# navigation : 7000 300 # routes : end #------------------------------ use strict; diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm index 7a806b0..1dece5f 100644 --- a/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm +++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm @@ -3,7 +3,7 @@ package SrvMngr::Controller::Datetime; #---------------------------------------------------------------------- # heading : System # description : Date and time -# navigation : 4000 400 +# navigation : 4000 300 # routes : end #------------------------------ use strict; @@ -361,7 +361,7 @@ sub getYear_list { my $c= shift; my @yearArray; # could use also `/bin/date '+%Y'` - my $start=___YEAR___-40; my $max=___YEAR___+40; + my $start=2025-40; my $max=2025+40; for ( my $i = $start; $i <= $max; $i++ ) { push @yearArray,$i; diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Directory.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Directory.pm index 793f939..a971aaf 100644 --- a/root/usr/share/smanager/lib/SrvMngr/Controller/Directory.pm +++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Directory.pm @@ -3,7 +3,7 @@ package SrvMngr::Controller::Directory; #---------------------------------------------------------------------- # heading : User management # description : Directory -# navigation : 2000 300 +# navigation : 2000 400 # # routes : end #---------------------------------------------------------------------- diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Emailsettings.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Emailsettings.pm index 81f96ed..87f5d61 100644 --- a/root/usr/share/smanager/lib/SrvMngr/Controller/Emailsettings.pm +++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Emailsettings.pm @@ -3,7 +3,7 @@ package SrvMngr::Controller::Emailsettings; #---------------------------------------------------------------------- # heading : System # description : E-mail -# navigation : 4000 500 +# navigation : 4000 400 # # # routes : end diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Logout.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Logout.pm index db005f7..c4975ee 100644 --- a/root/usr/share/smanager/lib/SrvMngr/Controller/Logout.pm +++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Logout.pm @@ -3,7 +3,7 @@ package SrvMngr::Controller::Logout; #---------------------------------------------------------------------- # heading : Current User # description : Logout -# navigation : 1000 900 +# navigation : 1000 1000 # menu : U # # routes : end diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Printers.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Printers.pm index 1e65a0d..412909f 100644 --- a/root/usr/share/smanager/lib/SrvMngr/Controller/Printers.pm +++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Printers.pm @@ -3,7 +3,7 @@ package SrvMngr::Controller::Printers; #---------------------------------------------------------------------- # heading : System # description : Printers -# navigation : 4000 900 +# navigation : 4000 800 # # # routes : end diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Proxy.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Proxy.pm index 2f6829e..cfb3348 100644 --- a/root/usr/share/smanager/lib/SrvMngr/Controller/Proxy.pm +++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Proxy.pm @@ -3,7 +3,7 @@ package SrvMngr::Controller::Proxy; #---------------------------------------------------------------------- # heading : System # description : Proxy settings -# navigation : 4000 800 +# navigation : 4000 200 #---------------------------------------------------------------------- # # routes : end diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Pseudonyms.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Pseudonyms.pm index 1475649..44bd140 100644 --- a/root/usr/share/smanager/lib/SrvMngr/Controller/Pseudonyms.pm +++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Pseudonyms.pm @@ -3,7 +3,7 @@ package SrvMngr::Controller::Pseudonyms; #---------------------------------------------------------------------- # heading : User management # description : Pseudonyms -# navigation : 2000 210 +# navigation : 2000 300 #---------------------------------------------------------------------- # # routes : end diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Quota.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Quota.pm index 5404730..3862aed 100644 --- a/root/usr/share/smanager/lib/SrvMngr/Controller/Quota.pm +++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Quota.pm @@ -3,7 +3,7 @@ package SrvMngr::Controller::Quota; #---------------------------------------------------------------------- # heading : User management # description : Quotas -# navigation : 2000 300 +# navigation : 2000 500 #---------------------------------------------------------------------- # # routes : end diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm index 1d8eb66..8b8f49e 100644 --- a/root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm +++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm @@ -3,7 +3,7 @@ package SrvMngr::Controller::Review; #---------------------------------------------------------------------- # heading : Investigation # description : Review configuration -# navigation : 7000 600 +# navigation : 7000 400 # routes : end #---------------------------------------------------------------------- use strict; diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Yum.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Yum.pm index 404f03e..c484f1c 100644 --- a/root/usr/share/smanager/lib/SrvMngr/Controller/Yum.pm +++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Yum.pm @@ -3,7 +3,7 @@ package SrvMngr::Controller::Yum; #---------------------------------------------------------------------- # heading : System # description : Software installer -# navigation : 4000 300 +# navigation : 4000 500 # # routes : end #---------------------------------------------------------------------- diff --git a/smeserver-manager.spec b/smeserver-manager.spec index 9833237..6785216 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 88 +%define release 89 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -144,6 +144,9 @@ true %defattr(-,root,root) %changelog +* Thu Jun 12 2025 Brian Read 11.0.0-89.sme +- rework navigation weights to avoid duplicates [SME: 12996] + * Mon Jun 09 2025 Jean-Philippe Pialasse 11.0.0-88.sme - add datetime getYear_list [SME: 13031] - use esmith::*DB::UTF8 to access db flat files [SME: 13027]