Skip to content
GitLab
Commit 1555a6e4 authored by Côme Bernigaud's avatar Côme Bernigaud Committed by Benoit Mortier
Browse files

Fixes: #2130 expiration date doesn't appear

parent 0fe9c752
dev 6104-mail-methods-refactor 6231-give-the-ability-to-the-webservice-to-notice-if-an-attribute-is-monovalued-or-multivalued 6237-add-requiredattrs-array-to-the-webservice-informations 6245-adapt-the-ci-to-the-reorganisation-of-the-dev-tools-and-fixing-the-trigger-downstream-pipelines 6250-supann-configuration-backend-requires-account-life-cycle-section 6280-plugins-update-plugins-to-take-into-consideration-the-new-directory-of-core-structure 6310-tasks-reminder-error-in-the-schema-duplicate-attribute-id 6311-put-the-version-1-5-in-all-yaml-for-fusiondirectory-1-5 6322-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen-2 6332-zimbra-allows-update-of-data-for-unknown-domain-name-for-specific-individual-aliases 6337-webservice-issue-with-archiving-post-request-not-responding-but-successfully-archiving-user 6341-supann-extract-resources-states-sub-states-from-backend-configuration-to-their-own-objects master fusiondirectory-1.5 fusiondirectory-1.4 fusiondirectory-1.3.1 fusiondirectory-1.3 fusiondirectory-1.2.3 fusiondirectory-1.2.2 fusiondirectory-1.2.1 fusiondirectory-1.2 fusiondirectory-1.1.1 fusiondirectory-1.1 fusiondirectory-1.0.20 fusiondirectory-1.0.19 fusiondirectory-1.0.18 fusiondirectory-1.0.17 fusiondirectory-1.0.16 fusiondirectory-1.0.15 fusiondirectory-1.0.14 fusiondirectory-1.0.13 fusiondirectory-1.0.12 fusiondirectory-1.0.11 fusiondirectory-1.0.10 fusiondirectory-1.0.9.3 fusiondirectory-1.0.9.2 fusiondirectory-1.0.9.1 fusiondirectory-1.0.9 fusiondirectory-1.0.8.9 fusiondirectory-1.0.8.8 fusiondirectory-1.0.8.7 fusiondirectory-1.0.8.6 fusiondirectory-1.0.8.5 fusiondirectory-1.0.8.4 fusiondirectory-1.0.8.3 fusiondirectory-1.0.8.2 fusiondirectory-1.0.8.1 fusiondirectory-1.0.8 fusiondirectory-1.0.7.5 fusiondirectory-1.0.7.4 fusiondirectory-1.0.7.3 fusiondirectory-1.0.7.2 fusiondirectory-1.0.7.1 fusiondirectory-1.0.7 fusiondirectory-1.0.6 fusiondirectory-1.0.5
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 5 additions and 4 deletions
+5 -4
alias/admin/alias/alias-list.xml
+ 2
− 2
View file @ 1555a6e4
......@@ -38,7 +38,7 @@
</definition>
<table>
<layout>|20px;c||||100px;r|</layout>
<layout>|20px;c|||110px;c|100px;r|</layout>
<department>
<value>%{filter:objectType(dn,objectClass)}</value>
......@@ -70,7 +70,7 @@
</column>
<column>
<label>aliasExpirationDate</label>
<label>Expiration date</label>
<sortAttribute>aliasExpirationDate</sortAttribute>
<sortType>integer</sortType>
<value>%{filter:filterDate(aliasExpirationDate)}</value>
......
alias/admin/alias/class_aliasManagement.inc
+ 3
− 2
View file @ 1555a6e4
......@@ -158,16 +158,17 @@ class aliasManagement extends management
static function filterDate()
{
if (func_num_args() == 0) {
return;
return '&nbsp;';
}
$date = func_get_arg(0);
if (!is_array($date)) {
return;
return '&nbsp;';
}
$dateObject = DateTime::createFromFormat('U', $date[0], new DateTimeZone('UTC'));
if (is_object($dateObject)) {
return $dateObject->format('d.m.Y');
}
return '&nbsp;';
}
}
?>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment