forge-joniko/ldc-supportweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into trunk

Browse source
This commit is contained in:
Jérémy Munsch 2021-07-05 18:36:30 +02:00
commit dc2da30ff5
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/TicketController.php
View file

@ -88,7 +88,7 @@ class TicketController extends Controller
Session::has('tickets.sort_col') and
Session::has('tickets.sort_way') and
in_array(Session::get('tickets.sort_col'), [
'id', 'project', 'created_at', 'created_by',
'id', 'project_id', 'created_at', 'created_by',
'type', 'status'
])
) {

2
resources/views/ticket/index.blade.php
View file

@ -55,7 +55,7 @@ $userPr = Auth::user()->projects ?? collect([]);
</th>
<th scope="col">
{{__('Projet') }}&nbsp;
@include('modules.sorter', ['colname' => 'project'])
@include('modules.sorter', ['colname' => 'project_id'])
</th>
<th scope="col">
{{__('Type') }}&nbsp;