diff --git a/alias/admin/alias/alias-list.xml b/alias/admin/alias/alias-list.xml index 97fd7fa9537e9db9bde35989fccc88c2837a8c43..207b850f60bfddd942fdebeca6fd4e820ba8a9ca 100644 --- a/alias/admin/alias/alias-list.xml +++ b/alias/admin/alias/alias-list.xml @@ -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> diff --git a/alias/admin/alias/class_aliasManagement.inc b/alias/admin/alias/class_aliasManagement.inc index f52cade170e4d9a051d4e6284f86819f15342305..d9735ce553bb6e644d46ebfa9a884e00c476452c 100644 --- a/alias/admin/alias/class_aliasManagement.inc +++ b/alias/admin/alias/class_aliasManagement.inc @@ -158,16 +158,17 @@ class aliasManagement extends management static function filterDate() { if (func_num_args() == 0) { - return; + return ' '; } $date = func_get_arg(0); if (!is_array($date)) { - return; + return ' '; } $dateObject = DateTime::createFromFormat('U', $date[0], new DateTimeZone('UTC')); if (is_object($dateObject)) { return $dateObject->format('d.m.Y'); } + return ' '; } } ?>