From bacf85ccf8f80a5ecd856ef89977cb3b6c246dde Mon Sep 17 00:00:00 2001
From: Taras Machyshyn <taras@espocrm.com>
Date: Thu, 22 Feb 2018 15:33:56 +0200
Subject: [PATCH] Metadata: saveCustom() fixes

---
 application/Espo/Core/Utils/Metadata.php    | 6 +++++-
 tests/unit/Espo/Core/Utils/MetadataTest.php | 7 +++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/application/Espo/Core/Utils/Metadata.php b/application/Espo/Core/Utils/Metadata.php
index 159b4e414f..1f16f2c2ed 100644
--- a/application/Espo/Core/Utils/Metadata.php
+++ b/application/Espo/Core/Utils/Metadata.php
@@ -349,7 +349,11 @@ class Metadata
         $changedData = Json::encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
         $filePath = array($this->paths['customPath'], $key1, $key2.'.json');
 
-        return $this->getFileManager()->putContents($filePath, $changedData);
+        $result = $this->getFileManager()->putContents($filePath, $changedData);
+
+        $this->init(true);
+
+        return true;
     }
 
     /**
diff --git a/tests/unit/Espo/Core/Utils/MetadataTest.php b/tests/unit/Espo/Core/Utils/MetadataTest.php
index 5023c84624..1a39d873f3 100644
--- a/tests/unit/Espo/Core/Utils/MetadataTest.php
+++ b/tests/unit/Espo/Core/Utils/MetadataTest.php
@@ -64,6 +64,7 @@ class MetadataTest extends \PHPUnit\Framework\TestCase
 
     protected function tearDown()
     {
+        $this->object->clearChanges();
         $this->object = NULL;
     }
 
@@ -265,6 +266,8 @@ class MetadataTest extends \PHPUnit\Framework\TestCase
 
     public function testSaveCustom()
     {
+        $initStatusOptions = $this->object->get('entityDefs.Lead.fields.status.options');
+
         $customPath = 'tests/unit/testData/cache/metadata/custom';
 
         $paths = $this->reflection->getProperty('paths');
@@ -290,6 +293,10 @@ class MetadataTest extends \PHPUnit\Framework\TestCase
 
         $this->assertEquals($data, $savedData);
 
+        $initStatusOptions[] = 'Test1';
+        $initStatusOptions[] = 'Test2';
+        $this->assertEquals($initStatusOptions, $this->object->get('entityDefs.Lead.fields.status.options'));
+
         unlink($savedFile);
     }