From 216f081c1a854e10651587f4c35b5af288d31733 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Mon, 30 Sep 2024 19:49:22 +0200 Subject: [PATCH 1/3] #339 added comment field --- lam/HISTORY | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lam/HISTORY b/lam/HISTORY index cc652fb15..d06056966 100644 --- a/lam/HISTORY +++ b/lam/HISTORY @@ -1,6 +1,8 @@ December 2024 9.0 - Group of (unique) names, organisational roles: added member/owner count to PDF fields - Usability improvements (350) + - LAM Pro: + -> Request access: added rejection reason - Fixed bugs: -> Windows: show more than 1000 LDAP entries when paged results is activated in server profile From bccd4d239042f8abce3983f8e226ef503d45bb88 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Fri, 4 Oct 2024 19:47:30 +0200 Subject: [PATCH 2/3] #339 added comment fields --- lam/lib/persistence.inc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lam/lib/persistence.inc b/lam/lib/persistence.inc index e12ac2e57..e27c97a8b 100644 --- a/lam/lib/persistence.inc +++ b/lam/lib/persistence.inc @@ -405,6 +405,9 @@ class ConfigDataImporter { if (isset($value['historicRequests'])) { $mainStep->addSubStep(new ImporterStep(_('Request history'), 'requestAccess_historicRequests', $value['historicRequests'])); } + if (isset($value['expirations'])) { + $mainStep->addSubStep(new ImporterStep(_('Revocation information'), 'requestAccess_expirations', $value['expirations'])); + } $steps[] = $mainStep; } break; @@ -752,6 +755,9 @@ class ConfigDataImporter { case 'historicRequests': $database->importRequestHistory($data); break; + case 'expirations': + $database->importExpirations($data); + break; } } } From 51b8dc0a158b1dd6bbd5c089e7125f6bdabbf2cb Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Fri, 4 Oct 2024 20:13:23 +0200 Subject: [PATCH 3/3] #339 added comment fields --- lam/HISTORY | 2 +- lam/docs/manual-sources/chapter-selfService.xml | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lam/HISTORY b/lam/HISTORY index d06056966..ccfbe9424 100644 --- a/lam/HISTORY +++ b/lam/HISTORY @@ -2,7 +2,7 @@ December 2024 9.0 - Group of (unique) names, organisational roles: added member/owner count to PDF fields - Usability improvements (350) - LAM Pro: - -> Request access: added rejection reason + -> Request access: added comment field for owners/approvers (339) - Fixed bugs: -> Windows: show more than 1000 LDAP entries when paged results is activated in server profile diff --git a/lam/docs/manual-sources/chapter-selfService.xml b/lam/docs/manual-sources/chapter-selfService.xml index 80dade2c2..0e7e281d4 100644 --- a/lam/docs/manual-sources/chapter-selfService.xml +++ b/lam/docs/manual-sources/chapter-selfService.xml @@ -1937,6 +1937,9 @@ optional notes. This is available for the mails to the group owners/managers. + Use $$request_comment$$ to inject the owner's or approver's + comment. This can be used in mails to approvers and requesters. + The wildcards $$approveLink$$ and $$rejectLink$$ resolve to an URL that allows to approve/deny all requests listed in $$requested_groups$$. This is available for the mails to the group owners/managers and @@ -1975,6 +1978,8 @@ $$requested_groups$$ + Comment: $$request_comment$$ + Approve all: $$approveLink$$ Deny all: $$rejectLink$$ @@ -1989,8 +1994,9 @@ email: Dear $$cn$$, - your access request was approved. + your access request was approved/denied. Requested groups: $$requested_groups$$ + Comment: $$request_comment$$ Best regards, IT team