MAGETWO-55849: Customer can be deleted without Merchant permissions verification

le0n4eg · le0n4eg · commit 7490c9d27610 · 2016-10-17T17:39:17.000+03:00
diff --git 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'
         }
     } 
-};
+};
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
@@ -85,4 +85,4 @@ require([
             }
         }
     </script>
-<?php endif; ?>
+<?php endif; ?>

Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,4 @@ var config = {`
`10`	`10`	`deleteUserAccount: 'Magento_User/js/delete-user-account'`
`11`	`11`	`}`
`12`	`12`	`}`
`13`		`-};`
	`13`	`+};`