From 7490c9d276103dd3aaae4eaeb551155a41954357 Mon Sep 17 00:00:00 2001
From: Leonid Poluyanov <lpoluyanov@magento.com>
Date: Mon, 17 Oct 2016 17:39:17 +0300
Subject: [PATCH] MAGETWO-55849: Customer can be deleted without Merchant
permissions verification
---
app/code/Magento/User/view/adminhtml/requirejs-config.js | 2 +-
.../User/view/adminhtml/templates/user/roles_grid_js.phtml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/code/Magento/User/view/adminhtml/requirejs-config.js b/app/code/Magento/User/view/adminhtml/requirejs-config.js
index c5f45b48030..44a5b331689 100644
--- a/app/code/Magento/User/view/adminhtml/requirejs-config.js
+++ b/app/code/Magento/User/view/adminhtml/requirejs-config.js
@@ -10,4 +10,4 @@ var config = {
deleteUserAccount: 'Magento_User/js/delete-user-account'
}
}
-};
\ No newline at end of file
+};
diff --git a/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml b/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml
index 9d403a89892..40287595b93 100644
--- a/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml
@@ -85,4 +85,4 @@ require([
}
}
</script>
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
--
GitLab