Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
fusiondirectory
fusiondirectory
Commits
b314f007
Verified
Commit
b314f007
authored
6 months ago
by
dockx thibault
Browse files
Options
Download
Patches
Plain Diff
(CORE) - tasks - allows referencal helper to subTasks
New attribute for referencal.
parent
88026152
dev
6344-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen
6365-core-locking-mechanism-is-not-changing-the-mail-ressource-it-does-lock-the-mail-account
6365-core-when-lock-mechanism-is-trigger-the-user-should-not-be-editable-if-not-unlock
core-php8
master
fusiondirectory-1.5
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
contrib/openldap/core-fd.schema
+9
-2
contrib/openldap/core-fd.schema
plugins/workflow/tasks/class_tasks.inc
+1
-1
plugins/workflow/tasks/class_tasks.inc
with
10 additions
and
3 deletions
+10
-3
contrib/openldap/core-fd.schema
+
9
−
2
View file @
b314f007
...
...
@@ -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.6
8 12/03
/24 #
# Last OID used for attributes : 1.3.6.1.4.1.38414.62.1.6
9 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'
...
...
This diff is collapsed.
Click to expand it.
plugins/workflow/tasks/class_tasks.inc
+
1
−
1
View file @
b314f007
...
...
@@ -207,7 +207,7 @@ class tasks extends simplePlugin
// 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.
"fdTasksGranular
Ref
"
=>
!
empty
(
$attrs
[
'helper'
])
?
array_values
(
$attrs
[
'helper'
])
:
[],
"fdTasksGranular
Helper
"
=>
!
empty
(
$attrs
[
'helper'
])
?
array_values
(
$attrs
[
'helper'
])
:
[],
];
break
;
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets