PHRAS-294 #fix display sort & date fields in advanced search

This commit is contained in:
Nicolas Le Goff
2014-09-25 15:06:33 +02:00
parent a7b59b84c7
commit 8a7d49bbbf
2 changed files with 52 additions and 51 deletions

View File

@@ -334,8 +334,8 @@
<span>{% trans 'Trier par ' %}</span>
<select name="sort" class="input-small">
{% for sort, sort_name in app['phraseanet.SE'].getAvailableSort() %}
<option value="{{ sort }}" {% if sort == app['phraseanet.SE'].getDefaultSort() %}selected="selected" class="default-selection"{% endif %}>{{ sort_name }}</option>
{% for sort in search_datas['sort'] %}
<option value="{{ sort.fieldname }}" {% if sort.fieldname == app['phraseanet.SE'].getDefaultSort() %}selected="selected" class="default-selection"{% endif %}>{{ sort.fieldname }}</option>
{% endfor %}
</select>
<select name="ord" class="input-medium">
@@ -408,11 +408,16 @@
<td colspan="2">{% trans 'Rechercher dans un champ date' %}</td>
<td colspan="2">
<select name="date_field" class="input-medium">
{% for field in app['phraseanet.SE'].getAvailableDateFields() %}
{% for date in search_datas['dates'] %}
<option onchange="checkFilters(true);"
class="" value="{{ field }}">{{ field }}</option>
class="" value="{{ date.fieldname }}">{{ date.fieldname }}</option>
{% endfor %}
<option value="{{ app['phraseanet.SE'].getAvailableDateFields()|join('|') }}" selected="selected">
{% set date_field_names = [] %}
{% for field in search_datas['dates'] %}
{% set date_field_names = date_field_names|merge([field.fieldname]) %}
{% endfor %}
<option value="{{ date_field_names|join('|') }}" selected="selected">
{% trans 'rechercher dans tous les champs' %}
</option>
</select>