Merge pull request #8 from hunter1271/master

Updates for latest sonata admin
vitiko · Oct 14, 2015 · d255a15 · d255a15
2 parents 2b18189 + dcb9660
commit d255a15
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,8 +5,12 @@ php:
   - 5.4
 
 env:
-    - SYMFONY_VERSION=2.2.*
     - SYMFONY_VERSION=2.3.*
+    - SYMFONY_VERSION=2.4.*
+    - SYMFONY_VERSION=2.5.*
+    - SYMFONY_VERSION=2.6.*
+    - SYMFONY_VERSION=2.7.*
+
 
 before_script:
 

diff --git a/Controller/CRUDController.php b/Controller/CRUDController.php
@@ -5,6 +5,7 @@
 
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
+use Symfony\Component\HttpFoundation\Request;
 use Sonata\AdminBundle\Controller\CRUDController as SonataCRUDController;
 
 class CRUDController extends SonataCRUDController
@@ -40,7 +41,7 @@ public function changePositionAction($moveNodeId, $moveNodeParent, $moveNodeAfte
     }
 
 
-    public function listAction()
+    public function listAction(Request $request = null)
     {
         if (false === $this->admin->isGranted('LIST')) {
             throw new AccessDeniedException();

diff --git a/Resources/views/CRUD/tree.html.twig b/Resources/views/CRUD/tree.html.twig
@@ -38,7 +38,7 @@
        .trtable { width:100%; border-collapse: collapse /*;   border:1px solid #DDD;*/  }
        .trtable tr td { border-bottom: 1px solid #DDD; padding:8px}
        .trtable { margin-bottom: 2px}
-    .sonata-ba-list-field-batch  { width:30px}
+    .sonata-ba-list-field-batch  { width:38px}
             /*   .sonata-bc li { line-height: 0px;  }
      .sonata-bc table { margin-bottom: 1px} *//* Изначально 18*/
     </style>

diff --git a/Resources/views/CRUD/treeCollapsible.html.twig b/Resources/views/CRUD/treeCollapsible.html.twig
@@ -56,7 +56,7 @@
        .trtable { width:100%; border-collapse: collapse /*;   border:1px solid #DDD;*/  }
        .trtable tr td { border-bottom: 1px solid #DDD; padding:8px}
        .trtable { margin-bottom: 2px}
-    .sonata-ba-list-field-batch  { width:30px}
+    .sonata-ba-list-field-batch  { width:38px}
             /*   .sonata-bc li { line-height: 0px;  }
      .sonata-bc table { margin-bottom: 1px} *//* Изначально 18*/
     </style>

diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
 
 
     "require": {
-        "symfony/framework-bundle":">=2.2@stable",
+        "symfony/framework-bundle":"~2.3@stable",
     	"stof/doctrine-extensions-bundle": "@stable"
     },