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
4db9e942
Unverified
Commit
4db9e942
authored
4 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
fix(subscription) Hide time for start/end date
issue
#6152
parent
245fd090
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/class_DateAttribute.inc
+5
-2
include/simpleplugin/attributes/class_DateAttribute.inc
plugins/addons/subscription/class_subscriptionInfo.inc
+2
-2
plugins/addons/subscription/class_subscriptionInfo.inc
with
7 additions
and
4 deletions
+7
-4
include/simpleplugin/attributes/class_DateAttribute.inc
+
5
−
2
View file @
4db9e942
...
...
@@ -348,9 +348,12 @@ 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
=
''
)
protected
$displayFormat
;
function
__construct
(
string
$label
,
string
$description
,
string
$ldapName
,
bool
$required
,
$defaultValue
=
''
,
$format
=
'Y-m-d, H:i:s'
,
$min
=
NULL
,
$max
=
NULL
,
string
$acl
=
''
)
{
parent
::
__construct
(
$label
,
$description
,
$ldapName
,
$required
,
$defaultValue
,
$min
,
$max
,
$acl
);
$this
->
displayFormat
=
$format
;
}
function
getValue
()
...
...
@@ -365,7 +368,7 @@ class GeneralizedTimeDisplayAttribute extends GeneralizedTimeDateAttribute
}
$date
=
$this
->
getDateValue
();
$date
->
setTimezone
(
timezone
::
getDefaultTimeZone
());
return
htmlescape
(
$date
->
format
(
'Y-m-d, H:i:s'
));
return
htmlescape
(
$date
->
format
(
$this
->
displayFormat
));
}
}
...
...
This diff is collapsed.
Click to expand it.
plugins/addons/subscription/class_subscriptionInfo.inc
+
2
−
2
View file @
4db9e942
...
...
@@ -79,12 +79,12 @@ class subscriptionInfo extends simplePlugin
new
GeneralizedTimeDisplayAttribute
(
_
(
'Start date'
),
_
(
'Start date of this subscription'
),
'fdSubscriptionStartDate'
,
TRUE
,
''
''
,
'Y-m-d'
),
new
GeneralizedTimeDisplayAttribute
(
_
(
'End date'
),
_
(
'End date of this subscription'
),
'fdSubscriptionEndDate'
,
TRUE
,
''
''
,
'Y-m-d'
),
new
FileAttribute
(
_
(
'Import'
),
_
(
'Import subscription'
),
...
...
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