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
55f681fd
Unverified
Commit
55f681fd
authored
5 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
fix(ObjectsAttribute) Remove non-existing object types
issue #6083
parent
3cafc99e
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/simpleplugin/attributes/dialog/class_ObjectsAttribute.inc
+3
-3
...simpleplugin/attributes/dialog/class_ObjectsAttribute.inc
with
3 additions
and
3 deletions
+3
-3
include/simpleplugin/attributes/dialog/class_ObjectsAttribute.inc
+
3
−
3
View file @
55f681fd
...
...
@@ -46,7 +46,7 @@ class ObjectsAttribute extends GenericDialogAttribute
$attributes
[
$display_attr
]
=
'*'
;
}
$specialAttributes
=
array_intersect
([
$store_attr
,
$display_attr
],
[
'nameAttr'
,
'mainAttr'
]);
foreach
(
$objectTypes
as
$type
)
{
foreach
(
$objectTypes
as
$i
=>
$type
)
{
try
{
if
(
!
empty
(
$specialAttributes
))
{
$infos
=
objects
::
infos
(
$type
);
...
...
@@ -61,10 +61,10 @@ class ObjectsAttribute extends GenericDialogAttribute
}
}
}
catch
(
NonExistingObjectTypeException
$e
)
{
continue
;
unset
(
$objectTypes
[
$i
])
;
}
}
$this
->
selectManagementParameters
=
[
$objectTypes
,
TRUE
,
$attributes
];
$this
->
selectManagementParameters
=
[
array_values
(
$objectTypes
)
,
TRUE
,
$attributes
];
$this
->
filterElementDefinitions
=
$filterElementDefinitions
;
}
...
...
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