TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

datepicker in admin logs

Browse Source
This commit is contained in:
Etienne Roudeix
2013-10-30 12:00:48 +01:00
parent 19e373f7fe
commit 52fa6783f3
12 changed files with 2828 additions and 500 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/lib/Thelia/Model/AdminLogQuery.php
View File

@@ -20,23 +20,25 @@ class AdminLogQuery extends BaseAdminLogQuery
{
/**
* @param null $login
* @param \DateTime $maxDateTime
* @param \DateTime $minDateTime
* @param null $minDate
* @param null $maxDate
* @param null $resources
* @param null $actions
*
* @return array|mixed|\Propel\Runtime\Collection\ObjectCollection
*/
public static function getEntries($login = null, \DateTime $maxDateTime = null, \DateTime $minDateTime = null, $resources = null, $actions = null)
public static function getEntries($login = null, $minDate = null, $maxDate = null, $resources = null, $actions = null)
{
$search = self::create();
if(null !== $minDateTime) {
$search->filterByCreatedAt($minDateTime->getTimestamp(), Criteria::GREATER_EQUAL);
if(null !== $minDate) {
$search->filterByCreatedAt($minDate, Criteria::GREATER_EQUAL);
}
if(null !== $maxDateTime) {
$search->filterByCreatedAt($maxDateTime->getTimestamp(), Criteria::LESS_EQUAL);
if(null !== $maxDate) {
$maxDateObject = new \DateTime($maxDate);
$maxDateObject->add(new \DateInterval('P1D'));
$search->filterByCreatedAt(date('Y-m-d', $maxDateObject->getTimestamp()), Criteria::LESS_THAN);
}
if(null !== $resources) {