diff --git a/plugins/configuration/tasks/class_tasksGranular.inc b/plugins/configuration/tasks/class_tasksGranular.inc index 5c94e143503760137252830a03aafc4d0f269acd..445e3ab04b9be5a21c7f57f333bb02bf57dc3f33 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 78380d95bafb0666d6e06b47d3ad83418c9e4a9b..d151de225a953279b578c12b5f94dc80c8de83df 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; }