Skip to content

Commit 6bf75c5

Browse files
authored
Merge branch 'master' into develop
2 parents d939faf + e2eca7f commit 6bf75c5

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/Http/Controllers/Api/Controller.php

+5-2
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ public function handleIndexAction($request)
111111
$this->authoriseUserAction('viewAny');
112112
$this->getUriParser($request);
113113

114+
114115
$this->parseIncludeParams();
115116
$this->parseSortParams();
116117
$this->parseFilterParams();
@@ -132,8 +133,8 @@ public function handleIndexAction($request)
132133
*/
133134
public function handleStoreAction($request)
134135
{
135-
$this->validateRequestType($request);
136136

137+
$this->validateRequestType($request);
137138
$this->authoriseUserAction('create');
138139

139140
$data = $request->all();
@@ -157,6 +158,7 @@ public function handleStoreAction($request)
157158
DB::beginTransaction();
158159

159160
try {
161+
160162
$item = self::$model->create($insert);
161163

162164
$this->storeRelated($item, $diff, $data);
@@ -172,7 +174,6 @@ public function handleStoreAction($request)
172174
throw new ApiException($message);
173175
} catch (\Exception $exception) {
174176
DB::rollback();
175-
176177
return $this->errorWrongArgs($exception->getMessage());
177178
}
178179
}
@@ -221,6 +222,7 @@ public function handleUpdateAction($id, $request)
221222

222223
$this->validate($request, $this->rulesForCreate());
223224

225+
224226
$data = $request->all();
225227

226228
if (empty($data)) {
@@ -245,6 +247,7 @@ public function handleUpdateAction($id, $request)
245247

246248
$this->unguardIfNeeded();
247249

250+
248251
DB::beginTransaction();
249252

250253
try {

0 commit comments

Comments
 (0)