From dbbeb639581756a42041501f324663cf2f23bfcb Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Fri, 21 Dec 2018 12:14:50 +0100
Subject: [PATCH] FEAT #8489 init admin sendmail
---
apps/maarch_entreprise/xml/services.xml | 12 ++++++++++++
src/core/lang/lang-en.php | 2 ++
src/core/lang/lang-fr.php | 4 ++++
src/core/lang/lang-nl.php | 2 ++
.../administration/administration-routing.module.ts | 2 ++
.../app/administration/administration.module.ts | 2 ++
src/frontend/app/app-routing.module.ts | 2 +-
7 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/apps/maarch_entreprise/xml/services.xml b/apps/maarch_entreprise/xml/services.xml
index d5d7e97eb33..e71e5fd7688 100755
--- a/apps/maarch_entreprise/xml/services.xml
+++ b/apps/maarch_entreprise/xml/services.xml
@@ -422,4 +422,16 @@
<enabled>true</enabled>
<angular>true</angular>
</SERVICE>
+ <SERVICE>
+ <id>admin_sendmail</id>
+ <name>_SENDMAIL_PARAM</name>
+ <comment>_SENDMAIL_PARAM_DESC</comment>
+ <servicepage>/administration/sendmail</servicepage>
+ <servicetype>admin</servicetype>
+ <category>supervision</category>
+ <system_service>false</system_service>
+ <style>fas fa-mail-bulk</style>
+ <enabled>true</enabled>
+ <angular>true</angular>
+ </SERVICE>
</root>
diff --git a/src/core/lang/lang-en.php b/src/core/lang/lang-en.php
index 7ceb994b05d..736d8ba1738 100755
--- a/src/core/lang/lang-en.php
+++ b/src/core/lang/lang-en.php
@@ -189,6 +189,8 @@ define('_ADMIN_NOTIFICATIONS_DESC', " Create and manage users' notifications bas
define('_TEMPLATES', 'Templates');
define('_ADMIN_TEMPLATES_DESC', 'Manage templates for attachments, notifications, document generation, sendmail and notes');
define('_SECURITIES', 'Securities');
+define('_SENDMAIL_PARAM', 'Mail server');
+define('_SENDMAIL_PARAM_DESC', 'Link your mail serveur with application in order to send emails.');
//SERVICES
define('_REDIRECT_TO_ACTION', 'Redirect to an action');
diff --git a/src/core/lang/lang-fr.php b/src/core/lang/lang-fr.php
index cf656ba42fb..4084f0ee4ec 100755
--- a/src/core/lang/lang-fr.php
+++ b/src/core/lang/lang-fr.php
@@ -189,6 +189,10 @@ define('_ADMIN_NOTIFICATIONS_DESC', "Créer et gérer des notifications aux util
define('_TEMPLATES', 'Modèles de documents');
define('_ADMIN_TEMPLATES_DESC', "Gérer les modèles utilisés pour les pièces jointes, les notifications, la génération de courriers, l'envoi de courriels et les annotations");
define('_SECURITIES', 'Sécurités');
+define('_SENDMAIL_PARAM', 'Serveur mail');
+define('_SENDMAIL_PARAM_DESC', 'Connecter votre serveur de mail à Maarch Courrier afin de pouvoir envoyer des courriels.');
+
+
//SERVICES
define('_REDIRECT_TO_ACTION', 'Rediriger vers une action');
diff --git a/src/core/lang/lang-nl.php b/src/core/lang/lang-nl.php
index 21070c31574..f8928be7a31 100644
--- a/src/core/lang/lang-nl.php
+++ b/src/core/lang/lang-nl.php
@@ -406,3 +406,5 @@ define('_SVA', 'Stilzwijgende aanvaarding');
define('_SVR', 'Stilzwijgende weigering');
define('_REDACTOR', 'Opsteller');
define('_ASSIGNEE', 'Toegekende persoon');
+define('_SENDMAIL_PARAM', '_TO_TRANSLATE');
+define('_SENDMAIL_PARAM_DESC', '_TO_TRANSLATE');
diff --git a/src/frontend/app/administration/administration-routing.module.ts b/src/frontend/app/administration/administration-routing.module.ts
index 45652763352..efe7b06de51 100755
--- a/src/frontend/app/administration/administration-routing.module.ts
+++ b/src/frontend/app/administration/administration-routing.module.ts
@@ -34,6 +34,7 @@ import { DocserverAdministrationComponent } from './docserver/docser
import { TemplatesAdministrationComponent } from './template/templates-administration.component';
import { TemplateAdministrationComponent } from './template/template-administration.component';
import { SecuritiesAdministrationComponent } from './security/securities-administration.component';
+import { SendmailAdministrationComponent } from './sendmail/sendmail-administration.component';
@NgModule({
imports: [
@@ -82,6 +83,7 @@ import { SecuritiesAdministrationComponent } from './security/securit
{ path: 'administration/templates/new', component: TemplateAdministrationComponent },
{ path: 'administration/templates/:id', component: TemplateAdministrationComponent },
{ path: 'administration/securities', component: SecuritiesAdministrationComponent },
+ { path: 'administration/sendmail', component: SendmailAdministrationComponent },
]),
],
exports: [
diff --git a/src/frontend/app/administration/administration.module.ts b/src/frontend/app/administration/administration.module.ts
index 67f641503b0..9876f8772f2 100755
--- a/src/frontend/app/administration/administration.module.ts
+++ b/src/frontend/app/administration/administration.module.ts
@@ -43,6 +43,7 @@ import { DocserverAdministrationComponent } from './docserver/docser
import { TemplatesAdministrationComponent } from './template/templates-administration.component';
import { TemplateAdministrationComponent } from './template/template-administration.component';
import { SecuritiesAdministrationComponent } from './security/securities-administration.component';
+import { SendmailAdministrationComponent } from './sendmail/sendmail-administration.component';
@NgModule({
imports: [
@@ -94,6 +95,7 @@ import { SecuritiesAdministrationComponent } from './security/securit
TemplatesAdministrationComponent,
TemplateAdministrationComponent,
SecuritiesAdministrationComponent,
+ SendmailAdministrationComponent
],
entryComponents: [
UsersAdministrationRedirectModalComponent,
diff --git a/src/frontend/app/app-routing.module.ts b/src/frontend/app/app-routing.module.ts
index 271f4700bd0..f3190503a21 100755
--- a/src/frontend/app/app-routing.module.ts
+++ b/src/frontend/app/app-routing.module.ts
@@ -18,7 +18,7 @@ import { SaveNumericPackageComponent } from './save-numeric-package.compone
{ path: 'profile', component: ProfileComponent },
{ path: 'about-us', component: AboutUsComponent },
{ path: 'home', component: HomeComponent },
- { path: 'basketList/:groupSerialId/baskets/:basketId', component: BasketListComponent },
+ { path: 'basketList/users/:userSerialId/groups/:groupSerialId/baskets/:basketId', component: BasketListComponent },
{ path: 'saveNumericPackage', component: SaveNumericPackageComponent },
{ path: 'groups/:groupId/baskets/:basketId/signatureBook/:resId', component: SignatureBookComponent },
{ path: '**', redirectTo: 'home', pathMatch: 'full' },
--
GitLab