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
155839f9
Commit
155839f9
authored
6 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
fix(core) Fix %askme% support for BooleanAttribute
issue
#5897
parent
e7074b11
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/class_BooleanAttribute.inc
+12
-5
include/simpleplugin/attributes/class_BooleanAttribute.inc
with
12 additions
and
5 deletions
+12
-5
include/simpleplugin/attributes/class_BooleanAttribute.inc
+
12
−
5
View file @
155839f9
...
@@ -50,15 +50,24 @@ class BooleanAttribute extends Attribute
...
@@ -50,15 +50,24 @@ class BooleanAttribute extends Attribute
$this
->
templatable
=
$bool
;
$this
->
templatable
=
$bool
;
}
}
protected
function
isTemplatable
()
{
/* Allow to set to %askme% if we are not (de)activating other fields */
return
(
!
$this
->
submitForm
&&
empty
(
$this
->
managedAttributes
)
&&
$this
->
templatable
);
}
function
inputValue
(
$value
)
function
inputValue
(
$value
)
{
{
if
(
$this
->
isTemplate
()
&&
$this
->
isTemplatable
()
&&
(
$value
==
'%askme%'
))
{
return
$value
;
}
return
(
$value
==
$this
->
trueValue
);
return
(
$value
==
$this
->
trueValue
);
}
}
function
loadPostValue
()
function
loadPostValue
()
{
{
if
(
$this
->
isVisible
())
{
if
(
$this
->
isVisible
())
{
if
(
$this
->
isTemplate
()
&&
!
$this
->
submitForm
&&
empty
(
$this
->
managedAttributes
))
{
if
(
$this
->
isTemplate
()
&&
$this
->
isTemplatable
(
))
{
if
(
!
isset
(
$_POST
[
$this
->
getHtmlId
()]))
{
if
(
!
isset
(
$_POST
[
$this
->
getHtmlId
()]))
{
$this
->
setPostValue
(
FALSE
);
$this
->
setPostValue
(
FALSE
);
}
elseif
(
$_POST
[
$this
->
getHtmlId
()]
==
'%askme%'
)
{
}
elseif
(
$_POST
[
$this
->
getHtmlId
()]
==
'%askme%'
)
{
...
@@ -74,7 +83,7 @@ class BooleanAttribute extends Attribute
...
@@ -74,7 +83,7 @@ class BooleanAttribute extends Attribute
function
computeLdapValue
()
function
computeLdapValue
()
{
{
if
(
$this
->
isTemplate
()
&&
(
$this
->
value
==
'%askme%'
))
{
if
(
$this
->
isTemplate
()
&&
$this
->
isTemplatable
()
&&
(
$this
->
value
==
'%askme%'
))
{
return
$this
->
value
;
return
$this
->
value
;
}
else
{
}
else
{
return
(
$this
->
value
?
$this
->
trueValue
:
$this
->
falseValue
);
return
(
$this
->
value
?
$this
->
trueValue
:
$this
->
falseValue
);
...
@@ -98,9 +107,7 @@ class BooleanAttribute extends Attribute
...
@@ -98,9 +107,7 @@ class BooleanAttribute extends Attribute
function
renderTemplateInput
()
function
renderTemplateInput
()
{
{
if
(
!
$this
->
submitForm
&&
empty
(
$this
->
managedAttributes
)
&&
$this
->
templatable
)
{
if
(
$this
->
isTemplatable
())
{
/* Allow to set to %askme% if we are not (de)activating other fields */
$id
=
$this
->
getHtmlId
();
$id
=
$this
->
getHtmlId
();
if
(
$this
->
getValue
()
==
'%askme%'
)
{
if
(
$this
->
getValue
()
==
'%askme%'
)
{
$selected
=
'%askme%'
;
$selected
=
'%askme%'
;
...
...
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