From 4fef063be59cf14d538769cf815dfdcd352451bd Mon Sep 17 00:00:00 2001 From: David Rimbault Date: Fri, 18 Dec 2015 12:17:17 +0100 Subject: [PATCH 1/3] FIX Sf3.0 support. render is now a function not a tag anymore --- Resources/views/CRUD/edit_mongo_one.html.twig | 4 ++-- Resources/views/Form/form_admin_fields.html.twig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/views/CRUD/edit_mongo_one.html.twig b/Resources/views/CRUD/edit_mongo_one.html.twig index 7a47a011..fb819a17 100644 --- a/Resources/views/CRUD/edit_mongo_one.html.twig +++ b/Resources/views/CRUD/edit_mongo_one.html.twig @@ -24,12 +24,12 @@ file that was distributed with this source code. {% if sonata_admin.edit == 'list' %} {% 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 %} {{ sonata_admin.field_description.options.placeholder|trans({}, 'SonataAdminBundle') }} diff --git a/Resources/views/Form/form_admin_fields.html.twig b/Resources/views/Form/form_admin_fields.html.twig index 628ec730..23e1d65e 100644 --- a/Resources/views/Form/form_admin_fields.html.twig +++ b/Resources/views/Form/form_admin_fields.html.twig @@ -51,12 +51,12 @@ file that was distributed with this source code. {% 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 %} {{ sonata_admin.field_description.options.placeholder|trans({}, 'SonataAdminBundle') }} From c46a6dbef13d6d04e9711bb26eeb3f4f97ac94e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Zaj=C3=ADc?= Date: Thu, 21 Jan 2016 21:57:21 +0100 Subject: [PATCH 2/3] fix dependences --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 855c289a..b968e20a 100644 --- a/composer.json +++ b/composer.json @@ -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", + "sonata-project/admin-bundle": "dev-master", + "symfony/security-acl": "~2.2|~3.0@dev" }, "require-dev": { "jmikola/geojson": "~1.0", From cda4592132340442f32ecacee291561a3bf24995 Mon Sep 17 00:00:00 2001 From: David Rimbault Date: Thu, 28 Jan 2016 09:44:07 +0100 Subject: [PATCH 3/3] [FIX] Composer.json based on stable releases --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index b968e20a..60fcda2c 100644 --- a/composer.json +++ b/composer.json @@ -17,9 +17,9 @@ } ], "require": { - "doctrine/mongodb-odm-bundle": "~3.0@dev", - "sonata-project/admin-bundle": "dev-master", - "symfony/security-acl": "~2.2|~3.0@dev" + "doctrine/mongodb-odm-bundle": "~3.0", + "sonata-project/admin-bundle": "~2.3.0", + "symfony/security-acl": "~2.2|~3.0" }, "require-dev": { "jmikola/geojson": "~1.0",