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
f3a456f8
Commit
f3a456f8
authored
4 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
fix(simpleplugin) Improve empty Date handling
issue #6152
parent
b34a4688
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_DateAttribute.inc
+11
-3
include/simpleplugin/attributes/class_DateAttribute.inc
with
11 additions
and
3 deletions
+11
-3
include/simpleplugin/attributes/class_DateAttribute.inc
+
11
−
3
View file @
f3a456f8
...
...
@@ -64,7 +64,7 @@ class DateAttribute extends Attribute
function
inputValue
(
$value
)
{
if
(
(
(
$value
===
''
)
&&
!
$this
->
isRequired
())
||
(
$value
===
''
)
||
(
$this
->
isTemplate
()
&&
preg_match
(
'/%/'
,
$value
))
)
{
return
$value
;
...
...
@@ -75,7 +75,7 @@ class DateAttribute extends Attribute
function
getValue
()
{
if
(
$this
->
value
===
""
&&
!
$this
->
isRequired
()
)
{
if
(
$this
->
value
===
''
)
{
return
$this
->
value
;
}
else
{
try
{
...
...
@@ -112,7 +112,7 @@ class DateAttribute extends Attribute
function
computeLdapValue
()
{
if
(
$this
->
value
===
""
&&
!
$this
->
isRequired
()
)
{
if
(
$this
->
value
===
''
)
{
return
$this
->
value
;
}
elseif
(
!
(
$this
->
value
instanceof
DateTime
))
{
try
{
...
...
@@ -348,6 +348,11 @@ class DateTimeAttribute extends CompositeAttribute
*/
class
GeneralizedTimeDisplayAttribute
extends
GeneralizedTimeDateAttribute
{
function
__construct
(
string
$label
,
string
$description
,
string
$ldapName
,
bool
$required
,
$defaultValue
=
''
,
$min
=
NULL
,
$max
=
NULL
,
string
$acl
=
''
)
{
parent
::
__construct
(
$label
,
$description
,
$ldapName
,
$required
,
$defaultValue
,
$min
,
$max
,
$acl
);
}
function
getValue
()
{
return
$this
->
computeLdapValue
();
...
...
@@ -355,6 +360,9 @@ class GeneralizedTimeDisplayAttribute extends GeneralizedTimeDateAttribute
function
renderFormInput
():
string
{
if
(
empty
(
$this
->
value
))
{
return
''
;
}
$date
=
$this
->
getDateValue
();
$date
->
setTimezone
(
timezone
::
getDefaultTimeZone
());
return
htmlescape
(
$date
->
format
(
'Y-m-d, H:i:s'
));
...
...
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