diff --git a/Resolver/WidgetFilterContentResolver.php b/Resolver/WidgetFilterContentResolver.php index 484da97..56a027d 100644 --- a/Resolver/WidgetFilterContentResolver.php +++ b/Resolver/WidgetFilterContentResolver.php @@ -81,7 +81,8 @@ public function getWidgetStaticContent(Widget $widget) ]); $ajax = true; } else { - $action = $this->router->generate('victoire_core_page_show', ['url' => $widgetListing->getWidgetMap()->getView()->getUrl()]); + $currentLocale = $this->currentView->getCurrentView()->getCurrentLocale(); + $action = $this->router->generate('victoire_core_page_show', ['url' => $widgetListing->getWidgetMap()->getView()->getUrl($currentLocale)]); $ajax = false; } diff --git a/Resources/views/show.html.twig b/Resources/views/show.html.twig index 211b667..7b4fd7a 100644 --- a/Resources/views/show.html.twig +++ b/Resources/views/show.html.twig @@ -11,8 +11,7 @@ $(document).on('change', '#form-filter-{{ widget.id }} input, #form-filter-{{ widget.id }} select', function(e) { var form = $(this).parents('form'); {% if ajax %} - $('#canvasloader-container').fadeIn(); - $('#canvasloader-container--overlay').fadeIn(); + $wrapper.fadeIn(); var update = 'widget-{{widget.listing.id}}-container'; var formData = ''; $('form[data-widget-listing="{{widget.listing.id}}"]').each(function(index, elem){ diff --git a/composer.json b/composer.json index 88c528f..0504592 100644 --- a/composer.json +++ b/composer.json @@ -20,9 +20,9 @@ "php": ">=5.5.9", "symfony/framework-bundle": "~2.8|~3.0", "beberlei/DoctrineExtensions": "1.0.x-dev", - "victoire/victoire": ">=2.0.0", + "victoire/victoire": ">=2.2.7", "lexik/form-filter-bundle": "~5.0", - "troopers/ajax-bundle": "~1.2" + "troopers/ajax-bundle": "~1.3" }, "autoload": { "psr-0": {