mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-08 18:44:30 +00:00
- fix : last user query is ok when relog (no more 'ast' language...), but still includes facet filters.
- fix : advanced search, status-bit checkbox can be checked
This commit is contained in:
@@ -74,7 +74,7 @@ class Query implements ControllerProviderInterface
|
||||
$app['manipulator.user']->logQuery($app['authentication']->getUser(), $result->getQuery());
|
||||
|
||||
if ($app['settings']->getUserSetting($app['authentication']->getUser(), 'start_page') === 'LAST_QUERY') {
|
||||
$app['manipulator.user']->setUserSetting($app['authentication']->getUser(), 'start_page_query', $result->getQuery());
|
||||
$app['manipulator.user']->setUserSetting($app['authentication']->getUser(), 'start_page_query', $query);
|
||||
}
|
||||
|
||||
foreach ($options->getDataboxes() as $databox) {
|
||||
|
@@ -428,7 +428,8 @@
|
||||
<div class="status_filter">
|
||||
<span>{{ 'Status des documents a rechercher' | trans }}</span>
|
||||
<table style="width: 100%;">
|
||||
{% for databox_id, flag in search_status %}
|
||||
{% for status_key, flag in search_status %}
|
||||
{% for databox_id in flag.sbas %}
|
||||
<tr>
|
||||
<td>
|
||||
<label class="checkbox inline">
|
||||
@@ -454,6 +455,7 @@
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
{% endfor %}
|
||||
</table>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
@@ -195,8 +195,8 @@ function checkFilters(save) {
|
||||
$('select option:selected:not(".default-selection")', container).removeAttr('selected').selected(false);
|
||||
|
||||
$('select option.field_switch', container).addClass("hidden");
|
||||
|
||||
$('input.field_switch:checked', container).removeAttr('checked');
|
||||
$('input.field_switch:checkbox', container).parent().hide();
|
||||
|
||||
filters.removeClass('danger');
|
||||
|
||||
@@ -209,7 +209,6 @@ function checkFilters(save) {
|
||||
search.bases[sbas_id] = new Array();
|
||||
|
||||
var bas_ckbox = $this.find('.checkbas');
|
||||
|
||||
if (bas_ckbox.filter(':not(:checked)').length > 0) {
|
||||
danger = 'medium';
|
||||
}
|
||||
@@ -444,10 +443,12 @@ function initAnswerForm() {
|
||||
var $this = $(this),
|
||||
method = $this.attr('method') ? $this.attr('method') : 'POST';
|
||||
|
||||
var data = $this.serializeArray();
|
||||
|
||||
answAjax = $.ajax({
|
||||
type: method,
|
||||
url: $this.attr('action'),
|
||||
data: $this.serialize(),
|
||||
data: data,
|
||||
dataType: 'json',
|
||||
beforeSend: function (formData) {
|
||||
if (answAjaxrunning && answAjax.abort)
|
||||
|
Reference in New Issue
Block a user