Sullivan SENECHAL 9 gadi atpakaļ
vecāks
revīzija
685f48a662
4 mainītis faili ar 23 papildinājumiem un 6 dzēšanām
  1. 4 4
      Admin/AbstractAdmin.php
  2. 15 1
      CHANGELOG.md
  3. 1 1
      Controller/CRUDController.php
  4. 3 0
      UPGRADE-3.x.md

+ 4 - 4
Admin/AbstractAdmin.php

@@ -1964,7 +1964,7 @@ abstract class AbstractAdmin implements AdminInterface, DomainObjectInterface
     public function getBreadcrumbs($action)
     public function getBreadcrumbs($action)
     {
     {
         @trigger_error(
         @trigger_error(
-            'The '.__METHOD__.' method is deprecated since version 3.x and will be removed in 4.0.'.
+            'The '.__METHOD__.' method is deprecated since version 3.2 and will be removed in 4.0.'.
             ' Use Sonata\AdminBundle\Admin\BreadcrumbsBuilder::getBreadcrumbs instead.',
             ' Use Sonata\AdminBundle\Admin\BreadcrumbsBuilder::getBreadcrumbs instead.',
             E_USER_DEPRECATED
             E_USER_DEPRECATED
         );
         );
@@ -1985,7 +1985,7 @@ abstract class AbstractAdmin implements AdminInterface, DomainObjectInterface
     public function buildBreadcrumbs($action, MenuItemInterface $menu = null)
     public function buildBreadcrumbs($action, MenuItemInterface $menu = null)
     {
     {
         @trigger_error(
         @trigger_error(
-            'The '.__METHOD__.' method is deprecated since version 3.x and will be removed in 4.0.',
+            'The '.__METHOD__.' method is deprecated since version 3.2 and will be removed in 4.0.',
             E_USER_DEPRECATED
             E_USER_DEPRECATED
         );
         );
 
 
@@ -2005,7 +2005,7 @@ abstract class AbstractAdmin implements AdminInterface, DomainObjectInterface
     final public function getBreadcrumbsBuilder()
     final public function getBreadcrumbsBuilder()
     {
     {
         @trigger_error(
         @trigger_error(
-            'The '.__METHOD__.' method is deprecated since version 3.x and will be removed in 4.0.'.
+            'The '.__METHOD__.' method is deprecated since version 3.2 and will be removed in 4.0.'.
             ' Use the sonata.admin.breadcrumbs_builder service instead.',
             ' Use the sonata.admin.breadcrumbs_builder service instead.',
             E_USER_DEPRECATED
             E_USER_DEPRECATED
         );
         );
@@ -2026,7 +2026,7 @@ abstract class AbstractAdmin implements AdminInterface, DomainObjectInterface
     final public function setBreadcrumbsBuilder(BreadcrumbsBuilderInterface $value)
     final public function setBreadcrumbsBuilder(BreadcrumbsBuilderInterface $value)
     {
     {
         @trigger_error(
         @trigger_error(
-            'The '.__METHOD__.' method is deprecated since version 3.x and will be removed in 4.0.'.
+            'The '.__METHOD__.' method is deprecated since version 3.2 and will be removed in 4.0.'.
             ' Use the sonata.admin.breadcrumbs_builder service instead.',
             ' Use the sonata.admin.breadcrumbs_builder service instead.',
             E_USER_DEPRECATED
             E_USER_DEPRECATED
         );
         );

+ 15 - 1
CHANGELOG.md

@@ -2,13 +2,27 @@
 All notable changes to this project will be documented in this file.
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 
-## [3.x]
+## [3.2.0](https://github.com/sonata-project/SonataAdminBundle/compare/3.1.0...3.2.0) - 2016-06-04
 ### Added
 ### Added
+- Added new field type `email` on the list
+- Added `AbstractAdmin::configureBatchActions` method
 - Extract the breadcrumbs building part of the `AbstractAdmin` to a separate class
 - Extract the breadcrumbs building part of the `AbstractAdmin` to a separate class
 - Added `AbstractAdmin::getSearchResultLink` method
 - Added `AbstractAdmin::getSearchResultLink` method
 - Add the `AbstractAdmin::showMosaicButton` method
 - Add the `AbstractAdmin::showMosaicButton` method
 - Add the `show_mosaic_button` option to configuration
 - Add the `show_mosaic_button` option to configuration
 
 
+### Deprecated
+- Overriding `AbstractAdmin::configureBatchActions` is now deprecated
+- `AbstractAdmin::getBreadcrumbs` is deprecated in favor of `BreadcrumbsBuilder::getBreadcrumbs`
+- `AbstractAdmin::buildBreadcrumbs` is deprecated
+- `AbstractAdmin::$breadcrumbs` is deprecated
+
+### Fixed
+- Fix support for composite primary key in `AbstractAdmin::getSubject`
+- Fixed wrong route in `list__select.html.twig`
+- Fixed wrong method call in `list__select.html.twig`
+- Fixed `Pool::getAdminsByGroup()` for the new admin groups values
+
 ## [3.1.0](https://github.com/sonata-project/SonataAdminBundle/compare/3.0.0...3.1.0) - 2016-05-17
 ## [3.1.0](https://github.com/sonata-project/SonataAdminBundle/compare/3.0.0...3.1.0) - 2016-05-17
 ### Added
 ### Added
 - Added `AbstractAdmin` class, replacing `Admin` one
 - Added `AbstractAdmin` class, replacing `Admin` one

+ 1 - 1
Controller/CRUDController.php

@@ -375,7 +375,7 @@ class CRUDController extends Controller
         $reflector = new \ReflectionMethod($this->admin, 'getBatchActions');
         $reflector = new \ReflectionMethod($this->admin, 'getBatchActions');
         if ($reflector->getDeclaringClass()->getName() === get_class($this->admin)) {
         if ($reflector->getDeclaringClass()->getName() === get_class($this->admin)) {
             @trigger_error('Override Sonata\AdminBundle\Admin\AbstractAdmin::getBatchActions method'
             @trigger_error('Override Sonata\AdminBundle\Admin\AbstractAdmin::getBatchActions method'
-                .' is deprecated since version 3.x.'
+                .' is deprecated since version 3.2.'
                 .' Use Sonata\AdminBundle\Admin\AbstractAdmin::configureBatchActions instead.'
                 .' Use Sonata\AdminBundle\Admin\AbstractAdmin::configureBatchActions instead.'
                 .' The method will be final in 4.0.', E_USER_DEPRECATED
                 .' The method will be final in 4.0.', E_USER_DEPRECATED
             );
             );

+ 3 - 0
UPGRADE-3.x.md

@@ -1,6 +1,9 @@
 UPGRADE 3.x
 UPGRADE 3.x
 ===========
 ===========
 
 
+UPGRADE FROM 3.1 to 3.2
+=======================
+
 ## Deprecated override of AbstractAdmin::getBatchActions
 ## Deprecated override of AbstractAdmin::getBatchActions
 
 
 Since `AbstractAdmin::configureBatchActions` is present, you should not override `AbstractAdmin::getBatchActions`.
 Since `AbstractAdmin::configureBatchActions` is present, you should not override `AbstractAdmin::getBatchActions`.