diff --git a/root/usr/share/smanager/lib/SrvMngr/Model/Main.pm b/root/usr/share/smanager/lib/SrvMngr/Model/Main.pm index f5498b0..cd8c735 100644 --- a/root/usr/share/smanager/lib/SrvMngr/Model/Main.pm +++ b/root/usr/share/smanager/lib/SrvMngr/Model/Main.pm @@ -43,8 +43,9 @@ sub init_data { sub reconf_needed { my $cdb = esmith::ConfigDB->open_ro() or die("can't open Config DB"); - my $unsafe = ($cdb->get('bootstrap-console') and $cdb->get('bootstrap-console')->prop('Run') eq 'yes') || - ($cdb->get('UnsavedChanges') and $cdb->get('UnsavedChanges')->value eq 'yes') || '0'; + #my $unsafe = ($cdb->get('bootstrap-console') and $cdb->get('bootstrap-console')->prop('Run') eq 'yes') || + # ($cdb->get('UnsavedChanges') and $cdb->get('UnsavedChanges')->value eq 'yes') || '0'; + my $unsafe = ($cdb->get('UnsavedChanges') and $cdb->get('UnsavedChanges')->value eq 'yes') || '0'; return $unsafe; } @@ -104,5 +105,4 @@ sub check_adminalias { } -1; - +1; \ No newline at end of file diff --git a/root/usr/share/smanager/themes/default/templates/partials/_footer.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_footer.html.ep index a509bae..fd7cdea 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_footer.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_footer.html.ep @@ -4,9 +4,11 @@ % if ( $c->is_logged_in ) { SME Server <%= session 'releaseVersion' %>-<%= $c->app->VERSION %> Manager II - (Mojo:<%= Mojolicious->VERSION %>) + % my $mode; + % if (config->{mode} == 'development'){ $mode = '-dev';} else { $mode = '';} + (Mojo:<%= Mojolicious->VERSION %><%= $mode %>) % }
Copyright 1999-2006 Mitel Corporation
%= session 'copyRight'
Copyright (c) 2013-2024 Koozali Foundation Inc.
-
+ \ No newline at end of file diff --git a/smeserver-manager.spec b/smeserver-manager.spec index 154ed54..80997a4 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 45 +%define release 46 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -143,6 +143,10 @@ true %defattr(-,root,root) %changelog +* Tue Jan 28 2025 Brian Read 11.0.0-46.sme +- Adjust conditions for showing "Reconfigure required" to only check UnSavedChanges DB entry [SME: 12891] +- Add indication of developement mode in footer + * Sat Jan 25 2025 Brian Read 11.0.0-45.sme - Add some space in the reboot/reconf/shutdown panel [SME: ] - Add check for 15 characters netbios name in workgroup panel [SME: ] @@ -1363,4 +1367,4 @@ true * Tue Mar 14 2000 Charlie Brady Wed Mar 14 2000 --> Wed Mar 08 2000 or Tue Mar 14 2000 or Wed Mar 15 2000 or .... -- initial release \ No newline at end of file +- initial release