From eb8f6a251a046ac80a93dabe6eff7cd0a52d5278 Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Mon, 25 Nov 2019 17:23:10 +0100
Subject: [PATCH] Fix code review
---
migration/19.12/1912.sql | 2 +-
.../contact/controllers/ContactController.php | 2 +-
src/app/resource/controllers/ResController.php | 16 ++--------------
src/core/lang/lang-en.php | 2 ++
src/core/lang/lang-nl.php | 2 ++
5 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/migration/19.12/1912.sql b/migration/19.12/1912.sql
index 6846a74b0c4..f473934c094 100644
--- a/migration/19.12/1912.sql
+++ b/migration/19.12/1912.sql
@@ -71,7 +71,7 @@ DELETE FROM actions WHERE action_page = 'view' OR component = 'viewDoc';
ALTER TABLE groupbasket DROP COLUMN IF EXISTS list_event_data;
ALTER TABLE groupbasket ADD COLUMN list_event_data jsonb;
-update groupbasket set list_event_data = '"info"', list_event = 'processDocument'
+update groupbasket set list_event_data = '"info"'
where group_id in (
select group_id
from actions_groupbaskets
diff --git a/src/app/contact/controllers/ContactController.php b/src/app/contact/controllers/ContactController.php
index 75021d35e5a..d1736c825fc 100755
--- a/src/app/contact/controllers/ContactController.php
+++ b/src/app/contact/controllers/ContactController.php
@@ -235,7 +235,7 @@ class ContactController
public function getContacts(Request $request, Response $response, array $args)
{
- $resource = ResModel::getById(['select', ['*'], 'resId' => $args['resId']]);
+ $resource = ResModel::getById(['select' => ['*'], 'resId' => $args['resId']]);
if (empty($resource)) {
return $response->withStatus(404)->withJson(['errors' => 'Document does not exist']);
diff --git a/src/app/resource/controllers/ResController.php b/src/app/resource/controllers/ResController.php
index 73533e6b18a..3028efeb5bc 100755
--- a/src/app/resource/controllers/ResController.php
+++ b/src/app/resource/controllers/ResController.php
@@ -827,18 +827,6 @@ class ResController
}
}
if (!empty($body['folders'])) {
- // Delete association with user's folders
- $idToDelete = FolderModel::getWithResources([
- 'select' => ['resources_folders.id'],
- 'where' => ['resources_folders.res_id = ?', 'folders.user_id = ?'],
- 'data' => [$args['resId'], $GLOBALS['id']]
- ]);
- $idToDelete = array_column($idToDelete, 'id');
- if (!empty($idToDelete)) {
- ResourceFolderModel::delete(['where' => ['id in (?)'], 'data' => [$idToDelete]]);
- }
-
- // Delete association with folders the user can see
$entities = EntityModel::getWithUserEntities([
'select' => ['entities.id'],
'where' => ['user_id = ?'],
@@ -847,8 +835,8 @@ class ResController
$entities = array_column($entities, 'id');
$idToDelete = FolderModel::getWithEntitiesAndResources([
'select' => ['resources_folders.id'],
- 'where' => ['resources_folders.res_id = ?', 'entities_folders.entity_id in (?)'],
- 'data' => [$args['resId'], $entities]
+ 'where' => ['resources_folders.res_id = ?', 'entities_folders.entity_id in (?) || folders.user_id = ?'],
+ 'data' => [$args['resId'], $entities, $GLOBALS['id']]
]);
$idToDelete = array_column($idToDelete, 'id');
if (!empty($idToDelete)) {
diff --git a/src/core/lang/lang-en.php b/src/core/lang/lang-en.php
index 8dd8b3173eb..669d4fc67ce 100755
--- a/src/core/lang/lang-en.php
+++ b/src/core/lang/lang-en.php
@@ -224,6 +224,8 @@ define('_PUT_IN_COPY', 'Add on copy');
define('_PUT_IN_COPY_DESC', 'Opens a modal ONLY to add or delete COPY people from the mailing list.');
define('_SIMPLE_CONFIRM', 'Simple confirmation');
define('_SIMPLE_CONFIRM_DESC', "Simply open a modal of confirmation of the action to be performed.");
+define('_NO_CONFIRM', 'No confirmation');
+define('_NO_CONFIRM_DESC', "Perform the action without confirmation");
define('_VIEW_DOC', 'See the mail');
define('_CLOSE_MAIL', 'Close a mail');
define('_CLOSE_MAIL_DESC', 'Allows you to update the closing date of a mail. ESSENTIAL in order to complete your document workflow.');
diff --git a/src/core/lang/lang-nl.php b/src/core/lang/lang-nl.php
index e9444e01ca6..b5daf940a85 100755
--- a/src/core/lang/lang-nl.php
+++ b/src/core/lang/lang-nl.php
@@ -224,6 +224,8 @@ define('_PUT_IN_COPY', 'In kopie toevoegen');
define('_PUT_IN_COPY_DESC', 'Opent een modaliteit die ENKEL toelaat personen in KOPIE aan de verdelingslijst toe te voegen of ervan te verwijderen.');
define('_SIMPLE_CONFIRM', 'Eenvoudige bevestiging');
define('_SIMPLE_CONFIRM_DESC', 'Opent eenvoudigweg een bevestigingsmodaliteit van de uit te voeren actie.');
+define('_NO_CONFIRM', 'No confirmation'); //_TO_TRANSLATE
+define('_NO_CONFIRM_DESC', "Perform the action without confirmation"); //_TO_TRANSLATE
define('_VIEW_DOC', 'Het brief bekijken');
define('_CLOSE_MAIL', 'Een brief afsluiten');
define('_CLOSE_MAIL_DESC', 'Om de afsluitingsdatum van een brief bij te werken. ESSENTIEEL om uw documentworkflow af te sluiten.');
--
GitLab