close #622 Fixed: If the app use pagination, It not change title.

akaunting · Nov 12, 2018 · f8566a7 · f8566a7
1 parent f029858
commit f8566a7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/resources/views/partials/admin/pagination.blade.php b/resources/views/partials/admin/pagination.blade.php
@@ -2,7 +2,7 @@
 
 @if ($items->firstItem())
     <div class="pull-left" style="margin-top: 7px;">
-        <small>{{ trans('pagination.showing', ['first' => $items->firstItem(), 'last' => $items->lastItem(), 'total' => $items->total(), 'type' => strtolower(trans_choice('general.' . $type, 2))]) }}</small>
+        <small>{{ trans('pagination.showing', ['first' => $items->firstItem(), 'last' => $items->lastItem(), 'total' => $items->total(), 'type' => strtolower((isset($title)) ? $title : trans_choice('general.' . $type, 2))]) }}</small>
     </div>
     <div class="pull-right">
         {!! $items->appends(request()->except('page'))->links() !!}

diff --git a/resources/views/partials/customer/pagination.blade.php b/resources/views/partials/customer/pagination.blade.php
@@ -2,7 +2,7 @@
 
 @if ($items->firstItem())
     <div class="pull-left" style="margin-top: 7px;">
-        <small>{{ trans('pagination.showing', ['first' => $items->firstItem(), 'last' => $items->lastItem(), 'total' => $items->total(), 'type' => strtolower(trans_choice('general.' . $type, 2))]) }}</small>
+        <small>{{ trans('pagination.showing', ['first' => $items->firstItem(), 'last' => $items->lastItem(), 'total' => $items->total(), 'type' => strtolower((isset($title)) ? $title : trans_choice('general.' . $type, 2))]) }}</small>
     </div>
     <div class="pull-right">
         {!! $items->appends(request()->except('page'))->links() !!}