From 9787b36d0b22762fee413a04651a7d3db4b0b371 Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Mon, 13 Aug 2018 14:30:31 +0530 Subject: [PATCH] Fix php7.2 issues --- app/Http/Controllers/Agent/helpdesk/UserController.php | 3 ++- .../default1/agent/helpdesk/organization/show.blade.php | 5 +++-- .../themes/default1/agent/helpdesk/user/show.blade.php | 8 ++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/Agent/helpdesk/UserController.php b/app/Http/Controllers/Agent/helpdesk/UserController.php index 3b5f347d5..d06a76056 100644 --- a/app/Http/Controllers/Agent/helpdesk/UserController.php +++ b/app/Http/Controllers/Agent/helpdesk/UserController.php @@ -614,12 +614,13 @@ class UserController extends Controller { try { $users = User::where('id', '=', $id)->first(); - if (count($users) > 0) { + if ($users && $users->count() > 0) { return view('themes.default1.agent.helpdesk.user.show', compact('users')); } else { return redirect()->back()->with('fails', Lang::get('lang.user-not-found')); } } catch (Exception $e) { + dd($e); return redirect()->back()->with('fails', $e->getMessage()); } } diff --git a/resources/views/themes/default1/agent/helpdesk/organization/show.blade.php b/resources/views/themes/default1/agent/helpdesk/organization/show.blade.php index 4bc054796..bb8f999ec 100644 --- a/resources/views/themes/default1/agent/helpdesk/organization/show.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/organization/show.blade.php @@ -125,7 +125,7 @@ class="active" id)->get(); foreach ($user_orga_relations as $user_orga_relation) { $user_orga_relation_id[] = $user_orga_relation->user_id; @@ -327,7 +327,8 @@ class="active" $string = strip_tags($title->title); // check atatchments $attachments = App\Model\helpdesk\Ticket\Ticket_attachments::where('thread_id', '=', $title->id)->first(); - $attach = count($attachments); + // dd($attachments); + $attach = ($attachments) ? count($attachments->toArray()): 0; if (strlen($string) > 40) { $stringCut = substr($string, 0, 40); diff --git a/resources/views/themes/default1/agent/helpdesk/user/show.blade.php b/resources/views/themes/default1/agent/helpdesk/user/show.blade.php index f4e7a087b..8477de072 100644 --- a/resources/views/themes/default1/agent/helpdesk/user/show.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/user/show.blade.php @@ -354,12 +354,12 @@ class="active" {!! Form::label('assign_group',Lang::get('lang.assigned_group')) !!} * - {!!Form::select('group',[Lang::get('lang.groups')=>$groups->lists('name','id')->toArray()],null,['class' => 'form-control select']) !!} + {!!Form::select('group',[Lang::get('lang.groups')=>$groups->pluck('name','id')->toArray()],null,['class' => 'form-control select']) !!} {!! Form::label('primary_dpt',Lang::get('lang.primary_department')) !!} * - {!! Form::select('primary_department', [Lang::get('lang.departments')=>$departments->lists('name','id')->toArray()],null,['class' => 'form-control select']) !!} + {!! Form::select('primary_department', [Lang::get('lang.departments')=>$departments->pluck('name','id')->toArray()],null,['class' => 'form-control select']) !!} @@ -423,12 +423,12 @@ class="active" {!! Form::label('assign_group',Lang::get('lang.assigned_group')) !!} * - {!!Form::select('group',[Lang::get('lang.groups')=>$groups->lists('name','id')->toArray()],null,['class' => 'form-control select']) !!} + {!!Form::select('group',[Lang::get('lang.groups')=>$groups->pluck('name','id')->toArray()],null,['class' => 'form-control select']) !!} {!! Form::label('primary_dpt',Lang::get('lang.primary_department')) !!} * - {!! Form::select('primary_department', [Lang::get('lang.departments')=>$departments->lists('name','id')->toArray()],null,['class' => 'form-control select']) !!} + {!! Form::select('primary_department', [Lang::get('lang.departments')=>$departments->pluck('name','id')->toArray()],null,['class' => 'form-control select']) !!}