From 43db6029dbabeb0970d0b36345ad8cabb056e9f7 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Mon, 15 Feb 2021 14:21:32 +0100
Subject: [PATCH] fix: [eventTimeline] Refrsh attribute index when dragging.
 Fix #6958

---
 app/Controller/AppController.php |  2 +-
 app/webroot/js/event-timeline.js | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
index 7fa452766..af9f9b4b0 100755
--- a/app/Controller/AppController.php
+++ b/app/Controller/AppController.php
@@ -25,7 +25,7 @@ class AppController extends Controller
 
     public $helpers = array('OrgImg', 'FontAwesome', 'UserName', 'DataPathCollector');
 
-    private $__queryVersion = '123';
+    private $__queryVersion = '124';
     public $pyMispVersion = '2.4.138';
     public $phpmin = '7.2';
     public $phprec = '7.4';
diff --git a/app/webroot/js/event-timeline.js b/app/webroot/js/event-timeline.js
index eae7fc782..2978ba84b 100644
--- a/app/webroot/js/event-timeline.js
+++ b/app/webroot/js/event-timeline.js
@@ -66,11 +66,11 @@ var options = {
     onMove: function(item, callback) {
         var newStart = moment(item.start.toISOString());
         var newEnd = (item.end !== undefined && item.end !== null) ? moment(item.end.toISOString()) : null;
-        var c1 = item.first_seen !== null ? !item.first_seen.isSame(newStart) : true;
-        var c2 = item.last_seen !== null ? !item.last_seen.isSame(newEnd) && item.seen_enabled : true;
-        if (c1) {
+        var fsChanged = item.first_seen !== null ? !item.first_seen.isSame(newStart) : true;
+        var lsChanged = item.last_seen !== null ? !item.last_seen.isSame(newEnd) && item.seen_enabled : false;
+        if (fsChanged) {
             if (item.first_seen === null) {
-                if (!c2) {
+                if (!lsChanged) {
                     update_seen(item, 'first', newStart, true, undefined);
                 } else {
                     update_seen(
@@ -92,14 +92,14 @@ var options = {
                     );
                 }
             } else {
-                update_seen(item, 'first', newStart, false, function() {
-                    if (c2) {
+                update_seen(item, 'first', newStart, !lsChanged, function() {
+                    if (lsChanged) {
                         update_seen(item, 'last', newEnd, true, undefined);
                     }
                 });
             }
         }
-        if (c2 && !c1) {
+        if (lsChanged && !fsChanged) {
           update_seen(item, 'last', newEnd, true, undefined);
         }
     }
@@ -304,7 +304,7 @@ function fetch_form_and_submit(itemType, item, seenType, value, reflect, callbac
                         if (contain_seen_attribute(item)) {
                             reflect_change(true, itemType, item.id, item);
                         } else {
-                            reflect_change(false, itemType, item.id, item);
+                            reflect_change(true, itemType, item.id, item);
                         }
                     }
                     form.remove()