maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

minor adjustments in customer-email-domain-overview

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2023-02-05 18:30:29 +01:00
parent 7686effc8c
commit f97536ed02
2 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
customer_email.php
View File

@@ -61,7 +61,8 @@ if ($page == 'overview' || $page == 'emails') {
try { try {
$emaildomain_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/customer/tablelisting.emails_overview.php'; $emaildomain_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/customer/tablelisting.emails_overview.php';
$collection = (new Collection(EmailDomains::class, $userinfo)) $collection = (new Collection(EmailDomains::class, $userinfo))
->withPagination($emaildomain_list_data['emaildomain_list']['columns'], $emaildomain_list_data['emaildomain_list']['default_sorting']); ->withPagination($emaildomain_list_data['emaildomain_list']['columns'],
$emaildomain_list_data['emaildomain_list']['default_sorting']);
} catch (Exception $e) { } catch (Exception $e) {
Response::dynamicError($e->getMessage()); Response::dynamicError($e->getMessage());
} }
@@ -108,8 +109,9 @@ if ($page == 'email_domain') {
]); ]);
$emaildomains_count = $result2['emaildomains']; $emaildomains_count = $result2['emaildomains'];
$actions_links = [ $actions_links = [];
[ if ($email_domainid > 0) {
$actions_links[] = [
'class' => 'btn-outline-primary', 'class' => 'btn-outline-primary',
'href' => $linker->getLink([ 'href' => $linker->getLink([
'section' => 'email', 'section' => 'email',
@@ -117,12 +119,14 @@ if ($page == 'email_domain') {
]), ]),
'label' => lng('emails.back_to_overview'), 'label' => lng('emails.back_to_overview'),
'icon' => 'fa-solid fa-reply' 'icon' => 'fa-solid fa-reply'
], ];
CurrentUser::canAddResource('emails') ? [ }
if (CurrentUser::canAddResource('emails')) {
$actions_links[] = [
'href' => $linker->getLink(['section' => 'email', 'page' => 'email_domain', 'action' => 'add']), 'href' => $linker->getLink(['section' => 'email', 'page' => 'email_domain', 'action' => 'add']),
'label' => lng('emails.emails_add') 'label' => lng('emails.emails_add')
] : null ];
]; }
UI::view('user/table.html.twig', [ UI::view('user/table.html.twig', [
'listing' => Listing::format($collection, $email_list_data, 'email_list'), 'listing' => Listing::format($collection, $email_list_data, 'email_list'),
@@ -287,8 +291,9 @@ if ($page == 'email_domain') {
} }
Response::redirectTo($filename, [ Response::redirectTo($filename, [
'page' => $page, 'page' => $page,
'domainid' => $email_domainid,
'action' => 'edit', 'action' => 'edit',
'id' => $id 'id' => $id,
]); ]);
} }
} elseif ($page == 'accounts') { } elseif ($page == 'accounts') {
@@ -347,7 +352,11 @@ if ($page == 'email_domain') {
], ],
[ [
'class' => 'btn-secondary', 'class' => 'btn-secondary',
'href' => $linker->getLink(['section' => 'email', 'page' => 'email_domain', 'domainid' => $email_domainid]), 'href' => $linker->getLink([
'section' => 'email',
'page' => 'email_domain',
'domainid' => $email_domainid
]),
'label' => lng('menue.email.emails'), 'label' => lng('menue.email.emails'),
'icon' => 'fa-solid fa-envelope' 'icon' => 'fa-solid fa-envelope'
] ]
@@ -407,7 +416,11 @@ if ($page == 'email_domain') {
], ],
[ [
'class' => 'btn-secondary', 'class' => 'btn-secondary',
'href' => $linker->getLink(['section' => 'email', 'page' => 'email_domain', 'domainid' => $email_domainid]), 'href' => $linker->getLink([
'section' => 'email',
'page' => 'email_domain',
'domainid' => $email_domainid
]),
'label' => lng('menue.email.emails'), 'label' => lng('menue.email.emails'),
'icon' => 'fa-solid fa-envelope' 'icon' => 'fa-solid fa-envelope'
] ]
@@ -462,7 +475,11 @@ if ($page == 'email_domain') {
], ],
[ [
'class' => 'btn-secondary', 'class' => 'btn-secondary',
'href' => $linker->getLink(['section' => 'email', 'page' => 'email_domain', 'domainid' => $email_domainid]), 'href' => $linker->getLink([
'section' => 'email',
'page' => 'email_domain',
'domainid' => $email_domainid
]),
'label' => lng('menue.email.emails'), 'label' => lng('menue.email.emails'),
'icon' => 'fa-solid fa-envelope' 'icon' => 'fa-solid fa-envelope'
] ]
@@ -553,7 +570,11 @@ if ($page == 'email_domain') {
], ],
[ [
'class' => 'btn-secondary', 'class' => 'btn-secondary',
'href' => $linker->getLink(['section' => 'email', 'page' => 'email_domain', 'domainid' => $email_domainid]), 'href' => $linker->getLink([
'section' => 'email',
'page' => 'email_domain',
'domainid' => $email_domainid
]),
'label' => lng('menue.email.emails'), 'label' => lng('menue.email.emails'),
'icon' => 'fa-solid fa-envelope' 'icon' => 'fa-solid fa-envelope'
] ]

2
lib/formfields/customer/email/formfield.emails_edit.php
View File

@@ -29,7 +29,7 @@ return [
'emails_edit' => [ 'emails_edit' => [
'title' => lng('emails.emails_edit'), 'title' => lng('emails.emails_edit'),
'image' => 'fa-solid fa-pen', 'image' => 'fa-solid fa-pen',
'self_overview' => ['section' => 'email', 'page' => 'email_domain', 'domainid' => $email_domainid ?: 1], 'self_overview' => ['section' => 'email', 'page' => 'email_domain', 'domainid' => $result['domainid']],
'sections' => [ 'sections' => [
'section_a' => [ 'section_a' => [
'title' => lng('emails.emails_edit'), 'title' => lng('emails.emails_edit'),