cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #668 from ladybirdweb/analysis-X0xVxE

Browse Source 
Apply fixes from StyleCI
This commit is contained in:
Bhanu
2018-08-16 18:49:05 +05:30
committed by GitHub
parent ffc7206598 e972c95441
commit fdfc8f383c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Api/v1/ApiController.php
View File

@@ -1015,7 +1015,7 @@ class ApiController extends Controller
$v = \Validator::make($this->request->all(), [ $v = \Validator::make($this->request->all(), [
'user_id' => 'required|exists:users,id', 'user_id' => 'required|exists:users,id',
'ticket_id' => 'required|exists:tickets,id', 'ticket_id' => 'required|exists:tickets,id',
'body' => 'required', 'body' => 'required',
]); ]);
if ($v->fails()) { if ($v->fails()) {
$error = $v->errors(); $error = $v->errors();
@@ -1239,8 +1239,8 @@ class ApiController extends Controller
$result = $result->toArray(); $result = $result->toArray();
$result['title'] = utfEncoding(Ticket_Thread::where('ticket_id', $id)->orderBy('id')->first()->value('title')); $result['title'] = utfEncoding(Ticket_Thread::where('ticket_id', $id)->orderBy('id')->first()->value('title'));
$assigned = Tickets::where('id', $id)->select('assigned_to', 'team_id')->first()->toArray(); $assigned = Tickets::where('id', $id)->select('assigned_to', 'team_id')->first()->toArray();
if(!empty($assigned)){ if (!empty($assigned)) {
if($assigned['assigned_to'] != null){ if ($assigned['assigned_to'] != null) {
$result['assignee'] = User::where('id', $assigned['assigned_to'])->first()->name(); $result['assignee'] = User::where('id', $assigned['assigned_to'])->first()->name();
} elseif ($assigned['team_id'] != null) { } elseif ($assigned['team_id'] != null) {
$result['assignee'] = Teams::where('id', $assigned['team_id'])->first()->value('name'); $result['assignee'] = Teams::where('id', $assigned['team_id'])->first()->value('name');
@@ -1248,6 +1248,7 @@ class ApiController extends Controller
$result['assignee'] = null; $result['assignee'] = null;
} }
} }
return response()->json(compact('result')); return response()->json(compact('result'));
} catch (\Exception $e) { } catch (\Exception $e) {
$error = $e->getMessage(); $error = $e->getMessage();