Merge 3.x into master

sonata-project · Apr 2, 2019 · a358bf4 · a358bf4
2 parents ce5dd00 + 9ae3e52
commit a358bf4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/src/Controller/CRUDController.php b/src/Controller/CRUDController.php
@@ -1261,7 +1261,7 @@ protected function redirectTo($object)
                     $url = $this->admin->generateObjectUrl(
                         $route,
                         $object,
-                        $request->request->has('_tab') ? ['_tab' => $request->request->get('_tab')] : []
+                        $this->getSelectedTab($request)
                     );
 
                     break;
@@ -1525,6 +1525,11 @@ final protected function trans($id, array $parameters = [], $domain = null, $loc
         return $this->get('translator')->trans($id, $parameters, $domain, $locale);
     }
 
+    private function getSelectedTab(Request $request)
+    {
+        return array_filter(['_tab' => $request->request->get('_tab')]);
+    }
+
     private function checkParentChildAssociation(Request $request, $object): void
     {
         if (!($parentAdmin = $this->admin->getParent())) {

diff --git a/src/Resources/public/Admin.js b/src/Resources/public/Admin.js
@@ -729,6 +729,12 @@ var Admin = {
             setTimeout(function() {
                 form.find('button').prop('disabled', true);
             }, 1);
+
+            var tabSelected = form.find('.nav-tabs li.active .changer-tab');
+
+            if (tabSelected.length > 0) {
+                form.find('input[name="_tab"]').val(tabSelected.attr('aria-controls'));
+            }
         });
     },
     /**
@@ -758,7 +764,6 @@ var Admin = {
             window.history.pushState({
                 path: newurl
             }, '', newurl);
-            jQuery(this).parent('.nav-tabs-custom').find('input[name="_tab"]').val(tab);
         });
     }
 };

diff --git a/tests/Controller/HelperControllerTest.php b/tests/Controller/HelperControllerTest.php
@@ -198,6 +198,7 @@ public function testsetObjectFieldValueAction(): void
         $fieldDescription = $this->prophesize(FieldDescriptionInterface::class);
         $pool = $this->prophesize(Pool::class);
         $template = $this->prophesize(Template::class);
+        $template->render(Argument::cetera())->willReturn('some value');
         $translator = $this->prophesize(TranslatorInterface::class);
         $propertyAccessor = new PropertyAccessor();
         $templateRegistry = $this->prophesize(TemplateRegistryInterface::class);
@@ -245,6 +246,7 @@ public function testappendFormFieldElementAction(): void
         $fieldDescription = $this->prophesize(FieldDescriptionInterface::class);
         $modelManager = $this->prophesize(ModelManagerInterface::class);
         $template = $this->prophesize(Template::class);
+        $template->render(Argument::cetera())->willReturn('some value');
         $translator = $this->prophesize(TranslatorInterface::class);
         $propertyAccessor = new PropertyAccessor();
         $templateRegistry = $this->prophesize(TemplateRegistryInterface::class);