Commit 9ae6c06a authored by dockx thibault's avatar dockx thibault
Browse files

Merge branch...

Merge branch '6354-core-tasks-allow-subtasks-to-received-helper-information-as-form-of-references' into 'dev'

Resolve "[CORE] - Tasks - Allow subtasks to received helper information as form of references"

See merge request fusiondirectory/fd!1095
Showing with 12 additions and 2 deletions
+12 -2
......@@ -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'
......
......@@ -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;
}
......
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment