From 70f77f7c0ee03c4240e60e918b90bc271d8fc86d Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Thu, 12 Sep 2019 10:16:07 +0200
Subject: [PATCH] chg: [decaying:simulation] restSearch comments added to be
 fixed in next decaying version

---
 app/Controller/DecayingModelController.php          | 6 +++---
 app/View/DecayingModel/decaying_tool_simulation.ctp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Controller/DecayingModelController.php b/app/Controller/DecayingModelController.php
index c8de1f132..f05a29605 100644
--- a/app/Controller/DecayingModelController.php
+++ b/app/Controller/DecayingModelController.php
@@ -502,6 +502,8 @@ class DecayingModelController extends AppController
         $this->set('all_models', $allowed_models);
     }
 
+    // TODO: Consider using the export tool to perform the post treatement
+    // as this does not mirror a complete restSearch (not using fetchAttribute)
     public function decayingToolRestSearch($continue = false)
     {
         if ($this->request->is('post') || $this->request->is('put')) {
@@ -529,9 +531,7 @@ class DecayingModelController extends AppController
             if ($filters === false) {
                 return $exception;
             }
-            if (!isset($filters['includeEventTags'])) {
-                $filters['includeEventTags'] = 1;
-            }
+            $filters['includeEventTags'] = 1;
             if (!isset($filters['excludeDecayed'])) {
                 $filters['excludeDecayed'] = 0;
             }
diff --git a/app/View/DecayingModel/decaying_tool_simulation.ctp b/app/View/DecayingModel/decaying_tool_simulation.ctp
index f203cbd0c..ada1d1d45 100644
--- a/app/View/DecayingModel/decaying_tool_simulation.ctp
+++ b/app/View/DecayingModel/decaying_tool_simulation.ctp
@@ -21,7 +21,7 @@
                         <div class="tab-content" style="padding: 5px; height: 100%;">
                             <div class="tab-pane <?php echo isset($attribute_id) ? '' : 'active'; ?>" id="restsearch" style="height: 100%;">
                                 <div style="display: flex; flex-direction: column; height: 100%;">
-                                    <h3 style="">Attribute RestSearch<span style="vertical-align: top; font-size: x-small;" class="fa fa-question-circle" title="Enforced fields: returnFormat"></span></h3>
+                                    <h3 style="">Attribute RestSearch<span style="vertical-align: top; font-size: x-small;" class="fa fa-question-circle" title="Enforced fields: [returnFormat, includeEventTags]"></span></h3>
     <?php
         $registered_taxonomies = array_keys($decaying_model['DecayingModel']['parameters']['base_score_config']);
         foreach ($registered_taxonomies as $i => &$taxonomy_name) {