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
5ce8aaf7
Unverified
Commit
5ce8aaf7
authored
5 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
fix(ObjectsAttribute) Improve behavior when setting values
issue
#6083
parent
839e26b5
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
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/simpleplugin/attributes/dialog/class_GenericDialogAttribute.inc
+8
-1
...plugin/attributes/dialog/class_GenericDialogAttribute.inc
include/simpleplugin/attributes/dialog/class_ObjectsAttribute.inc
+6
-0
...simpleplugin/attributes/dialog/class_ObjectsAttribute.inc
with
14 additions
and
1 deletion
+14
-1
include/simpleplugin/attributes/dialog/class_GenericDialogAttribute.inc
+
8
−
1
View file @
5ce8aaf7
...
@@ -63,6 +63,13 @@ class GenericDialogAttribute extends DialogAttribute
...
@@ -63,6 +63,13 @@ class GenericDialogAttribute extends DialogAttribute
unset
(
$this
->
value
[
$row
]);
unset
(
$this
->
value
[
$row
]);
}
}
function
setValue
(
$value
)
{
parent
::
setValue
(
$value
);
$this
->
displays
=
[];
$this
->
getDisplayValues
();
}
protected
function
sortValues
()
protected
function
sortValues
()
{
{
asort
(
$this
->
value
);
asort
(
$this
->
value
);
...
@@ -113,7 +120,7 @@ class GenericDialogAttribute extends DialogAttribute
...
@@ -113,7 +120,7 @@ class GenericDialogAttribute extends DialogAttribute
if
(
$this
->
isTemplate
()
&&
(
$attrs
===
NULL
))
{
if
(
$this
->
isTemplate
()
&&
(
$attrs
===
NULL
))
{
$this
->
displays
[
$i
]
=
$this
->
value
[
$i
];
$this
->
displays
[
$i
]
=
$this
->
value
[
$i
];
}
elseif
(
!
isset
(
$attrs
[
$this
->
display_attr
]))
{
}
elseif
(
!
isset
(
$attrs
[
$this
->
display_attr
]))
{
unset
(
$this
->
v
alue
[
$i
]
);
$this
->
removeV
alue
(
$i
);
}
else
{
}
else
{
if
(
$this
->
display_attr
==
'dn'
)
{
if
(
$this
->
display_attr
==
'dn'
)
{
$this
->
displays
[
$i
]
=
$attrs
[
'dn'
];
$this
->
displays
[
$i
]
=
$attrs
[
'dn'
];
...
...
This diff is collapsed.
Click to expand it.
include/simpleplugin/attributes/dialog/class_ObjectsAttribute.inc
+
6
−
0
View file @
5ce8aaf7
...
@@ -175,6 +175,12 @@ class ObjectsAttribute extends GenericDialogAttribute
...
@@ -175,6 +175,12 @@ class ObjectsAttribute extends GenericDialogAttribute
return
$display
;
return
$display
;
}
}
function
setValue
(
$value
)
{
$this
->
types
=
[];
parent
::
setValue
(
$value
);
}
protected
function
removeValue
(
$row
)
protected
function
removeValue
(
$row
)
{
{
parent
::
removeValue
(
$row
);
parent
::
removeValue
(
$row
);
...
...
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