fix bootstrap templates logic

bdelamatre · bdelamatre · commit 214764ead9c9 · 2021-04-21T21:25:35.000-04:00
diff --git a/resources/views/bootstrap-4/includes/pagination.blade.php b/resources/views/bootstrap-4/includes/pagination.blade.php
@@ -1,4 +1,4 @@
-@if ($pagination ?? false || $showPerPage ?? false)
+@if ($pagination ?? false && $showPerPage ?? false)
     <div class="row">
         <div class="col-12 col-md-6">
             {{ $rows->links() }}
diff --git a/resources/views/bootstrap-4/includes/per-page.blade.php b/resources/views/bootstrap-4/includes/per-page.blade.php
@@ -1,4 +1,4 @@
-@if ($pagination ?? false || $showPerPage ?? false)
+@if ($pagination ?? false && $showPerPage ?? false)
     <select
         wire:model="perPage"
         id="perPage"
diff --git a/resources/views/bootstrap-5/includes/pagination.blade.php b/resources/views/bootstrap-5/includes/pagination.blade.php
@@ -1,4 +1,4 @@
-@if ($pagination ?? false || $showPerPage ?? false)
+@if ($pagination ?? false && $showPerPage ?? false)
     <div class="row">
         <div class="col-12 col-md-6">
             {{ $rows->links() }}
diff --git a/resources/views/bootstrap-5/includes/per-page.blade.php b/resources/views/bootstrap-5/includes/per-page.blade.php
@@ -1,4 +1,4 @@
-@if ($pagination ?? false || $showPerPage ?? false)
+@if ($pagination ?? false && $showPerPage ?? false)
     <select
         wire:model="perPage"
         id="perPage"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@if ($pagination ?? false \|\| $showPerPage ?? false)`
	`1`	`+@if ($pagination ?? false && $showPerPage ?? false)`
`2`	`2`	`<div class="row">`
`3`	`3`	`<div class="col-12 col-md-6">`
`4`	`4`	`{{ $rows->links() }}`