Iks branch merge #50
Iks branch merge #50
Conversation
Moved to VieBundle
Removed undo/redo
Conflicts: deps.lock src/Sandbox/MainBundle/Resources/views/skeleton.html.twig
|
btw .. not sure if this is related but i noticed this issue on cmf.liip.ch: |
|
how broken is admin? can you get a page like this and use the tree? the only thing broken for me is that menu items can not be shown (undefined "parent") and the list view does not work. |
| @@ -105,6 +105,8 @@ liip_vie: | |||
| map: | |||
| '<http://rdfs.org/sioc/ns#Post>': 'Sandbox\MainBundle\Document\EditableStaticContent' | |||
| use_coffee: %liip_vie.use_coffee% | |||
| base_path: /cms/routes | |||
There was a problem hiding this comment.
this should probably come from the config value of the routing bundle. but thats a viebundle issue, not related to this merge.
|
the whole image handling stuff should eventually go into its own CmfMediaBundle, but i guess for now its ok, it might just be the temporary solution until we manage to integrate sonata mediabundle into the cmf. and the iks branch in LiipVieBundle is already merged to master, excellent. imho we should add some TODO comments to the hacks so people notice its not a good example of best practice in those places. then we should sort out the jack script thing but then i think its good to merge. |
|
the admin is totally broken for me. when i go to a list with jackrabbit as the backend i get: with the dbal i just get an empty result |
|
indeed, admin is more broken with jackrabbit than with dbal. maybe dbal does not find data so the bug does not show? @sixty-nine what do you think about the jack script? we should discuss today and then maybe remove it from here, then we can merge this pull. |
|
there have been changes in the admin, that cause this. when I find time, I can update the sandbox to fix these things. |
|
ok .. i merged master and things seem to work now. i will merge this to master now. for the jack script i have created a ticket #53 |
so I merged master into the liip/iks branch and it seems to work as good as it did before.
sonataadminbundle integration still seems to be broken (@nacmartin, @rande), but inline editing seems to work just fine (with jackrabbit and dbal). so i guess its ok to merge this.
/cc @dbu @fabian