smecontribs/smeserver-vacation
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Thu Oct 02 2025 Brian Read <brianr@koozali.org> 11.0.0-4.sme

Browse Source 
- Make sure that default if no db entry is no vacation message  [SME: 13208]
This commit is contained in:
Brian Read
2025-10-02 11:36:53 +01:00
parent b936943a8f
commit 793fca420c
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
root/usr/share/smanager/lib/SrvMngr/Controller/Uservacations.pm
View File

@@ -57,7 +57,7 @@ sub main {
my $account = $c->session('username'); #TESTING from somewhere ....#$c->param("account"); my $account = $c->session('username'); #TESTING from somewhere ....#$c->param("account");
my $user = $adb->get($account); my $user = $adb->get($account);
my $username = $user->prop("FirstName")." ".$user->prop("LastName"); 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 $EmailVacationFrom = $user->prop('EmailVacationFrom') || '';
my $EmailVacationTo = $user->prop('EmailVacationTo') || ''; my $EmailVacationTo = $user->prop('EmailVacationTo') || '';
$c->stash(account=>$account); $c->stash(account=>$account);
@@ -112,7 +112,7 @@ sub do_display {
my $account = $c->param("account"); my $account = $c->param("account");
my $user = $adb->get($account); my $user = $adb->get($account);
my $username = $user->prop("FirstName")." ".$user->prop("LastName"); 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 $EmailVacationFrom = $user->prop('EmailVacationFrom') || '';
my $EmailVacationTo = $user->prop('EmailVacationTo') || ''; my $EmailVacationTo = $user->prop('EmailVacationTo') || '';
$c->stash(account=>$account); $c->stash(account=>$account);
@@ -235,11 +235,11 @@ sub get_vacation_table
{ {
next if %delegatedVacations and not $delegatedVacations{$user->key}; next if %delegatedVacations and not $delegatedVacations{$user->key};
# make it clearer which uses have vacation # make it clearer which uses have vacation
my $EmailVacation = $user->prop('EmailVacation') || ''; my $EmailVacation = $user->prop('EmailVacation') || 'no';
my $EmailVacationFrom = $user->prop('EmailVacationFrom') || ''; my $EmailVacationFrom = $user->prop('EmailVacationFrom') || '';
my $EmailVacationTo = $user->prop('EmailVacationTo') || ''; my $EmailVacationTo = $user->prop('EmailVacationTo') || '';
my $status = $user->prop('EmailVacation') || ''; my $status = $user->prop('EmailVacation') || 'no';
if ($status eq 'yes') { $status = 'YES'; } else { $status = ''; } if ($status eq 'yes') { $status = 'YES'; } else { $status = 'NO'; }
push @data, push @data,
{ User => $user->key, { User => $user->key,

5
smeserver-vacation.spec
View File

@@ -4,7 +4,7 @@
%define name smeserver-vacation %define name smeserver-vacation
%define version 11.0.0 %define version 11.0.0
%define release 3 %define release 4
Summary: SME Server enhancement to enable vacation messages for users. Summary: SME Server enhancement to enable vacation messages for users.
Name: %{name} Name: %{name}
Version: %{version} 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 enable vacation for themselves and to modify their own message
%changelog %changelog
* Thu Oct 02 2025 Brian Read <brianr@koozali.org> 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 <brianr@koozali.org> 11.0.0-3.sme * Thu Oct 02 2025 Brian Read <brianr@koozali.org> 11.0.0-3.sme
- Fix typo in event template [SME: 13208] - Fix typo in event template [SME: 13208]
- Correct check on debug config for showing route [SME: 13208] - Correct check on debug config for showing route [SME: 13208]