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
1c2faadd
Commit
1c2faadd
authored
6 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
fix(objects) Template search should return cn as well
issue
#5135
parent
89a1cbff
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
core-php8
master
fusiondirectory-1.5
fusiondirectory-1.4
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
include/class_objects.inc
+10
-2
include/class_objects.inc
with
10 additions
and
2 deletions
+10
-2
include/class_objects.inc
+
10
−
2
View file @
1c2faadd
...
...
@@ -58,8 +58,9 @@ class objects
if
(
count
(
$types
)
>
1
)
{
throw
new
FusionDirectoryException
(
'Cannot evaluate ACL for several types'
);
}
$infos
=
static
::
infos
(
reset
(
$types
));
$acl
=
$infos
[
'aclCategory'
]
.
'/'
.
$infos
[
'mainTab'
];
$infos
=
static
::
infos
(
reset
(
$types
));
$acl
=
$infos
[
'aclCategory'
]
.
'/'
.
$infos
[
'mainTab'
];
$tplAcl
=
$infos
[
'aclCategory'
]
.
'/template'
;
}
$attrsAcls
=
array
();
...
...
@@ -102,6 +103,7 @@ class objects
$search_attrs
=
array_keys
(
$attrs
);
if
(
$templateSearch
)
{
$search_attrs
[]
=
'fdTemplateField'
;
$search_attrs
[]
=
'cn'
;
}
}
else
{
$search_attrs
=
array
(
$attrs
);
...
...
@@ -146,6 +148,12 @@ class objects
}
}
if
(
$templateSearch
)
{
if
(
isset
(
$fetched_attrs
[
'cn'
])
&&
(
!
$checkAcl
||
(
strpos
(
$ui
->
get_permissions
(
$key
,
$tplAcl
,
'template_cn'
),
'r'
)
!==
FALSE
))
)
{
$result
[
$key
][
'cn'
]
=
$fetched_attrs
[
'cn'
][
0
];
}
$result
[
$key
][
'fdTemplateField'
]
=
array
();
foreach
(
$fetched_attrs
[
'fdTemplateField'
]
as
$templateField
)
{
$attr
=
explode
(
':'
,
$templateField
,
2
)[
0
];
...
...
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