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

Fix #752 date search

Browse Source
This commit is contained in:
Romain Neutron
2012-06-26 12:23:45 +02:00
parent 1aaeec8eb5
commit 69ba5a020d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/classes/searchEngine/options.class.php
View File

@@ -356,7 +356,7 @@ class searchEngine_options implements Serializable
public function set_min_date($min_date)
{
if ( ! is_null($min_date) && trim($min_date) !== '') {
$this->date_min = DateTime::createFromFormat('d/m/Y H:i:s', $min_date . ' 00:00:00');
$this->date_min = DateTime::createFromFormat('Y/m/d H:i:s', $min_date . ' 00:00:00');
}
return $this;
@@ -379,7 +379,7 @@ class searchEngine_options implements Serializable
public function set_max_date($max_date)
{
if ( ! is_null($max_date) && trim($max_date) !== '') {
$this->date_max = DateTime::createFromFormat('d/m/Y H:i:s', $max_date . ' 23:59:59');
$this->date_max = DateTime::createFromFormat('Y/m/d H:i:s', $max_date . ' 23:59:59');
}
return $this;

2
templates/web/prod/index.html.twig
View File

@@ -445,7 +445,7 @@
<select name="datefield" class="input-medium">
{% for field_id, field in search_datas['dates'] %}
<option onchange="checkFilters(true);"
class="field_switch field_{{field['sbas']|implode(' field_')}}" value="{{field_id}}">{{field['fieldname']}}</option>
class="field_switch field_{{field['sbas']|implode(' field_')}}" value="{{ field['fieldname'] }}">{{field['fieldname']}}</option>
{% endfor %}
<option value="{{search_datas['dates']|array_keys|implode('|')}}" selected="selected">
{% trans 'rechercher dans tous les champs' %}