From dee09a2dd7070de2df6c155e1d9d5c127e1b42b4 Mon Sep 17 00:00:00 2001
From: Thibault Dockx <thibault.dockx@fusiondirectory.org>
Date: Mon, 5 Feb 2024 15:59:47 +0000
Subject: [PATCH] :sparkles: Feat(CORE) - SubTasks are created
Subtasks are now created.
---
plugins/configuration/tasks/class_tasksGranular.inc | 3 +--
plugins/configuration/tasks/class_tasksLifeCycle.inc | 10 +++++++---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/plugins/configuration/tasks/class_tasksGranular.inc b/plugins/configuration/tasks/class_tasksGranular.inc
index 5c94e1435..445e3ab04 100644
--- a/plugins/configuration/tasks/class_tasksGranular.inc
+++ b/plugins/configuration/tasks/class_tasksGranular.inc
@@ -26,7 +26,7 @@ class tasksGranular extends simplePlugin
{
return [
'plShortName' => _('Tasks Granular'),
- 'plDescription' => _('Granular tasks mangement allowing details reports'),
+ 'plDescription' => _('Granular tasks management allowing details reports'),
'plObjectClass' => ['fdTasksGranular'],
'plFilter' => '(objectClass=fdTasksGranular)',
'plPriority' => 41,
@@ -86,7 +86,6 @@ class tasksGranular extends simplePlugin
function __construct ($dn = NULL, $object = NULL, $parent = NULL, $mainTab = FALSE)
{
- global $config;
parent::__construct($dn, $object, $parent, $mainTab);
}
diff --git a/plugins/configuration/tasks/class_tasksLifeCycle.inc b/plugins/configuration/tasks/class_tasksLifeCycle.inc
index 78380d95b..d151de225 100644
--- a/plugins/configuration/tasks/class_tasksLifeCycle.inc
+++ b/plugins/configuration/tasks/class_tasksLifeCycle.inc
@@ -195,7 +195,7 @@ class tasksLifeCycle extends simplePlugin
}
}
- $this->attributesAccess['fdTasksEmailsFromDN']->setValue(array_values($membersAndGroups));
+ $this->attributesAccess['fdTasksLifeCycleListOfDN']->setValue(array_values($membersAndGroups));
}
}
@@ -236,7 +236,7 @@ class tasksLifeCycle extends simplePlugin
}
if (!empty($subTasks)) {
- // Recuperate members email from the ldap search.
+ // Recuperate members DN from the ldap search.
foreach ($subTasks as $subTask) {
$membersDN[] = $subTask['fdTasksGranularDN'][0];
}
@@ -263,7 +263,7 @@ class tasksLifeCycle extends simplePlugin
$values['tasksGranular'] = [
"cn" => $subTaskName,
- "fdTasksGranularType" => 'Mail Object',
+ "fdTasksGranularType" => 'Life Cycle',
"fdTasksGranularMaster" => $this->dn,
"fdTasksGranularDN" => $dn,
"fdTasksGranularSchedule" => $schedule,
@@ -297,6 +297,10 @@ class tasksLifeCycle extends simplePlugin
public function update (): bool
{
parent::update();
+
+ // Take the list of DN based on the groups or members list selected and filled the related attributes
+ $this->getListOfDN();
+
return TRUE;
}
--
GitLab