[5.x] Add option to add filters from collection/taxonomy list to brea…

…dcrumb »back« link in single view (#11243)

Co-authored-by: Florian Brinkmann <[email protected]>

src/Entries/Collection.php

@@ -265,6 +265,14 @@ public function showUrl()
         return cp_route('collections.show', $this->handle());
     }
 
+    public function breadcrumbUrl()
+    {
+        $referer = request()->header('referer');
+        $showUrl = $this->showUrl();
+
+        return $referer && Str::before($referer, '?') === $showUrl ? $referer : $showUrl;
+    }
+
     public function editUrl()
     {
         return cp_route('collections.edit', $this->handle());

src/Http/Controllers/CP/Collections/EntriesController.php

@@ -545,7 +545,7 @@ protected function breadcrumbs($collection)
             ],
             [
                 'text' => $collection->title(),
-                'url' => $collection->showUrl(),
+                'url' => $collection->breadcrumbUrl(),
             ],
         ]);
     }

src/Http/Controllers/CP/Taxonomies/TermsController.php

@@ -354,7 +354,7 @@ protected function breadcrumbs($taxonomy)
             ],
             [
                 'text' => $taxonomy->title(),
-                'url' => $taxonomy->showUrl(),
+                'url' => $taxonomy->breadcrumbUrl(),
             ],
         ]);
     }

src/Taxonomies/Taxonomy.php

@@ -81,6 +81,14 @@ public function showUrl()
         return cp_route('taxonomies.show', $this->handle());
     }
 
+    public function breadcrumbUrl()
+    {
+        $referer = request()->header('referer');
+        $showUrl = $this->showUrl();
+
+        return $referer && Str::before($referer, '?') === $showUrl ? $referer : $showUrl;
+    }
+
     public function editUrl()
     {
         return cp_route('taxonomies.edit', $this->handle());