Skip to content

Commit 6ec4216

Browse files
authored
fix: minor request routing updates
1 parent f479ddc commit 6ec4216

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/Http/Api/Controller.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ protected function handleIndexActionCommon($request = null, array $extraParams =
102102
$this->validateRequestType($request);
103103
$this->addCustomParams($extraParams);
104104
$this->authoriseUserAction('viewAny');
105-
$this->handleCommonActions($request);
105+
$this->handleCommonActions($this->request);
106106
$this->qualifyCollectionQuery();
107107
}
108108

@@ -178,7 +178,7 @@ public function handleShowAction($id, $request = null, array $extraParams = [])
178178
$this->validateRequestType($request);
179179
$this->addCustomParams($extraParams);
180180

181-
$this->handleCommonActions($request);
181+
$this->handleCommonActions($this->request);
182182
$fields = $this->parseFieldParams();
183183
$this->qualifyItemQuery();
184184

@@ -205,7 +205,7 @@ public function handleUpdateAction($id, $request, array $extraParams = [])
205205
$this->validateRequestType($request);
206206
$this->addCustomParams($extraParams);
207207

208-
$this->handleCommonActions($request);
208+
$this->handleCommonActions($this->request);
209209

210210
try {
211211
$item = $this->builder->whereKey($id)->firstOrFail();
@@ -214,9 +214,9 @@ public function handleUpdateAction($id, $request, array $extraParams = [])
214214
return $this->errorNotFound('Record does not exist');
215215
}
216216

217-
$this->validate($request, $this->rulesForUpdate($item->getKey()));
217+
$this->validate($this->request, $this->rulesForUpdate($item->getKey()));
218218

219-
$data = $this->qualifyUpdateQuery($request->all());
219+
$data = $this->qualifyUpdateQuery($this->request->all());
220220

221221
$updates = $this->addTableData($data);
222222

@@ -232,7 +232,7 @@ public function handleUpdateAction($id, $request, array $extraParams = [])
232232

233233
$this->storeRelated($item, $diff, $data);
234234

235-
event(new Updated($item, $request));
235+
event(new Updated($item, $this->request));
236236

237237
DB::commit();
238238

@@ -261,7 +261,7 @@ public function handleDestroyAction($id, $request = null)
261261
$item = $this->builder->whereKey($id)->firstOrFail();
262262
$this->authoriseUserAction('delete', $item);
263263
$item->delete();
264-
event(new Deleted($item, $request));
264+
event(new Deleted($item, $this->request));
265265
} catch (ModelNotFoundException $exception) {
266266
return $this->errorNotFound('Record not found');
267267
}

0 commit comments

Comments
 (0)