From c4f5cd13555b13e8d17b3f85a148824d068302f9 Mon Sep 17 00:00:00 2001
From: zhaixiaojian <zhaixiaojian@easycorp.ltd>
Date: Mon, 15 Jul 2024 22:51:35 +0800
Subject: [PATCH] * [story#60132,done,4h,0h] historical records display values
 before and after changes.

---
 module/action/model.php     |  7 +++++++
 module/instance/control.php | 10 ++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/module/action/model.php b/module/action/model.php
index c21cf5c045..5a1fe56bc0 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -541,6 +541,13 @@ class actionModel extends model
                 {
                     $action->newValue = $action->comment;
                     $action->comment  = '';
+                    if(!empty($action->history))
+                    {
+                        $itemHistory = current($action->history);
+                        $action->newValue = $itemHistory->new;
+                        $action->oldValue = $itemHistory->old;
+                        $desc  = $this->lang->action->desc->{$actionType . 'change'};
+                    }
                 }
 
                 if(!empty($extra))
diff --git a/module/instance/control.php b/module/instance/control.php
index 71845773f7..1572d9a8d9 100644
--- a/module/instance/control.php
+++ b/module/instance/control.php
@@ -109,6 +109,7 @@ class instance extends control
                 if($memoryKb * 1024 > $freeMemory) $this->send(array('result' => 'fail', 'message' => $this->lang->instance->errors->notEnoughResource));
 
                 /* Request CNE to adjust memory size. */
+                $instance->oldVal = $currentResource->max->memory;
                 if(!$this->instance->updateMemorySize($instance, $memoryKb * 1024))
                 {
                     return $this->send(array('result' => 'fail', 'message' => dao::getError()));
@@ -116,15 +117,20 @@ class instance extends control
             }
 
             $cpu = $newInstance->cpu;
-            if($currentResource->max->cpu != $cpu && !$this->instance->updateCpuSize($instance, $cpu))
+            if($currentResource->max->cpu != $cpu)
             {
-                 return $this->send(array('result' => 'fail', 'message' => dao::getError()));
+                $instance->oldVal = $currentResource->max->cpu;
+                if(!$this->instance->updateCpuSize($instance, $cpu))
+                {
+                    return $this->send(array('result' => 'fail', 'message' => dao::getError()));
+                }
             }
 
             $disk = $newInstance->disk_gb;
             if(is_numeric($disk) && $disk != $diskSettings->size && $disk != $diskSettings->requestSize)
             {
                 if($disk < $diskSettings->size || $disk > $diskSettings->limit)  return $this->send(array('result' => 'fail', 'message' => $this->lang->instance->errors->invalidDiskSize));
+                $instance->oldVal = $diskSettings->size;
                 if(!$this->instance->updateVolSize($instance, $disk . 'Gi', $diskSettings->name)) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
             }