Merge pull request #15 from michalpipa/flex-workflow

Added and enabled FlexWorkflowBundle
ezsystems · Nov 17, 2015 · d772c70 · d772c70
2 parents 68dd55a + 87c5ac7
commit d772c70
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/composer.json b/composer.json
@@ -40,6 +40,7 @@
         "ezsystems/ezstudio-demo-bundle": "~1.0@dev",
         "ezsystems/ezstudio-demo-bundle-data": "~1.0@dev",
         "ezsystems/share-buttons-bundle": "~1.0@dev",
+        "ezsystems/flex-workflow": "~1.0@dev",
         "egulias/listeners-debug-command-bundle": "~1.9",
         "white-october/pagerfanta-bundle": "1.0.*",
         "hautelook/templated-uri-bundle": "~1.0 | ~2.0",

diff --git a/ezpublish/EzPublishKernel.php b/ezpublish/EzPublishKernel.php
@@ -42,6 +42,7 @@ public function registerBundles()
             new EzSystems\StudioUIBundle\EzSystemsStudioUIBundle(),
             new EzSystems\StudioDemoBundle\EzSystemsStudioDemoBundle(),
             new EzSystems\ShareButtonsBundle\EzSystemsShareButtonsBundle(),
+            new EzSystems\FlexWorkflowBundle\EzSystemsFlexWorkflowBundle(),
             new EzSystems\PlatformUIAssetsBundle\EzSystemsPlatformUIAssetsBundle(),
             new EzSystems\PlatformUIBundle\EzSystemsPlatformUIBundle(),
             new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(),

diff --git a/ezpublish/config/routing.yml b/ezpublish/config/routing.yml
@@ -32,3 +32,6 @@ _ezpublishStudioUIRoutes:
 
 _ezpublishStudioDemoRoutes:
     resource: "@eZStudioDemoBundle/Resources/config/routing.yml"
+
+_ezpublishFlexWorkflowRoutes:
+    resource: "@FlexWorkflowBundle/Resources/config/routing.yml"