Fix/adopt fom dependencies#1120
Merged
Merged
Conversation
…nd radiobuttonExtended.js to adopted Mapbender paths
…dopted Mapbender paths
…dopted Mapbender paths
…placements' into fix/adopt-fom-dependencies
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
BC impact
Drop-replacements for manager.html.twig (in app/Resources) will have to be moved (or safer yet, duplicated) to new directory structure to remain effective.
app/Resources/FOM/ManagerBundle/Resources/views/manager.html.twigshould be duplicated toapp/Resources/Mapbender/ManagerBundle/Resources/views/manager.html.twigapp/Resources/FOM/CoreBundle/Resources/views/Form/fields.html.twigshould be duplicated toapp/Resources/Mapbender/CoreBundle/Resources/views/form/fields.html.twigapp/Resources/FOM/CoreBundle/Resources/views/Manager/menu.html.should be duplicated toapp/Resources/Mapbender/ManagerBundle/Resources/views/menu.html.twigTwig
extendsandincludeclauses for manager.html.twig will be kept safe and working. The other two templatesfields.html.twigandmenu.html.twigwill vanish completely from their original locations.Change summary
This brings in the following assets from FOM v3.0.6.3:
It also brings in the
FOM\ManagerBundle\ManagerController, renamed toMapbender\ManagerBundle\IndexController.Updating of references
There is generally no need to manually update anything on the project level, except for cases of drop-in twig replacements already described on top.
Includes of the twigs in Mapbender scope have been updated manually.
The form theme is carefully auto-rewritten based on previous work. This change of default theme location only happens if the configured default theme was FOM's.
Enterprising types who have already configured their system with, say, a Bootstrap 3 form theme, will not be impacted in any way.
Doing this automatically frees us from attempting a "simultaneous" commit into the Mapbender Starter repository.
References to the JavaScript assets are auto-updated on the AssetFactory level. This ensures custom Element and Template classes will move along automatically, with no need to rewrite the asset references.
Standard Mapbender routing configuration loads Mapbender ManagerBundle controllers before FOM ManagerBundle controllers, so the adopted new IndexController will take precedence automatically.
This change can coexist with older FOM versions. They will continue to wrap the "Users", "Groups" and "ACLs" sections in their their own backend twigs (general layout skeleton and menu). Mapbender's version of the form theme (whichever way it will develop from here) will take effect though.
Rationale