From 99a03388ef1cc1c0ef02d6f290d7b26715ef7b7f Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Fri, 2 Mar 2018 15:39:47 +0100
Subject: [PATCH] [REFACTORING] Priotity wdays
---
.../admin/priorities/class_priorities_Abstract.php | 2 +-
apps/maarch_entreprise/class/class_business_app_tools.php | 2 +-
.../class/class_business_app_tools_Abstract.php | 2 +-
src/app/link/models/LinkModelAbstract.php | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/apps/maarch_entreprise/admin/priorities/class_priorities_Abstract.php b/apps/maarch_entreprise/admin/priorities/class_priorities_Abstract.php
index db6be073e03..d7d71027c5d 100755
--- a/apps/maarch_entreprise/admin/priorities/class_priorities_Abstract.php
+++ b/apps/maarch_entreprise/admin/priorities/class_priorities_Abstract.php
@@ -87,7 +87,7 @@ abstract class PrioritiesAbstract extends Database
foreach ($priorities as $priority) {
$_SESSION['mail_priorities'][$i] = $priority['label'];
$_SESSION['mail_priorities_attribute'][$i] = ($priority['delays'] == null ? 'false' : $priority['delays']);
- $_SESSION['mail_priorities_wdays'][$i] = ($priority['delays'] ? 'true' : 'false');
+ $_SESSION['mail_priorities_wdays'][$i] = ($priority['working_days'] ? 'true' : 'false');
$_SESSION['mail_priorities_color'][$i] = $priority['color'];
if ($priority['default_priority']) {
$_SESSION['default_mail_priority'] = $i;
diff --git a/apps/maarch_entreprise/class/class_business_app_tools.php b/apps/maarch_entreprise/class/class_business_app_tools.php
index 2e7e48cd235..ac442cd89d3 100755
--- a/apps/maarch_entreprise/class/class_business_app_tools.php
+++ b/apps/maarch_entreprise/class/class_business_app_tools.php
@@ -140,7 +140,7 @@ class business_app_tools extends business_app_tools_Abstract
foreach ($priorities as $priority) {
$_SESSION['mail_priorities'][$i] = $priority['label'];
$_SESSION['mail_priorities_attribute'][$i] = ($priority['delays'] == null ? 'false' : $priority['delays']);
- $_SESSION['mail_priorities_wdays'][$i] = ($priority['delays'] ? 'true' : 'false');
+ $_SESSION['mail_priorities_wdays'][$i] = ($priority['working_days'] ? 'true' : 'false');
$_SESSION['mail_priorities_color'][$i] = $priority['color'];
if ($priority['default_priority']) {
$_SESSION['default_mail_priority'] = $i;
diff --git a/apps/maarch_entreprise/class/class_business_app_tools_Abstract.php b/apps/maarch_entreprise/class/class_business_app_tools_Abstract.php
index 7dec1214b57..7e8ed5b275f 100755
--- a/apps/maarch_entreprise/class/class_business_app_tools_Abstract.php
+++ b/apps/maarch_entreprise/class/class_business_app_tools_Abstract.php
@@ -544,7 +544,7 @@ abstract class business_app_tools_Abstract extends Database
foreach ($priorities as $priority) {
$_SESSION['mail_priorities'][$i] = $priority['label'];
$_SESSION['mail_priorities_attribute'][$i] = ($priority['delays'] == null ? 'false' : $priority['delays']);
- $_SESSION['mail_priorities_wdays'][$i] = ($priority['delays'] ? 'true' : 'false');
+ $_SESSION['mail_priorities_wdays'][$i] = ($priority['working_days'] ? 'true' : 'false');
$_SESSION['mail_priorities_color'][$i] = $priority['color'];
if ($priority['default_priority']) {
$_SESSION['default_mail_priority'] = $i;
diff --git a/src/app/link/models/LinkModelAbstract.php b/src/app/link/models/LinkModelAbstract.php
index 1241bc5bbde..a198e331e6c 100644
--- a/src/app/link/models/LinkModelAbstract.php
+++ b/src/app/link/models/LinkModelAbstract.php
@@ -10,12 +10,12 @@
/**
* @brief Link Model
* @author dev@maarch.org
- * @ingroup link
*/
namespace Link\models;
use SrcCore\models\DatabaseModel;
+use SrcCore\models\ValidatorModel;
class LinkModelAbstract
{
--
GitLab