Skip to content

Commit f5ca949

Browse files
committed
Merge branch 'LowerRockLabs-BulkActionsCount' into develop
2 parents 7214613 + 9849983 commit f5ca949

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

resources/views/components/table/tr/bulk-actions.blade.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
$colspan = $component->getColspanCount();
99
$selected = $component->getSelectedCount();
1010
$selectAll = $component->selectAllIsEnabled();
11+
$simplePagination = ($component->paginationMethod == "simple") ? true : false;
1112
@endphp
1213

1314
@if ($theme === 'tailwind')
@@ -20,7 +21,7 @@ class="bg-indigo-50 dark:bg-gray-900 dark:text-white"
2021
<div wire:key="all-selected-{{ $table }}">
2122
<span>
2223
@lang('You are currently selecting all')
23-
<strong>{{ number_format($rows->total()) }}</strong>
24+
@if(!$simplePagination) <strong>{{ number_format($rows->total()) }}</strong> @endif
2425
@lang('rows').
2526
</span>
2627

@@ -39,7 +40,7 @@ class="ml-1 text-blue-600 underline text-gray-700 text-sm leading-5 font-medium
3940
@lang('You have selected')
4041
<strong>{{ $selected }}</strong>
4142
@lang('rows, do you want to select all')
42-
<strong>{{ number_format($rows->total()) }}</strong>?
43+
@if(!$simplePagination) <strong>{{ number_format($rows->total()) }}</strong> @endif
4344
</span>
4445

4546
<button
@@ -72,7 +73,7 @@ class="ml-1 text-blue-600 underline text-gray-700 text-sm leading-5 font-medium
7273
<div wire:key="all-selected-{{ $table }}">
7374
<span>
7475
@lang('You are currently selecting all')
75-
<strong>{{ number_format($rows->total()) }}</strong>
76+
@if(!$simplePagination) <strong>{{ number_format($rows->total()) }}</strong> @endif
7677
@lang('rows').
7778
</span>
7879

@@ -91,7 +92,7 @@ class="btn btn-primary btn-sm"
9192
@lang('You have selected')
9293
<strong>{{ $selected }}</strong>
9394
@lang('rows, do you want to select all')
94-
<strong>{{ number_format($rows->total()) }}</strong>?
95+
@if(!$simplePagination) <strong>{{ number_format($rows->total()) }}</strong> @endif
9596
</span>
9697

9798
<button

resources/views/components/tools/toolbar.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -843,7 +843,7 @@ class="form-select"
843843
@endif
844844

845845
@if ($component->hasConfigurableAreaFor('toolbar-right-end'))
846-
@include($component->getConfigurableAreaFor('toolbar-right-end'), $component->getParametersForConfigurableArea('toolbar-righ-end'))
846+
@include($component->getConfigurableAreaFor('toolbar-right-end'), $component->getParametersForConfigurableArea('toolbar-right-end'))
847847
@endif
848848
</div>
849849
</div>

0 commit comments

Comments
 (0)