3.x into Master #6712
Merged
3.x into Master #6712
Conversation
This file contains 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
This way it will avoid extra translations
This way we can move property to another class
This method requires a string
…Interface (sonata-project#6541) * Add some methods to PagerInterface * Deprecate method from abstract pager
|
I also would like to merge #6713 into 3.x and merge again 3.x into master. |
VincentLanglet
force-pushed
the
master
branch
from
d2e2952 to
1229132
Compare
VincentLanglet
force-pushed
the
master
branch
2 times, most recently
from
ffab1dd to
ee1b049
Compare
VincentLanglet
force-pushed
the
master
branch
2 times, most recently
from
127eb1f to
ecf6130
Compare
VincentLanglet
force-pushed
the
master
branch
from
ecf6130 to
d4f8f03
Compare
When working with adding and removing entities from the CollectionType field, it can happen that the array index not starts with 0 but has an length > 0. This leads to an error since that index 0 is unset. So using twig first function here to handle this case.
|
Hi Team, Is this merge awaiting a particular timeframe? |
I need a review from another contributor. And I'd like to merge #6713 in order to fix the conflict again. |
|
Thanks for the reply, I more meant if there was a merge every 4 weeks or
something, will happily wait patiently, Merry Christmas everyone!
…On Wed, 23 Dec 2020 at 17:31, Vincent Langlet ***@***.***> wrote:
Hi Team, Is this merge awaiting a particular timeframe?
I need a review from another contributor. And I'd like to merge #6713
<#6713> in order
to fix the conflict again.
The main blocking point is that it's Christmas, people have a life. I'm
sorry, be patient, we're doing our best :)
—
You are receiving this because you commented.
Reply to this email directly, view it on GitHub
<#6712 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAWOZT6BZMA5CAJBETH7S5LSWISN7ANCNFSM4U6UOA3A>
.
|
Since sonata-project/admin-bundle 3.83, Pool is just used as an Admin registry and for global options has been replaced by SonataConfiguration which holds those options. To access to these options from Twig, there is a global Twig sonata_config variable. So there is no need to pass an instance of Pool to Twig templates anymore, the pool is not supposed to be used directly in templates.
This interface was added in 4.x branch, this commit imports it removing type and return declarations to make it compatible with RouteCollection which implements this interface. In sonata 4 AbstractAdmin::configureRoutes() method receives a RouteCollectionInterface, importing this interface in 3.x would allow users to update their code and define this method as in 4 easing the upgrading process.
|
This is ready @sonata-project/contributors :) |
OskarStark
approved these changes
Jan 2, 2021
wbloszyk
approved these changes
Jan 2, 2021
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.
No description provided.