[permissions] bugfixes #21

pimcore · Oct 20, 2017 · c501b44 · c501b44
1 parent 3f4d39b
commit c501b44
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/src/Controller/Admin/ActivitiesController.php b/src/Controller/Admin/ActivitiesController.php
@@ -29,7 +29,7 @@ class ActivitiesController extends \Pimcore\Bundle\AdminBundle\Controller\AdminC
 {
     public function onKernelController(FilterControllerEvent $event)
     {
-        $this->checkPermission('plugin_cmf_activityview');
+        $this->checkPermission('plugin_cmf_perm_activityview');
     }
 
     /**

diff --git a/src/Controller/Admin/CustomersController.php b/src/Controller/Admin/CustomersController.php
@@ -47,7 +47,7 @@ class CustomersController extends Admin
     public function onKernelController(FilterControllerEvent $event)
     {
         parent::onKernelController($event);
-        $this->checkPermission('plugin_cmf_customerview');
+        $this->checkPermission('plugin_cmf_perm_customerview');
 
         \Pimcore\Model\DataObject\AbstractObject::setHideUnpublished(true);
     }

diff --git a/src/Resources/public/js/ActivityView.js b/src/Resources/public/js/ActivityView.js
@@ -1,7 +1,7 @@
 var ActivityView = pimcore.registerNS("pimcore.plugin.customermanagementframework.ActivityView");
 
 ActivityView.config = {
-    PERMISSION: "plugin_cmf_activityview"
+    PERMISSION: "plugin_cmf_perm_activityview"
 };
 
 ActivityView.ActivityTab = Class.create({

diff --git a/src/Resources/public/js/CustomerView.js b/src/Resources/public/js/CustomerView.js
@@ -1,7 +1,7 @@
 var CustomerView = pimcore.registerNS("pimcore.plugin.customermanagementframework.CustomerView");
 
 CustomerView.config = {
-    PERMISSION: "plugin_cmf_customerview"
+    PERMISSION: "plugin_cmf_perm_customerview"
 };
 
 CustomerView.CustomerTab = Class.create({

diff --git a/src/Resources/public/js/startup.js b/src/Resources/public/js/startup.js
@@ -28,7 +28,7 @@ pimcore.plugin.customermanagementframework = Class.create(pimcore.plugin.admin,
         }
 
         // customer view
-        if (user.isAllowed('plugin_cmf_customerview')) {
+        if (user.isAllowed('plugin_cmf_perm_customerview')) {
             var customerViewPanelId = 'plugin_cmf_customerview';
             var item = {
                 text: t('plugin_cmf_customerview'),
@@ -56,7 +56,7 @@ pimcore.plugin.customermanagementframework = Class.create(pimcore.plugin.admin,
         }
 
         // customer duplicates view
-        if (pimcore.settings.cmf.duplicatesViewEnabled && user.isAllowed('plugin_cmf_customerview')) {
+        if (pimcore.settings.cmf.duplicatesViewEnabled && user.isAllowed('plugin_cmf_perm_customerview')) {
             var customerDuplicateViewPanelId = 'plugin_cmf_customerduplicatesview';
             var item = {
                 text: t('plugin_cmf_customerduplicatesview'),
@@ -83,7 +83,7 @@ pimcore.plugin.customermanagementframework = Class.create(pimcore.plugin.admin,
             menuItems.add(item);
         }
 
-        if (user.isAllowed('plugin_cmf_customer_automation_rules')) {
+        if (user.isAllowed('plugin_cmf_perm_customer_automation_rules')) {
             var customerAutomationRulesPanelId = 'plugin_cmf_customerautomationrules';
             var item = {
                 text: t('plugin_cmf_customerautomationrules'),
@@ -101,7 +101,7 @@ pimcore.plugin.customermanagementframework = Class.create(pimcore.plugin.admin,
             menuItems.add(item);
         }
 
-        if (pimcore.settings.cmf.newsletterSyncEnabled && user.isAllowed('plugin_cmf_newsletter_enqueue_all_customers')) {
+        if (pimcore.settings.cmf.newsletterSyncEnabled && user.isAllowed('plugin_cmf_perm_newsletter_enqueue_all_customers')) {
             var item = {
                 text: t('plugin_cmf_newsletter_enqueue_all_customers'),
                 iconCls: 'pimcore_icon_newsletter_enqueue_all_customers',
-Original file line number
+Diff line change
@@ Expand Up @@
     {
         public function onKernelController(FilterControllerEvent $event)
         {
-            $this->checkPermission('plugin_cmf_activityview');
+            $this->checkPermission('plugin_cmf_perm_activityview');
         }
         /**
@@ Expand Down @@