Skip to content

Commit dc37439

Browse files
author
A. Van Driessche
authored
Merge pull request #2287 from codeeu/2285-online-list-of-activities-is-not-working-for-admins
Fix the str limit
2 parents cd1dcf9 + 4f2468f commit dc37439

2 files changed

Lines changed: 25 additions & 24 deletions

File tree

resources/views/livewire/online-event-card.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</div>
1717

1818
<div class="text-xs leading-5 text-gray-500 w-auto text-truncate">
19-
{!!str_limit($event->description,200)!!}
19+
{{ \Illuminate\Support\Str::limit($event->description, 200) }}
2020
</div>
2121
</div>
2222
</div>

resources/views/online-calendar/admin/list.blade.php

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,29 @@
1818

1919
<div class="mb-4">
2020

21-
<div class="border-b border-gray-200">
22-
<nav class="-mb-px flex">
23-
{{-- @include('online-calendar.admin._tab', [--}}
24-
{{-- 'targetParam'=>'online/list',--}}
25-
{{-- 'route'=>'admin.online-events',--}}
26-
{{--'title'=>'All Online Activities'--}}
27-
{{--])--}}
28-
@include('online-calendar.admin._tab', [
29-
'targetParam'=>'online/promoted',
30-
'route'=>'promoted_events',
31-
'title'=>'Pending Approval Activities'
21+
<div class="border-b border-gray-200">
22+
<nav class="-mb-px flex">
23+
@role('activities admin')
24+
@include('online-calendar.admin._tab', [
25+
'targetParam'=>'online/list',
26+
'route'=>'admin.online-events',
27+
'title'=>'All Online Activities'
3228
])
33-
@include('online-calendar.admin._tab', [
34-
'targetParam'=>'online/featured',
35-
'route'=>'featured_events',
36-
'title'=>'Featured Activities'
29+
@endrole
30+
@include('online-calendar.admin._tab', [
31+
'targetParam'=>'online/promoted',
32+
'route'=>'promoted_events',
33+
'title'=>'Pending Approval Activities'
34+
])
35+
@include('online-calendar.admin._tab', [
36+
'targetParam'=>'online/featured',
37+
'route'=>'featured_events',
38+
'title'=>'Featured Activities'
3739
])
3840

3941

40-
</nav>
41-
</div>
42+
</nav>
43+
</div>
4244

4345
</div>
4446

@@ -72,9 +74,9 @@
7274
<th class="px-6 py-3 border-b border-gray-200 bg-gray-50 text-left text-xs leading-4 font-medium text-gray-500 uppercase tracking-wider">
7375
Country
7476
</th>
75-
{{-- <th class="px-6 py-3 border-b border-gray-200 bg-gray-50 text-center text-xs leading-4 font-medium text-gray-500 uppercase tracking-wider">--}}
76-
{{-- Status--}}
77-
{{-- </th>--}}
77+
{{-- <th class="px-6 py-3 border-b border-gray-200 bg-gray-50 text-center text-xs leading-4 font-medium text-gray-500 uppercase tracking-wider">--}}
78+
{{-- Status--}}
79+
{{-- </th>--}}
7880
<th class="px-6 py-3 border-b border-gray-200 bg-gray-50 text-center text-xs leading-4 font-medium text-gray-500 uppercase tracking-wider align-center">
7981
Actions
8082
</th>
@@ -85,8 +87,7 @@
8587

8688
@foreach($events as $event)
8789

88-
@livewire('online-event-card', ['event' => $event, 'countryName' =>
89-
$countryNames[$event->country_iso]])
90+
@livewire('online-event-card', ['event' => $event, 'countryName' => $countryNames[$event->country_iso]])
9091

9192
@endforeach
9293

@@ -105,7 +106,7 @@
105106
{{ $events->links() }}
106107
</div>
107108

108-
<span>
109+
</div>
109110
@endsection
110111

111112

0 commit comments

Comments
 (0)