Skip to content
This repository has been archived by the owner on Jul 22, 2022. It is now read-only.

Commit

Permalink
Merge pull request #461 from sonata-project/fix-installation-doc
Browse files Browse the repository at this point in the history
update installation instructions for version 2
  • Loading branch information
ElectricMaxxx authored Jul 27, 2017
2 parents 751612c + 6f8436e commit 21ce906
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Changelog
=========

* **2017-04-26**: [BC break] The tree routing is no longer optional. Require `@SonataDoctrinePhpcrAdminBundle/Resources/config/routing/tree.xml` in your routing file.
* **2017-02-06**: [BC break] Removed `Datagrid\SimplePager` in favor of the one provided by the SonataAdminBundle.
* **2015-05-06**: [BC break] Removed `Tree\PhpcrOdmTree`.
* **2015-05-06**: [BC break] Changed first argument of `Controller\TreeController` from `TreeInterface $tree` to `$repositoryName = 'default'`.
Expand Down
17 changes: 16 additions & 1 deletion Resources/doc/reference/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ Load Routing
resource: '@SonataAdminBundle/Resources/config/routing/sonata_admin.xml'
prefix: /admin
phpcr_admin:
resource: '@SonataDoctrinePhpcrAdminBundle/Resources/config/routing/tree.xml'
prefix: /admin
_sonata_admin:
resource: .
type: sonata_admin
Expand All @@ -81,6 +85,11 @@ Load Routing
prefix="/admin"
/>
<import
resource="@SonataDoctrinePhpcrAdminBundle/Resources/config/routing/tree.xml"
prefix="/admin"
/>
<import
resource="."
type="sonata_admin"
Expand All @@ -96,7 +105,13 @@ Load Routing
$collection = new RouteCollection();
$routing = $loader->import(
"@SonataAdminBundle/Resources/config/sonata_admin.xml"
'@SonataAdminBundle/Resources/config/sonata_admin.xml'
);
$routing->setPrefix('/admin');
$collection->addCollection($routing);
$routing = $loader->import(
'@SonataDoctrinePhpcrAdminBundle/Resources/config/routing/tree.xml'
);
$routing->setPrefix('/admin');
$collection->addCollection($routing);
Expand Down

0 comments on commit 21ce906

Please sign in to comment.