From 529de70e46edd329b5daeca2b85fb942f3b83217 Mon Sep 17 00:00:00 2001
From: Jacek Mokrzycki <jmokrzyc@gmail.com>
Date: Wed, 8 May 2024 10:48:36 +0200
Subject: [PATCH 1/2] Ensure that saved editorial reviews are not marked as
 inherited

---
 .../Scripts/blades/editorialReview-detail.js                | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/VirtoCommerce.CatalogModule.Web/Scripts/blades/editorialReview-detail.js b/src/VirtoCommerce.CatalogModule.Web/Scripts/blades/editorialReview-detail.js
index ae761a9c4..cd47ced3f 100644
--- a/src/VirtoCommerce.CatalogModule.Web/Scripts/blades/editorialReview-detail.js
+++ b/src/VirtoCommerce.CatalogModule.Web/Scripts/blades/editorialReview-detail.js
@@ -28,8 +28,9 @@ angular.module('virtoCommerce.catalogModule')
             var existReview = _.find(blade.item.reviews, function (x) { return x == blade.origEntity; });
             if (!existReview) {
                 blade.item.reviews.push(blade.origEntity);
-            };
+            }
             angular.copy(blade.currentEntity, blade.origEntity);
+            blade.currentEntity.isInherited = false;
             $scope.bladeClose();
         };
 
@@ -102,9 +103,10 @@ angular.module('virtoCommerce.catalogModule')
             var existReview = _.find(blade.item.reviews, function (x) { return x === blade.origEntity; });
             if (!existReview) {
                 blade.item.reviews.push(blade.origEntity);
-            };
+            }
 
             angular.copy(blade.currentEntity, blade.origEntity);
+            blade.currentEntity.isInherited = false;
         }
 
         function isDirty() {

From 4ea8341a1c57fa3364979ea0b88b303e7ec73cfd Mon Sep 17 00:00:00 2001
From: Jacek Mokrzycki <jmokrzyc@gmail.com>
Date: Thu, 9 May 2024 21:50:11 +0200
Subject: [PATCH 2/2] Fix a typo; remove redundant function; fix review save
 logic

---
 .../Scripts/blades/editorialReview-detail.js     | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/VirtoCommerce.CatalogModule.Web/Scripts/blades/editorialReview-detail.js b/src/VirtoCommerce.CatalogModule.Web/Scripts/blades/editorialReview-detail.js
index cd47ced3f..c008c468f 100644
--- a/src/VirtoCommerce.CatalogModule.Web/Scripts/blades/editorialReview-detail.js
+++ b/src/VirtoCommerce.CatalogModule.Web/Scripts/blades/editorialReview-detail.js
@@ -3,7 +3,7 @@ angular.module('virtoCommerce.catalogModule')
     function ($scope, bladeNavigationService, FileUploader, settings, $timeout) {
         var blade = $scope.blade;
 
-        function initilize() {
+        function initialize() {
             if (!blade.item.reviews) {
                 blade.item.reviews = [];
             }
@@ -24,16 +24,6 @@ angular.module('virtoCommerce.catalogModule')
 
         $scope.isValid = true;
 
-        $scope.saveChanges = function () {
-            var existReview = _.find(blade.item.reviews, function (x) { return x == blade.origEntity; });
-            if (!existReview) {
-                blade.item.reviews.push(blade.origEntity);
-            }
-            angular.copy(blade.currentEntity, blade.origEntity);
-            blade.currentEntity.isInherited = false;
-            $scope.bladeClose();
-        };
-
         blade.headIcon = 'fa fa-comments';
         blade.title = 'catalog.blades.editorialReview-detail.title';
         blade.subtitle = 'catalog.blades.editorialReview-detail.subtitle';
@@ -105,8 +95,8 @@ angular.module('virtoCommerce.catalogModule')
                 blade.item.reviews.push(blade.origEntity);
             }
 
-            angular.copy(blade.currentEntity, blade.origEntity);
             blade.currentEntity.isInherited = false;
+            angular.copy(blade.currentEntity, blade.origEntity);
         }
 
         function isDirty() {
@@ -121,5 +111,5 @@ angular.module('virtoCommerce.catalogModule')
             bladeNavigationService.showConfirmationIfNeeded(isDirty(), canSave(), blade, saveChanges, closeCallback, "catalog.dialogs.review-save.title", "catalog.dialogs.review-save.message");
         };
 
-        initilize();
+        initialize();
     }]);