Merge branch 'develop' into trunk
This commit is contained in:
commit
dc2da30ff5
2 changed files with 2 additions and 2 deletions
|
|
@ -88,7 +88,7 @@ class TicketController extends Controller
|
||||||
Session::has('tickets.sort_col') and
|
Session::has('tickets.sort_col') and
|
||||||
Session::has('tickets.sort_way') and
|
Session::has('tickets.sort_way') and
|
||||||
in_array(Session::get('tickets.sort_col'), [
|
in_array(Session::get('tickets.sort_col'), [
|
||||||
'id', 'project', 'created_at', 'created_by',
|
'id', 'project_id', 'created_at', 'created_by',
|
||||||
'type', 'status'
|
'type', 'status'
|
||||||
])
|
])
|
||||||
) {
|
) {
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,7 @@ $userPr = Auth::user()->projects ?? collect([]);
|
||||||
</th>
|
</th>
|
||||||
<th scope="col">
|
<th scope="col">
|
||||||
{{__('Projet') }}
|
{{__('Projet') }}
|
||||||
@include('modules.sorter', ['colname' => 'project'])
|
@include('modules.sorter', ['colname' => 'project_id'])
|
||||||
</th>
|
</th>
|
||||||
<th scope="col">
|
<th scope="col">
|
||||||
{{__('Type') }}
|
{{__('Type') }}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue