hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-15 14:03:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix search filter and export

Browse Source
This commit is contained in:
aynsix
2022-03-16 18:41:58 +03:00
parent 5e0645705a
commit 4bb577cf42
12 changed files with 320 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Alchemy/Phrasea/Controller/Admin/UserController.php
View File

@@ -169,7 +169,8 @@ class UserController extends Controller
'Fax',
'Job',
'Company',
'Position'
'Position',
'Last Connection'
]
];
@@ -190,7 +191,8 @@ class UserController extends Controller
$user->getFax(),
$user->getJob(),
$user->getCompany(),
$user->getActivity()
$user->getActivity(),
$this->getUserLastConnection($user)
];
}
@@ -941,6 +943,10 @@ class UserController extends Controller
];
}
private function getUserLastConnection(User $user)
{
return ($user->getLastConnection() != null) ? $user->getLastConnection()->format(DATE_ATOM): '';
}
/**
* @param Request $request
* @return UserHelper\Edit