From ef8fe1fbddd41e091576bd61041232d6efa89d6d Mon Sep 17 00:00:00 2001 From: baptiste Date: Thu, 22 Dec 2016 10:02:37 +0100 Subject: [PATCH 1/3] Inject local current in get Url to correct the wrong URL in i18n --- Resolver/WidgetFilterContentResolver.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; } From 204ee9e5f0416dd6ca9c3a12ba0586452f80b98f Mon Sep 17 00:00:00 2001 From: baptiste Date: Thu, 22 Dec 2016 14:42:55 +0100 Subject: [PATCH 2/3] update victoire tag dependency --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 88c528f..f867a4c 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "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" }, From 2f7b0c513c2208b2394ead8a7ad3ee13205dc22a Mon Sep 17 00:00:00 2001 From: Baptiste Date: Wed, 26 Jul 2017 12:22:48 +0200 Subject: [PATCH 3/3] fix for Troopers/AjaxBundle v1.3 --- Resources/views/show.html.twig | 3 +-- composer.json | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) 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 f867a4c..0504592 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "beberlei/DoctrineExtensions": "1.0.x-dev", "victoire/victoire": ">=2.2.7", "lexik/form-filter-bundle": "~5.0", - "troopers/ajax-bundle": "~1.2" + "troopers/ajax-bundle": "~1.3" }, "autoload": { "psr-0": {