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
1722c910
Verified
Commit
1722c910
authored
1 year ago
by
dockx thibault
Browse files
Options
Download
Patches
Plain Diff
Fix(Tasks) - not taking sole users
Not taking users selection, only groups - fixed
parent
62a6b694
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
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
plugins/configuration/tasks/class_tasks.inc
+10
-5
plugins/configuration/tasks/class_tasks.inc
with
10 additions
and
5 deletions
+10
-5
plugins/configuration/tasks/class_tasks.inc
+
10
−
5
View file @
1722c910
...
...
@@ -148,7 +148,10 @@ class tasks extends simplePlugin
if
(
!
empty
(
$subTasks
))
{
// Recuperate members DN from the ldap search.
foreach
(
$subTasks
as
$subTask
)
{
$membersDN
[]
=
$subTask
[
'fdTasksGranularDN'
][
0
];
// Case of a DN passed but being locked.
if
(
!
empty
(
$subTask
[
'fdTasksGranularDN'
][
0
]))
{
$membersDN
[]
=
$subTask
[
'fdTasksGranularDN'
][
0
];
}
}
// Verify the DN differences and only keep those.
if
(
!
empty
(
$membersDN
))
{
...
...
@@ -198,7 +201,7 @@ class tasks extends simplePlugin
"fdTasksGranularSchedule"
=>
$schedule
,
];
// Simply merged the common values and the custom ones depending on the attribute type passed.
$values
[
'tasksGranular'
]
=
array_merge
(
$prepData
[
'tasksGranular'
],
$defaultData
[
'tasksGranular'
]);
$values
[
'tasksGranular'
]
=
array_merge
(
$prepData
[
'tasksGranular'
],
$defaultData
[
'tasksGranular'
]);
foreach
(
$values
as
$tab
=>
$tabvalues
)
{
if
(
!
isset
(
$tabObject
->
by_object
[
$tab
]))
{
...
...
@@ -253,10 +256,12 @@ class tasks extends simplePlugin
foreach
(
$info
[
'member'
]
as
$memberDN
)
{
$listMemberDN
[]
=
$memberDN
;
}
// Add the member DN to the list of DN
$listMemberDN
=
array_unique
(
$listMemberDN
);
// case of member not within a group or dyngroup
}
else
{
$listMemberDN
[]
=
$group
;
//Here group is indeed a sole user
}
// Make sure no duplicate can happens, case of same member in an existing group.
$listMemberDN
=
array_unique
(
$listMemberDN
);
}
}
...
...
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