Use auto-applying site filter, instead of adding new site query param.

statamic · Nov 16, 2020 · adbeaeb · adbeaeb
1 parent a3769af
commit adbeaeb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/resources/js/components/entries/Widget.vue b/resources/js/components/entries/Widget.vue
@@ -46,16 +46,15 @@ export default {
 
     props: {
         collection: String,
-        site: String,
     },
 
     data() {
         return {
             cols: [{ label: "Title", field: "title", visible: true }],
             listingKey: 'entries',
-            requestUrl: cp_url(`collections/${this.collection}/entries?site=${this.site}`),
+            requestUrl: cp_url(`collections/${this.collection}/entries`),
         }
-    }
+    },
 
 }
 </script>
diff --git a/resources/views/widgets/collection.blade.php b/resources/views/widgets/collection.blade.php
@@ -5,7 +5,7 @@
     </div>
     <collection-widget
         collection="{{ $collection->handle() }}"
-        site="{{ $site->handle() }}"
+        :filters="{{ $filters->toJson() }}"
         initial-sort-column="{{ $sortColumn }}"
         initial-sort-direction="{{ $sortDirection }}"
         :initial-per-page="{{ $limit }}"

diff --git a/src/Http/Controllers/CP/Collections/EntriesController.php b/src/Http/Controllers/CP/Collections/EntriesController.php
@@ -56,10 +56,6 @@ protected function indexQuery($collection)
     {
         $query = $collection->queryEntries();
 
-        if ($site = request('site')) {
-            $query->where('site', $site);
-        }
-
         if ($search = request('search')) {
             if ($collection->hasSearchIndex()) {
                 return $collection->searchIndex()->ensureExists()->search($search);

diff --git a/src/Widgets/Collection.php b/src/Widgets/Collection.php
@@ -3,7 +3,7 @@
 namespace Statamic\Widgets;
 
 use Statamic\Facades\Collection as CollectionAPI;
-use Statamic\Facades\Site;
+use Statamic\Facades\Scope;
 use Statamic\Facades\User;
 
 class Collection extends Widget
@@ -31,7 +31,9 @@ public function html()
 
         return view('statamic::widgets.collection', [
             'collection' => $collection,
-            'site' => Site::selected(),
+            'filters' => Scope::filters('entries', [
+                'collection' => $collection->handle(),
+            ]),
             'title' => $this->config('title', $collection->title()),
             'button' => __('New :thing', ['thing' => $collection->entryBlueprint()->title()]),
             'limit' => $this->config('limit', 5),