Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare RC #376

Merged
merged 1 commit into from
Jul 28, 2017
Merged

Prepare RC #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 1 addition & 44 deletions app/config/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,51 +222,8 @@ sonata_doctrine_phpcr_admin:
templates:
form:
- admin/form_admin_fields.html.twig
document_tree_defaults: [locale]
document_tree:
Doctrine\ODM\PHPCR\Document\Generic:
valid_children:
- all
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

did we get completely rid of the feature to define what can be where in the tree? or did it just move elsewhere?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so. The tree itself, as code construct, currently has got no restrictions anymore. But i think we should introduce a kind of an enhancer which add the doctrine-phpcr information into the response and force the tree-browser to use that one. And yes i think we need those restrictions at least when restrict the targets on which we are able to move. But that is no feature of fancytree as far as i know – we have to implement that on our own js code.

AppBundle\Document\DemoSeoContent:
valid_children:
- Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SimpleBlock
- Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ContainerBlock
- Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ReferenceBlock
- Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ActionBlock
- Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\RssBlock
Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ReferenceBlock:
valid_children: []
Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ActionBlock:
valid_children: []
Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SimpleBlock:
valid_children: []
Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SlideshowBlock:
valid_children:
- Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ImagineBlock
Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ImagineBlock:
valid_children: []
Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\RssBlock:
valid_children: []
Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ContainerBlock:
valid_children:
- Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SimpleBlock
- Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ContainerBlock
- Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ReferenceBlock
- Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ActionBlock
- Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SlideshowBlock
- Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\RssBlock
Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route:
valid_children:
- Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route
- Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RedirectRoute
Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RedirectRoute:
valid_children: []
Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\Menu:
valid_children:
- Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\MenuNode
Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\MenuNode:
valid_children:
- Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\MenuNode
routing_defaults: [locale]

sonata_translation:
locales: '%locales%'
Expand Down
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"symfony-cmf/seo-bundle": "^2.0",
"symfony-cmf/routing": "^2.0",
"symfony-cmf/routing-auto-bundle": "^2.0",
"symfony-cmf/sonata-phpcr-admin-integration-bundle": "^1.0@dev",
"symfony-cmf/sonata-phpcr-admin-integration-bundle": "^1.0",

"jackalope/jackalope-doctrine-dbal": "1.2.*",
"jackalope/jackalope-jackrabbit": "1.2.*",
Expand All @@ -42,7 +42,7 @@

"sonata-project/cache-bundle": "^2.1",
"sonata-project/translation-bundle": "2.1.0",
"sonata-project/doctrine-phpcr-admin-bundle": "^2.0@dev",
"sonata-project/doctrine-phpcr-admin-bundle": "^2.0",

"jms/serializer-bundle": "^1.1",
"friendsofsymfony/rest-bundle": "~1.7",
Expand Down
Loading