Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
fusiondirectory
fusiondirectory
Commits
a7e03355
Commit
a7e03355
authored
Oct 24, 2016
by
Côme Chilliet
Browse files
Fixes
#5194
Avoid case problem when comparing objectType
parent
13388b82
Changes
2
Hide whitespace changes
Inline
Side-by-side
plugins/admin/groups/class_groupManagement.inc
View file @
a7e03355
...
...
@@ -57,14 +57,14 @@ class groupManagement extends simpleManagement
// Load information if needed
$result
=
' '
;
if
(
!
empty
(
$attrs
))
{
if
(
$objectType
==
'ogroup'
)
{
if
(
lc
(
$objectType
)
==
'ogroup'
)
{
if
(
empty
(
$gosaGroupObjects
))
{
return
$result
;
}
else
{
return
self
::
filterGroupObjects
(
$row
,
$gosaGroupObjects
);
}
}
if
(
$objectType
==
'role'
)
{
if
(
lc
(
$objectType
)
==
'role'
)
{
return
'<input class="center" type="image" src="geticon.php?context=types&icon=role&size=16" '
.
'alt="'
.
_
(
'Role'
)
.
'" title="'
.
_
(
'Edit role properties'
)
.
'" '
.
'name="listing_edit_'
.
$row
.
'" style="padding:1px"/>'
;
...
...
plugins/admin/groups/class_ogroup.inc
View file @
a7e03355
...
...
@@ -42,7 +42,7 @@ class ObjectsAttribute extends GenericDialogAttribute
$infos
=
objects
::
infos
(
$objectType
);
$this
->
types
[
$i
]
=
$code
;
$this
->
displays
[
$i
]
=
$attrs
[
$infos
[
'nameAttr'
]][
0
];
if
(
$objectType
==
'user'
)
{
if
(
lc
(
$objectType
)
==
'user'
)
{
if
(
isset
(
$attrs
[
'description'
][
0
]))
{
$this
->
displays
[
$i
]
.
=
' ['
.
$attrs
[
'uid'
][
0
]
.
' - '
.
$attrs
[
'description'
][
0
]
.
']'
;
}
else
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment