diff --git a/contrib/openldap/core-fd.schema b/contrib/openldap/core-fd.schema index bcbe6819b73ef49431ba129f317213469be14b43..796fce3d3226b840bb65d286eb436d6f8e2c2623 100644 --- a/contrib/openldap/core-fd.schema +++ b/contrib/openldap/core-fd.schema @@ -2,7 +2,7 @@ ## core-fd.schema - Needed by FusionDirectory for its basic functionalities ## -# Last OID used for attributes : 1.3.6.1.4.1.38414.62.1.68 12/03/24 # +# Last OID used for attributes : 1.3.6.1.4.1.38414.62.1.69 01/10/24 # # Last OID used for objectClass : 1.3.6.1.4.1.38414.62.2.11 29/01/24 # ##### Attributes from gosa ###### @@ -251,6 +251,13 @@ attributetype ( 1.3.6.1.4.1.38414.62.1.26 NAME 'fdTasksGranularRef' EQUALITY caseExactMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) +attributetype ( 1.3.6.1.4.1.38414.62.1.69 NAME 'fdTasksGranularHelper' + DESC 'Fusion Directory - Reference towards a potential helper value from main task (case of reminder)' + EQUALITY caseExactMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) + + + ## Any tasks requiring to store DN (Such as lifeCycle). ## attributetype ( 1.3.6.1.4.1.38414.62.1.67 NAME 'fdTasksGranularDN' @@ -508,7 +515,7 @@ objectclass (1.3.6.1.4.1.38414.62.2.7 NAME 'fdTasksMail' objectclass (1.3.6.1.4.1.38414.62.2.8 NAME 'fdTasksGranular' DESC 'FusionDirectory - Tasks granular objects' MUST ( fdTasksGranularMaster $ cn $ fdTasksGranularType $ fdTasksGranularSchedule $ fdTasksGranularStatus ) - MAY (fdTasksGranularMailBCC $ fdTasksGranularDN $ fdTasksGranularRef $ fdTasksGranularMail $ fdTasksGranularMailFrom)) + MAY (fdTasksGranularMailBCC $ fdTasksGranularDN $ fdTasksGranularRef $ fdTasksGranularMail $ fdTasksGranularMailFrom $ fdTasksGranularHelper)) objectclass (1.3.6.1.4.1.38414.62.2.9 NAME 'fdTasksConf' DESC 'FusionDirectory - Tasks objects Configuration' diff --git a/plugins/workflow/tasks/class_tasks.inc b/plugins/workflow/tasks/class_tasks.inc index d95aae6bdb1fcd637c8c24d1c8ff3408adca8a86..3eb266fc7bd5fec250c9f1ce290ba17441b0a458 100644 --- a/plugins/workflow/tasks/class_tasks.inc +++ b/plugins/workflow/tasks/class_tasks.inc @@ -206,6 +206,8 @@ class tasks extends simplePlugin "fdTasksGranularType" => $taskType, // Verification as 'ref' could potentially not be present depending on the logic of the main task. "fdTasksGranularRef" => !empty($attrs['ref'][$dn]) ? array_values($attrs['ref'][$dn]) : [], + // Verification if any helper reference must be added to help further backend processing. + "fdTasksGranularHelper" => !empty($attrs['helper']) ? array_values($attrs['helper']) : [], ]; break; } diff --git a/plugins/workflow/tasks/class_tasksGranular.inc b/plugins/workflow/tasks/class_tasksGranular.inc index 8dfbdd777394e3e201d3343f0fe802f43a49b3b7..9c51c4ca14109e718c06bd9a68e9ede0c31dd5fe 100644 --- a/plugins/workflow/tasks/class_tasksGranular.inc +++ b/plugins/workflow/tasks/class_tasksGranular.inc @@ -60,6 +60,7 @@ class tasksGranular extends simplePlugin new HiddenAttribute('fdTasksGranularMaster', TRUE, '', '', 'Master CN', 'Name of the Master task'), new HiddenAttribute('fdTasksGranularType', TRUE, '', '', 'Type', 'Type of the task'), new HiddenArrayAttribute('fdTasksGranularRef', FALSE, '', '', 'Type', 'Reference towards a required CN (mail template E.g'), + new HiddenArrayAttribute('fdTasksGranularHelper', FALSE, '', '', 'Type', 'Reference towards important info from main tasks (user reminder two different call E.g'), new DateTimeAttribute( _('Schedule'), '', 'fdTasksGranularSchedule', FALSE