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
e20e7b2a
Verified
Commit
e20e7b2a
authored
1 year ago
by
dockx thibault
Browse files
Options
Download
Patches
Plain Diff
Fix(Tasks) - OnlyNew Members errors
Only new members - fixed
parent
5be91082
dev
6342-update-the-locales-for-1-5
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
6378-orcid-test-method-is-wrong-and-break-orcid-saving
6379-core-ogroups-creation-with-backend-default-user-available-for-selection
core-php8
master
fusiondirectory-1.5
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
plugins/configuration/tasks/class_tasks.inc
+10
-4
plugins/configuration/tasks/class_tasks.inc
plugins/configuration/tasks/class_tasksLifeCycle.inc
+3
-2
plugins/configuration/tasks/class_tasksLifeCycle.inc
with
13 additions
and
6 deletions
+13
-6
plugins/configuration/tasks/class_tasks.inc
+
10
−
4
View file @
e20e7b2a
...
...
@@ -148,9 +148,15 @@ class tasks extends simplePlugin
if
(
!
empty
(
$subTasks
))
{
// Recuperate members DN from the ldap search.
foreach
(
$subTasks
as
$subTask
)
{
// Case of a DN passed but being locked.
if
(
!
empty
(
$subTask
[
'fdTasksGranularDN'
][
0
]))
{
$membersDN
[]
=
$subTask
[
'fdTasksGranularDN'
][
0
];
// For lifeCycle we check DN and for mailObject we check mail
switch
(
$attributeType
)
{
case
'fdTasksGranularDN'
:
$membersDN
[]
=
$subTask
[
'fdTasksGranularDN'
][
0
];
break
;
case
'fdTasksGranularMail'
:
$membersDN
[]
=
$subTask
[
'fdTasksGranularMail'
][
0
];
break
;
}
}
// Verify the DN differences and only keep those.
...
...
@@ -186,7 +192,7 @@ class tasks extends simplePlugin
"fdTasksGranularMailBCC"
=>
$attrs
[
'bcc'
]
];
break
;
case
'fdTasks
LifeCycle
'
:
case
'fdTasks
GranularDN
'
:
$prepData
[
'tasksGranular'
]
=
[
"fdTasksGranularDN"
=>
$dn
,
"fdTasksGranularType"
=>
'Life Cycle'
,
...
...
This diff is collapsed.
Click to expand it.
plugins/configuration/tasks/class_tasksLifeCycle.inc
+
3
−
2
View file @
e20e7b2a
...
...
@@ -186,8 +186,9 @@ class tasksLifeCycle extends simplePlugin
*/
public
function
generateSlaveTasks
()
{
$listOfDN
=
$this
->
attributesAccess
[
'fdTasksLifeCycleListOfDN'
]
->
getValue
();
$attributeType
=
'fdTasksLifeCycle'
;
$listOfDN
=
$this
->
attributesAccess
[
'fdTasksLifeCycleListOfDN'
]
->
getValue
();
// The attribute required to be search in createSlaveTasks
$attributeType
=
'fdTasksGranularDN'
;
// Call the method from parent tasks object (first tab) to create sub-tasks.
$this
->
parent
->
getBaseObject
()
->
createSlaveTasks
(
$listOfDN
,
$attributeType
);
...
...
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