From 157da84b5e8816a1075ea4a8a821c1ed1ce7b048 Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@gmail.com>
Date: Fri, 13 Sep 2019 11:08:43 +0200
Subject: [PATCH] FIX #11641 TIME 1:10 added history insertion when adding or
removing resources in folders
---
.../folder/controllers/FolderController.php | 18 ++++++++++++++++++
src/core/lang/lang-en.php | 3 +++
src/core/lang/lang-fr.php | 3 +++
src/core/lang/lang-nl.php | 3 +++
4 files changed, 27 insertions(+)
diff --git a/src/app/folder/controllers/FolderController.php b/src/app/folder/controllers/FolderController.php
index 190b0ad6a94..a9b3dfc61a7 100755
--- a/src/app/folder/controllers/FolderController.php
+++ b/src/app/folder/controllers/FolderController.php
@@ -485,6 +485,15 @@ class FolderController
ResourceFolderModel::create(['folder_id' => $args['id'], 'res_id' => $value]);
}
+ HistoryController::add([
+ 'tableName' => 'resources_folders',
+ 'recordId' => $args['id'],
+ 'eventType' => 'ADD',
+ 'info' => _FOLDER_RESOURCES_ADDED . " : " . implode(", ", $resourcesToClassify) . " " . _FOLDER_TO_FOLDER . " " . $args['id'],
+ 'moduleId' => 'folder',
+ 'eventId' => 'folderResourceAdded',
+ ]);
+
return $response->withJson(['countResources' => count($foldersResources) + count($resourcesToClassify)]);
}
@@ -519,6 +528,15 @@ class FolderController
ResourceFolderModel::delete(['where' => ['folder_id = ?', 'res_id = ?'], 'data' => [$args['id'], $value]]);
}
+ HistoryController::add([
+ 'tableName' => 'resources_folders',
+ 'recordId' => $args['id'],
+ 'eventType' => 'DEL',
+ 'info' => _FOLDER_RESOURCES_REMOVED . " : " . implode(", ", $resourcesToUnclassify) . " " . _FOLDER_TO_FOLDER . " " . $args['id'],
+ 'moduleId' => 'folder',
+ 'eventId' => 'folderResourceAdded',
+ ]);
+
return $response->withJson(['countResources' => count($foldersResources) - count($resourcesToUnclassify)]);
}
diff --git a/src/core/lang/lang-en.php b/src/core/lang/lang-en.php
index ff7555ee586..ed69fe289fe 100755
--- a/src/core/lang/lang-en.php
+++ b/src/core/lang/lang-en.php
@@ -487,5 +487,8 @@ define("_FOLDER_CREATION", "Folder creation");
define("_FOLDER_MODIFICATION", "Folder modification");
define("_FOLDER_SUPPRESSION", "Folder suppression");
define("_FOLDER_SHARING_MODIFICATION", "Folder sharing modification");
+define("_FOLDER_RESOURCES_ADDED", "Added resources");
+define("_FOLDER_RESOURCES_REMOVED", "Removed resources");
+define("_FOLDER_TO_FOLDER", "to folder");
define('_NOT_EXISTS', "doesn't exist");
diff --git a/src/core/lang/lang-fr.php b/src/core/lang/lang-fr.php
index 66f4fea3aa2..1abe9617483 100755
--- a/src/core/lang/lang-fr.php
+++ b/src/core/lang/lang-fr.php
@@ -486,5 +486,8 @@ define("_FOLDER_CREATION", "Dossier créé");
define("_FOLDER_MODIFICATION", "Dossier modifié");
define("_FOLDER_SUPPRESSION", "Dossier supprimé");
define("_FOLDER_SHARING_MODIFICATION", "Partage de dossier modifié");
+define("_FOLDER_RESOURCES_ADDED", "Ressource(s) ajoutée(s)");
+define("_FOLDER_RESOURCES_REMOVED", "Ressource(s) retirée(s)");
+define("_FOLDER_TO_FOLDER", "au dossier");
define("_NOT_EXISTS", "n'existe pas");
diff --git a/src/core/lang/lang-nl.php b/src/core/lang/lang-nl.php
index 1074270be2e..c11b015f13c 100755
--- a/src/core/lang/lang-nl.php
+++ b/src/core/lang/lang-nl.php
@@ -491,5 +491,8 @@ define("_FOLDER_CREATION", "Folder creation_TO_TRANSLATE");
define("_FOLDER_MODIFICATION", "Folder modification_TO_TRANSLATE");
define("_FOLDER_SUPPRESSION", "Folder suppression_TO_TRANSLATE");
define("_FOLDER_SHARING_MODIFICATION", "Folder sharing modification_TO_TRANSLATE");
+define("_FOLDER_RESOURCES_ADDED", "Added resources_TO_TRANSLATE");
+define("_FOLDER_RESOURCES_REMOVED", "Removed resources_TO_TRANSLATE");
+define("_FOLDER_TO_FOLDER", "to folder_TO_TRANSLATE");
define('_NOT_EXISTS', 'bestaat niet');
--
GitLab