Преглед на файлове

Merged in FD3-416 (pull request #27)

Agregado de un template para los list y se agrego el group al select batchaction

Approved-by: Guillermo Espinoza <guillermo@interlink.com.ar>
Gabriel Gosparo преди 7 години
родител
ревизия
b395881be3
променени са 2 файла, в които са добавени 32 реда и са изтрити 31 реда
  1. 1 0
      app/config/config.yml
  2. 31 31
      composer.lock

+ 1 - 0
app/config/config.yml

@@ -108,4 +108,5 @@ sonata_admin:
     templates:
         layout: BaseAdminBundle::standard_layout.html.twig
         user_block: BaseOAuthClientBundle:Core:oauth_user_block.html.twig
+        list: BaseAdminBundle::standard_list.html.twig
     persist_filters: true

+ 31 - 31
composer.lock

@@ -1226,7 +1226,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/hwi/HWIOAuthBundle/zipball/50f4bcbe5c217cfdf0f7f40a174b87199b76d1e1",
                 "reference": "50f4bcbe5c217cfdf0f7f40a174b87199b76d1e1",
-                "shasum": ""
+                "shasum": "b6918d1815cc36aff59cf0d12764bb0324ff1549"
             },
             "require": {
                 "kriswallsmith/buzz": "~0.13",
@@ -1386,7 +1386,7 @@
                 "audit",
                 "bundle"
             ],
-            "time": "2018-01-11T17:21:01+00:00"
+            "time": "2018-01-11 17:21:01"
         },
         {
             "name": "ik/auth-bundle",
@@ -1409,7 +1409,7 @@
                 "auth",
                 "bundle"
             ],
-            "time": "2018-01-11T17:57:19+00:00"
+            "time": "2018-01-11 17:57:19"
         },
         {
             "name": "ik/base-admin-bundle",
@@ -1432,7 +1432,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2018-01-11T17:41:06+00:00"
+            "time": "2018-01-11 17:41:06"
         },
         {
             "name": "ik/device-bundle",
@@ -1455,7 +1455,7 @@
                 "bundle",
                 "validators"
             ],
-            "time": "2018-01-11T11:36:46+00:00"
+            "time": "2018-01-11 11:36:46"
         },
         {
             "name": "ik/extra-data-bundle",
@@ -1478,7 +1478,7 @@
                 "bundle",
                 "extra-data"
             ],
-            "time": "2018-01-11T18:01:06+00:00"
+            "time": "2018-01-11 18:01:06"
         },
         {
             "name": "ik/leaflet-bundle",
@@ -1499,7 +1499,7 @@
                 }
             },
             "description": "The Flowdat3 Leaflet Resource",
-            "time": "2018-01-11T18:04:54+00:00"
+            "time": "2018-01-11 18:04:54"
         },
         {
             "name": "ik/migrations-bundle",
@@ -1522,7 +1522,7 @@
                 "bundle",
                 "migrations"
             ],
-            "time": "2018-01-11T17:45:12+00:00"
+            "time": "2018-01-11 17:45:12"
         },
         {
             "name": "ik/oauthclient-bundle",
@@ -1549,7 +1549,7 @@
                 "bundle",
                 "oauth"
             ],
-            "time": "2018-01-11T17:07:40+00:00"
+            "time": "2018-01-11 17:07:40"
         },
         {
             "name": "ik/owner-voter-bundle",
@@ -1572,7 +1572,7 @@
                 "bundle",
                 "owner-voter"
             ],
-            "time": "2018-01-11T17:26:19+00:00"
+            "time": "2018-01-11 17:26:19"
         },
         {
             "name": "ik/redis-bundle",
@@ -1596,7 +1596,7 @@
                 "php-redis-service",
                 "redis"
             ],
-            "time": "2018-01-11T15:21:55+00:00"
+            "time": "2018-01-11 15:21:55"
         },
         {
             "name": "ik/stats/base-stats-bundle",
@@ -1617,7 +1617,7 @@
                 "BaseStatsBundle",
                 "Flowdat 3"
             ],
-            "time": "2017-12-27T17:10:07+00:00"
+            "time": "2017-12-27 17:10:07"
         },
         {
             "name": "ik/stats/fiberhome-bundle",
@@ -1638,7 +1638,7 @@
                 "Fiberhome",
                 "Flowdat 3"
             ],
-            "time": "2018-01-11T16:56:47+00:00"
+            "time": "2018-01-11 16:56:47"
         },
         {
             "name": "ik/stats/fiberlink-bundle",
@@ -1659,7 +1659,7 @@
                 "Fiberlink",
                 "Flowdat 3"
             ],
-            "time": "2018-01-11T16:58:27+00:00"
+            "time": "2018-01-11 16:58:27"
         },
         {
             "name": "ik/stats/geoserver-bundle",
@@ -1680,7 +1680,7 @@
                 "Flowdat 3",
                 "Geoserver"
             ],
-            "time": "2018-01-11T17:51:42+00:00"
+            "time": "2018-01-11 17:51:42"
         },
         {
             "name": "ik/stats/huawei-bundle",
@@ -1701,7 +1701,7 @@
                 "Flowdat 3",
                 "Huawei"
             ],
-            "time": "2017-12-27T11:19:17+00:00"
+            "time": "2017-12-27 11:19:17"
         },
         {
             "name": "ik/stats/nas-bundle",
@@ -1722,7 +1722,7 @@
                 "Flowdat 3",
                 "NAS"
             ],
-            "time": "2018-01-05T18:49:11+00:00"
+            "time": "2018-01-05 18:49:11"
         },
         {
             "name": "ik/stats/zte-bundle",
@@ -1743,7 +1743,7 @@
                 "Flowdat 3",
                 "Zte"
             ],
-            "time": "2018-01-11T17:00:17+00:00"
+            "time": "2018-01-11 17:00:17"
         },
         {
             "name": "ik/statsd-bundle",
@@ -1764,7 +1764,7 @@
                 "stats",
                 "statsd"
             ],
-            "time": "2018-01-11T17:57:52+00:00"
+            "time": "2018-01-11 17:57:52"
         },
         {
             "name": "ik/webservice-bundle",
@@ -1785,7 +1785,7 @@
                 }
             },
             "description": "The Flowdat3 Webservice Rest",
-            "time": "2018-01-11T17:48:52+00:00"
+            "time": "2018-01-11 17:48:52"
         },
         {
             "name": "ik/workflow-bundle",
@@ -1793,7 +1793,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
-                "reference": "d0964f492663eca837de58e9e3d09d39723179f0"
+                "reference": "a6ef85927a96a4d89176b3d9e767e1e06d39f70f"
             },
             "require": {
                 "php-amqplib/rabbitmq-bundle": "^1.12"
@@ -1823,7 +1823,7 @@
                 "bundle",
                 "workflow"
             ],
-            "time": "2018-01-11T17:17:44+00:00"
+            "time": "2018-01-12 11:27:45"
         },
         {
             "name": "incenteev/composer-parameter-handler",
@@ -1837,7 +1837,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/Incenteev/ParameterHandler/zipball/d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc",
                 "reference": "d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc",
-                "shasum": ""
+                "shasum": "78accafc69077c94e2b5c40dcac6a23149e62a2d"
             },
             "require": {
                 "php": ">=5.3.3",
@@ -1982,7 +1982,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/schmittjoh/parser-lib/zipball/c509473bc1b4866415627af0e1c6cc8ac97fa51d",
                 "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d",
-                "shasum": ""
+                "shasum": "2ea232ddbcd3fb65004c7454244af057fb422817"
             },
             "require": {
                 "phpoption/phpoption": ">=0.9,<2.0-dev"
@@ -2581,7 +2581,7 @@
                 "oss_snmp",
                 "snmp"
             ],
-            "time": "2017-11-28T13:23:43+00:00"
+            "time": "2017-11-28 13:23:43"
         },
         {
             "name": "paragonie/random_compat",
@@ -3473,7 +3473,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-10-04T12:16:04+00:00"
+            "time": "2017-10-04 12:16:04"
         },
         {
             "name": "sonata-project/block-bundle",
@@ -3902,7 +3902,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/stof/StofDoctrineExtensionsBundle/zipball/4e7499d25dc5d0862da09fa8e336164948a29a25",
                 "reference": "4e7499d25dc5d0862da09fa8e336164948a29a25",
-                "shasum": ""
+                "shasum": "5f6b05de8625fea312c1ae92066580864eea07d5"
             },
             "require": {
                 "gedmo/doctrine-extensions": "^2.3.1",
@@ -4478,7 +4478,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/symfony/security-acl/zipball/053b49bf4aa333a392c83296855989bcf88ddad1",
                 "reference": "053b49bf4aa333a392c83296855989bcf88ddad1",
-                "shasum": ""
+                "shasum": "9562593da89cd1ab1a2d69962cc0d933cea99714"
             },
             "require": {
                 "php": ">=5.5.9",
@@ -4868,7 +4868,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/voryx/restgeneratorbundle/zipball/72b61d2188662da453d2e2a9cd625a60b6f3233b",
                 "reference": "72b61d2188662da453d2e2a9cd625a60b6f3233b",
-                "shasum": ""
+                "shasum": "5ca3bc614a05b341c7857876407dc54e73dcde0c"
             },
             "require": {
                 "friendsofsymfony/rest-bundle": "~1.7",
@@ -4901,7 +4901,7 @@
                 }
             ],
             "description": "REST API Generator for Symfony 2",
-            "time": "2016-04-18T12:29:38+00:00"
+            "time": "2016-04-18 12:29:38"
         },
         {
             "name": "willdurand/jsonp-callback-validator",
@@ -6227,7 +6227,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
                 "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
-                "shasum": ""
+                "shasum": "248cd12206b575057bf0b19f306d92a2f818dfb1"
             },
             "require": {
                 "php": ">=5.6.0"