From 2e22bee954b51e6c3763217b6d4fa6c0af226591 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Fri, 11 Jan 2019 11:52:32 +0100
Subject: [PATCH] refactoring
---
src/app/note/controllers/NoteController.php | 13 ++++++-------
src/app/user/controllers/UserController.php | 2 +-
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/app/note/controllers/NoteController.php b/src/app/note/controllers/NoteController.php
index e2e7d65fb03..5a9b3a8062d 100755
--- a/src/app/note/controllers/NoteController.php
+++ b/src/app/note/controllers/NoteController.php
@@ -51,12 +51,10 @@ class NoteController
}
if (isset($data['entities_chosen'])) {
-
if (!Validator::arrayType()->validate($data['entities_chosen'])) {
return $response->withStatus(400)->withJson(['errors' => 'Bad Request entities chosen']);
}
- foreach($data['entities_chosen'] as $entityId) {
-
+ foreach ($data['entities_chosen'] as $entityId) {
if ($entityId == null) {
return $response->withStatus(400)->withJson(['errors' => 'Bad Request entities chosen']);
}
@@ -78,12 +76,13 @@ class NoteController
//Insert relation note with entities in note_entities_table
if (!empty($noteId) && !empty($data['entities_chosen'])) {
- foreach($data['entities_chosen'] as $entity) {
- NoteEntityModel::create( ['item_id' => $entity, 'note_id' => $noteId ]);
+ foreach ($data['entities_chosen'] as $entity) {
+ NoteEntityModel::create(['item_id' => $entity, 'note_id' => $noteId ]);
}
}
- HistoryController::add( [
+ HistoryController::add(
+ [
'tableName' => "notes",
'recordId' => $noteId,
'eventType' => "ADD",
@@ -113,7 +112,7 @@ class NoteController
$date = $date->format('d-m-Y H:i');
$pdf->Cell(0, 20, "{$user['firstname']} {$user['lastname']} : {$date}", 1, 2, 'C', false);
- $pdf->MultiCell(0, 20, $note['note_text'] ,1, 'L', false);
+ $pdf->MultiCell(0, 20, $note['note_text'], 1, 'L', false);
$pdf->SetY($pdf->GetY() + 40);
}
$fileContent = $pdf->Output('', 'S');
diff --git a/src/app/user/controllers/UserController.php b/src/app/user/controllers/UserController.php
index fc9575c11cb..dddf9494144 100755
--- a/src/app/user/controllers/UserController.php
+++ b/src/app/user/controllers/UserController.php
@@ -430,7 +430,7 @@ class UserController
return $response->withStatus(400)->withJson(['errors' => 'User not found']);
}
- foreach($data['redirectedBasketIds'] as $redirectedBasketId) {
+ foreach ($data['redirectedBasketIds'] as $redirectedBasketId) {
$redirectedBasket = RedirectBasketModel::get(['select' => ['actual_user_id', 'owner_user_id', 'basket_id'], 'where' => ['id = ?'], 'data' => [$redirectedBasketId]]);
if (empty($redirectedBasket[0]) || ($redirectedBasket[0]['actual_user_id'] != $aArgs['id'] && $redirectedBasket[0]['owner_user_id'] != $aArgs['id'])) {
DatabaseModel::rollbackTransaction();
--
GitLab