FD3-495 FD3-511 fix cambio tenencia

app/config/config.yml

@@ -124,6 +124,8 @@ sonata_admin:
         user_block: BaseOAuthClientBundle:Core:oauth_user_block.html.twig
         list: BaseAdminBundle::standard_list.html.twig
     persist_filters: true
+    security:
+        handler: sonata.admin.security.handler.role
 
 doctrine_migrations:
     dir_name: "%kernel.root_dir%/DoctrineMigrations"

app/config/roles.yml

@@ -0,0 +1,52 @@
+security:
+
+    role_hierarchy:
+
+        # CABLEMODEM
+        ROLE_SONATA_CABLEMODEM_READER: [ROLE_ADMIN, ROLE_SONATA_ADMIN_CABLEMODEM_LIST, ROLE_SONATA_ADMIN_CABLEMODEM_VIEW]
+        ROLE_SONATA_CABLEMODEM_EDITOR: [ROLE_SONATA_CABLEMODEM_READER, ROLE_SONATA_ADMIN_CABLEMODEM_CREATE, ROLE_SONATA_ADMIN_CABLEMODEM_EDIT]
+        ROLE_SONATA_CABLEMODEM_ADMIN: [ROLE_SONATA_CABLEMODEM_EDITOR, ROLE_SONATA_ADMIN_CABLEMODEM_DELETE, ROLE_SONATA_ADMIN_CABLEMODEM_EXPORT]
+
+        # PROFILE
+        ROLE_SONATA_PROFILE_READER: [ROLE_ADMIN, ROLE_SONATA_ADMIN_PROFILE_LIST, ROLE_SONATA_ADMIN_PROFILE_VIEW]
+        ROLE_SONATA_PROFILE_EDITOR: [ROLE_SONATA_PROFILE_READER, ROLE_SONATA_ADMIN_PROFILE_CREATE, ROLE_SONATA_ADMIN_PROFILE_EDIT]
+        ROLE_SONATA_PROFILE_ADMIN: [ROLE_SONATA_PROFILE_EDITOR, ROLE_SONATA_ADMIN_PROFILE_DELETE, ROLE_SONATA_ADMIN_PROFILE_EXPORT]
+
+        # NODE
+        ROLE_SONATA_NODE_READER: [ROLE_ADMIN, ROLE_SONATA_ADMIN_NODE_LIST, ROLE_SONATA_ADMIN_NODE_VIEW]
+        ROLE_SONATA_NODE_EDITOR: [ROLE_SONATA_NODE_READER, ROLE_SONATA_ADMIN_NODE_CREATE, ROLE_SONATA_ADMIN_NODE_EDIT]
+        ROLE_SONATA_NODE_ADMIN: [ROLE_SONATA_NODE_EDITOR, ROLE_SONATA_ADMIN_NODE_DELETE, ROLE_SONATA_ADMIN_NODE_EXPORT]
+
+        # CMTS
+        ROLE_SONATA_CMTS_READER: [ROLE_ADMIN, ROLE_SONATA_ADMIN_CMTS_LIST, ROLE_SONATA_ADMIN_CMTS_VIEW]
+        ROLE_SONATA_CMTS_EDITOR: [ROLE_SONATA_CMTS_READER, ROLE_SONATA_ADMIN_CMTS_CREATE, ROLE_SONATA_ADMIN_CMTS_EDIT]
+        ROLE_SONATA_CMTS_ADMIN: [ROLE_SONATA_CMTS_EDITOR, ROLE_SONATA_ADMIN_CMTS_DELETE, ROLE_SONATA_ADMIN_CMTS_EXPORT]
+
+        # CABLEMODEM_MODEL
+        ROLE_SONATA_CABLEMODEM_MODEL_READER: [ROLE_ADMIN, ROLE_SONATA_ADMIN_CABLEMODEM_MODEL_LIST, ROLE_SONATA_ADMIN_CABLEMODEM_MODEL_VIEW]
+        ROLE_SONATA_CABLEMODEM_MODEL_EDITOR: [ROLE_SONATA_CABLEMODEM_MODEL_READER, ROLE_SONATA_ADMIN_CABLEMODEM_MODEL_CREATE, ROLE_SONATA_ADMIN_CABLEMODEM_MODEL_EDIT]
+        ROLE_SONATA_CABLEMODEM_MODEL_ADMIN: [ROLE_SONATA_CABLEMODEM_MODEL_EDITOR, ROLE_SONATA_ADMIN_CABLEMODEM_MODEL_DELETE, ROLE_SONATA_ADMIN_CABLEMODEM_MODEL_EXPORT]
+
+        # CMTS_MODEL
+        ROLE_SONATA_CMTS_MODEL_READER: [ROLE_ADMIN, ROLE_SONATA_ADMIN_CMTS_MODEL_LIST, ROLE_SONATA_ADMIN_CMTS_MODEL_VIEW]
+        ROLE_SONATA_CMTS_MODEL_EDITOR: [ROLE_SONATA_CMTS_MODEL_READER, ROLE_SONATA_ADMIN_CMTS_MODEL_CREATE, ROLE_SONATA_ADMIN_CMTS_MODEL_EDIT]
+        ROLE_SONATA_CMTS_MODEL_ADMIN: [ROLE_SONATA_CMTS_MODEL_EDITOR, ROLE_SONATA_ADMIN_CMTS_MODEL_DELETE, ROLE_SONATA_ADMIN_CMTS_MODEL_EXPORT]
+
+        # TEMPLATE
+        ROLE_SONATA_TEMPLATE_READER: [ROLE_ADMIN, ROLE_SONATA_ADMIN_TEMPLATE_LIST, ROLE_SONATA_ADMIN_TEMPLATE_VIEW]
+        ROLE_SONATA_TEMPLATE_EDITOR: [ROLE_SONATA_TEMPLATE_READER, ROLE_SONATA_ADMIN_TEMPLATE_CREATE, ROLE_SONATA_ADMIN_TEMPLATE_EDIT]
+        ROLE_SONATA_TEMPLATE_ADMIN: [ROLE_SONATA_TEMPLATE_EDITOR, ROLE_SONATA_ADMIN_TEMPLATE_DELETE, ROLE_SONATA_ADMIN_TEMPLATE_EXPORT]
+
+        # WORKFLOW
+        ROLE_SONATA_WORKFLOW_READER: [ROLE_ADMIN, ROLE_SONATA_ADMIN_WORKFLOW_LIST, ROLE_SONATA_ADMIN_WORKFLOW_VIEW]
+        ROLE_SONATA_WORKFLOW_EDITOR: [ROLE_SONATA_WORKFLOW_READER, ROLE_SONATA_ADMIN_WORKFLOW_CREATE, ROLE_SONATA_ADMIN_WORKFLOW_EDIT]
+        ROLE_SONATA_WORKFLOW_ADMIN: [ROLE_SONATA_WORKFLOW_EDITOR, ROLE_SONATA_ADMIN_WORKFLOW_DELETE, ROLE_SONATA_ADMIN_WORKFLOW_EXPORT]
+
+        # ACTION
+        ROLE_SONATA_ACTION_READER: [ROLE_ADMIN, ROLE_SONATA_ADMIN_ACTION_LIST, ROLE_SONATA_ADMIN_ACTION_VIEW]
+        ROLE_SONATA_ACTION_EDITOR: [ROLE_SONATA_ACTION_READER, ROLE_SONATA_ADMIN_ACTION_CREATE, ROLE_SONATA_ADMIN_ACTION_EDIT]
+        ROLE_SONATA_ACTION_ADMIN: [ROLE_SONATA_ACTION_EDITOR, ROLE_SONATA_ADMIN_ACTION_DELETE, ROLE_SONATA_ADMIN_ACTION_EXPORT]
+
+        ROLE_ADMIN_TENANCIES: ROLE_ADMIN_TENANCIES
+        ROLE_ADMIN: [ROLE_USER, ROLE_SONATA_ADMIN]
+        ROLE_SUPER_ADMIN: [ROLE_ADMIN, ROLE_USER_CREATE, ROLE_ADMIN_TENANCIES, ROLE_ALLOWED_TO_SWITCH]

app/config/security.yml

@@ -1,12 +1,11 @@
+imports:
+    - { resource: roles.yml }
+
 security:
     providers:
         oauth:
             id: base_oauth_bundle.oauth_user_provider
 
-    role_hierarchy:
-        ROLE_ADMIN: [ROLE_USER, ROLE_ALLOWED_TO_SWITCH]
-        ROLE_SUPER_ADMIN: ROLE_ADMIN
-
     firewalls:
 
         dev:

composer.json

@@ -142,7 +142,7 @@
         "hwi/oauth-bundle": "^0.5.3",
         "ik/audit-bundle": "v0.2.4",
         "ik/auth-bundle": "v0.2.4",
-        "ik/base-admin-bundle": "v0.2.4",
+        "ik/base-admin-bundle": "dev-master",
         "ik/device-bundle": "v0.2.4",
         "ik/extra-data-bundle": "v0.2.4",
         "ik/leaflet-bundle": "v0.2.4",
@@ -248,4 +248,4 @@
         ],
         "branch-alias": null
     }
-}
+}

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "afe87064340cc52fd5ac2f0100c24439",
+    "content-hash": "a75ba2838f81489df9d165cb49c7e0c4",
     "packages": [
         {
             "name": "behat/transliterator",
@@ -1461,11 +1461,11 @@
         },
         {
             "name": "ik/base-admin-bundle",
-            "version": "v0.2.4",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "807fa103f9a0e7d0e22f490de61e1d96645822bc"
+                "reference": "0456c67f0aca5150d7e3d0cdf6979044efd90781"
             },
             "type": "library",
             "autoload": {
@@ -1480,7 +1480,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2018-02-26T17:55:49+00:00"
+            "time": "2018-04-10T11:47:25+00:00"
         },
         {
             "name": "ik/device-bundle",
@@ -6317,6 +6317,7 @@
     "minimum-stability": "stable",
     "stability-flags": {
         "dwoo/dwoo": 20,
+        "ik/base-admin-bundle": 20,
         "sonata-project/admin-bundle": 20,
         "voryx/restgeneratorbundle": 20
     },

src/CablemodemBundle/Resources/config/services.yml

@@ -1,6 +1,6 @@
 services:
 
-    cablemodem.admin.cablemodem:
+    sonata.admin.cablemodem:
         class: CablemodemBundle\Admin\CablemodemAdmin
         arguments: [~, CablemodemBundle\Entity\Cablemodem, WorkflowBundle:CRUD]
         tags:
@@ -9,7 +9,7 @@ services:
             - [setTranslationDomain, [CablemodemBundle]]
         public: true
 
-    cablemodem.admin.profile:
+    sonata.admin.profile:
         class: CablemodemBundle\Admin\ProfileAdmin
         arguments: [~, CablemodemBundle\Entity\Profile, BaseAdminBundle:CRUD]
         tags:
@@ -18,7 +18,7 @@ services:
             - [setTranslationDomain, [CablemodemBundle]]
         public: true
 
-    cablemodem.admin.node:
+    sonata.admin.node:
         class: CablemodemBundle\Admin\NodeAdmin
         arguments: [~, CablemodemBundle\Entity\Node, BaseAdminBundle:CRUD]
         tags:
@@ -27,7 +27,7 @@ services:
             - [setTranslationDomain, [CablemodemBundle]]
         public: true
 
-    cablemodem.admin.cmts:
+    sonata.admin.cmts:
         class: CablemodemBundle\Admin\CMTSAdmin
         arguments: [~, CablemodemBundle\Entity\CMTS, BaseAdminBundle:CRUD]
         tags:
@@ -36,7 +36,7 @@ services:
             - [setTranslationDomain, [CablemodemBundle]]
         public: true
 
-    cablemodem.admin.cablemodem_model:
+    sonata.admin.cablemodem_model:
         class: CablemodemBundle\Admin\CablemodemModelAdmin
         arguments: [~, CablemodemBundle\Entity\CablemodemModel, BaseAdminBundle:CRUD]
         tags:
@@ -45,7 +45,7 @@ services:
             - [setTranslationDomain, [CablemodemBundle]]
         public: true
 
-    cablemodem.admin.cmts_model:
+    sonata.admin.cmts_model:
         class: CablemodemBundle\Admin\CMTSModelAdmin
         arguments: [~, CablemodemBundle\Entity\CMTSModel, BaseAdminBundle:CRUD]
         tags: