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

[Templating] [Twig] Sf3.0 support : Changing render from tag to function #154

Closed
wants to merge 4 commits into from
Closed

[Templating] [Twig] Sf3.0 support : Changing render from tag to function #154

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4fef063
FIX Sf3.0 support. render is now a function not a tag anymore
Id4v Dec 18, 2015
c46a6db
fix dependences
zajca Jan 21, 2016
384b691
Merge pull request #1 from zajca/patch-1
Id4v Jan 27, 2016
cda4592
[FIX] Composer.json based on stable releases
Id4v Jan 28, 2016
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
4 changes: 2 additions & 2 deletions Resources/views/CRUD/edit_mongo_one.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ file that was distributed with this source code.
{% if sonata_admin.edit == 'list' %}
<span id="field_widget_{{ id }}" class="field-short-description">
{% if sonata_admin.admin.id(sonata_admin.value) %}
{% render url('sonata_admin_short_object_information', {
{{ render(url('sonata_admin_short_object_information', {
'code': sonata_admin.field_description.associationadmin.code,
'objectId': sonata_admin.field_description.associationadmin.id(sonata_admin.value),
'uniqid': sonata_admin.field_description.associationadmin.uniqid
}
)%}
))}}
{% elseif sonata_admin.field_description.options.placeholder is defined and sonata_admin.field_description.options.placeholder %}
<span class="inner-field-short-description">
{{ sonata_admin.field_description.options.placeholder|trans({}, 'SonataAdminBundle') }}
Expand Down
4 changes: 2 additions & 2 deletions Resources/views/Form/form_admin_fields.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ file that was distributed with this source code.
<span id="field_actions_{{ id }}" class="field-actions">
<span id="field_widget_{{ id }}" class="field-short-description">
{% if sonata_admin.field_description.associationadmin.id(sonata_admin.value) %}
{% render url('sonata_admin_short_object_information', {
{{ render(url('sonata_admin_short_object_information', {
'code': sonata_admin.field_description.associationadmin.code,
'objectId': sonata_admin.field_description.associationadmin.id(sonata_admin.value),
'uniqid': sonata_admin.field_description.associationadmin.uniqid
}
)%}
))}}
{% elseif sonata_admin.field_description.options.placeholder is defined and sonata_admin.field_description.options.placeholder %}
<span class="inner-field-short-description">
{{ sonata_admin.field_description.options.placeholder|trans({}, 'SonataAdminBundle') }}
Expand Down
6 changes: 3 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
}
],
"require": {
"doctrine/mongodb-odm-bundle": "~3.0",
"doctrine/mongodb-odm": "~1.0",
"sonata-project/admin-bundle": "~2.3"
"doctrine/mongodb-odm-bundle": "~3.0@dev",
Copy link
Contributor

Choose a reason for hiding this comment

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

It shouldn't depend of dev dependencies (same below).

Copy link

Choose a reason for hiding this comment

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

In that case, there should be some releases of this bundle or some develop branch since it's not great also in projects depend on master of this bundle.

"sonata-project/admin-bundle": "dev-master",
"symfony/security-acl": "~2.2|~3.0@dev"
},
"require-dev": {
"jmikola/geojson": "~1.0",
Expand Down