diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Uservacations.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Uservacations.pm index e9bd663..c6b17f8 100644 --- a/root/usr/share/smanager/lib/SrvMngr/Controller/Uservacations.pm +++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Uservacations.pm @@ -57,7 +57,7 @@ sub main { my $account = $c->session('username'); #TESTING from somewhere ....#$c->param("account"); my $user = $adb->get($account); my $username = $user->prop("FirstName")." ".$user->prop("LastName"); - my $EmailVacation = $user->prop('EmailVacation') || ''; + my $EmailVacation = $user->prop('EmailVacation') || 'no'; my $EmailVacationFrom = $user->prop('EmailVacationFrom') || ''; my $EmailVacationTo = $user->prop('EmailVacationTo') || ''; $c->stash(account=>$account); @@ -112,7 +112,7 @@ sub do_display { my $account = $c->param("account"); my $user = $adb->get($account); my $username = $user->prop("FirstName")." ".$user->prop("LastName"); - my $EmailVacation = $user->prop('EmailVacation') || ''; + my $EmailVacation = $user->prop('EmailVacation') || 'no'; my $EmailVacationFrom = $user->prop('EmailVacationFrom') || ''; my $EmailVacationTo = $user->prop('EmailVacationTo') || ''; $c->stash(account=>$account); @@ -235,11 +235,11 @@ sub get_vacation_table { next if %delegatedVacations and not $delegatedVacations{$user->key}; # make it clearer which uses have vacation - my $EmailVacation = $user->prop('EmailVacation') || ''; + my $EmailVacation = $user->prop('EmailVacation') || 'no'; my $EmailVacationFrom = $user->prop('EmailVacationFrom') || ''; my $EmailVacationTo = $user->prop('EmailVacationTo') || ''; - my $status = $user->prop('EmailVacation') || ''; - if ($status eq 'yes') { $status = 'YES'; } else { $status = ''; } + my $status = $user->prop('EmailVacation') || 'no'; + if ($status eq 'yes') { $status = 'YES'; } else { $status = 'NO'; } push @data, { User => $user->key, diff --git a/smeserver-vacation.spec b/smeserver-vacation.spec index fa4c35d..297d6c2 100644 --- a/smeserver-vacation.spec +++ b/smeserver-vacation.spec @@ -4,7 +4,7 @@ %define name smeserver-vacation %define version 11.0.0 -%define release 3 +%define release 4 Summary: SME Server enhancement to enable vacation messages for users. Name: %{name} Version: %{version} @@ -30,6 +30,9 @@ Optionally provides a user-manager panel where users can enable vacation for themselves and to modify their own message %changelog +* Thu Oct 02 2025 Brian Read 11.0.0-4.sme +- Make sure that default if no db entry is no vacation message [SME: 13208] + * Thu Oct 02 2025 Brian Read 11.0.0-3.sme - Fix typo in event template [SME: 13208] - Correct check on debug config for showing route [SME: 13208]