소스 검색

Merged in FD3-416 (pull request #4)

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

Approved-by: Guillermo Espinoza <guillermo@interlink.com.ar>
Approved-by: Maximiliano Schvindt <maximiliano@interlink.com.ar>
Gabriel Gosparo 7 년 전
부모
커밋
b26c7518c6
2개의 변경된 파일25개의 추가작업 그리고 24개의 파일을 삭제
  1. 1 0
      app/config/config.yml
  2. 24 24
      composer.lock

+ 1 - 0
app/config/config.yml

@@ -116,6 +116,7 @@ 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
     
 doctrine_migrations:

+ 24 - 24
composer.lock

@@ -1451,7 +1451,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/AuditBundle.git",
-                "reference": "deba8813246a14dd17b160e44a35bb4811c13452"
+                "reference": "b202b7ac2ba770a72d323bb1fea8291249c09096"
             },
             "require": {
                 "simplethings/entity-audit-bundle": "^1.0"
@@ -1467,7 +1467,7 @@
                 "audit",
                 "bundle"
             ],
-            "time": "2017-06-27 13:16:34"
+            "time": "2017-11-24T15:24:36+00:00"
         },
         {
             "name": "ik/auth-bundle",
@@ -1475,7 +1475,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/AuthBundle.git",
-                "reference": "97432185940d65ea97f0bf5778dbcceeb78578e4"
+                "reference": "3dfe0b95b0a2d3003065b2507a9bf581d3b7c214"
             },
             "type": "library",
             "autoload": {
@@ -1490,7 +1490,7 @@
                 "auth",
                 "bundle"
             ],
-            "time": "2017-09-22 13:27:29"
+            "time": "2017-12-05T15:22:24+00:00"
         },
         {
             "name": "ik/base-admin-bundle",
@@ -1498,7 +1498,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "394ee26731b2f6f777b1be6ccc48f18e599dd04f"
+                "reference": "9d644224c89b99d8f911af12f91b3a5ca9c349e6"
             },
             "type": "library",
             "autoload": {
@@ -1513,7 +1513,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-11-22 15:29:25"
+            "time": "2018-01-05T14:07:02+00:00"
         },
         {
             "name": "ik/device-bundle",
@@ -1521,7 +1521,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/DeviceBundle.git",
-                "reference": "584909edec2acc3eb9b565366f01ed5265369738"
+                "reference": "e53cfbcc9620f776428490e9ab92b151eab007bc"
             },
             "type": "library",
             "autoload": {
@@ -1536,7 +1536,7 @@
                 "bundle",
                 "validators"
             ],
-            "time": "2017-10-27 15:31:53"
+            "time": "2018-01-04T14:56:46+00:00"
         },
         {
             "name": "ik/extra-data-bundle",
@@ -1544,7 +1544,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/ExtraDataBundle.git",
-                "reference": "66a998f00904ca9c18e8b02b8861c11f4e24989a"
+                "reference": "fdfa90821ff77946aa8a6781da6ac561f52e2b76"
             },
             "type": "library",
             "autoload": {
@@ -1559,7 +1559,7 @@
                 "bundle",
                 "extra-data"
             ],
-            "time": "2017-11-17 18:25:46"
+            "time": "2017-12-27T13:01:33+00:00"
         },
         {
             "name": "ik/leaflet-bundle",
@@ -1567,7 +1567,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/LeafletBundle.git",
-                "reference": "ede6c71729ad672c364f8d5fa86a3e0d3929e441"
+                "reference": "84174321550f3b566f525fb97b66f9e28396363a"
             },
             "require": {
                 "ext-curl": "*",
@@ -1580,7 +1580,7 @@
                 }
             },
             "description": "The Flowdat3 Leaflet Resource",
-            "time": "2017-10-18 17:36:55"
+            "time": "2017-12-12T17:52:51+00:00"
         },
         {
             "name": "ik/map-bundle",
@@ -1603,7 +1603,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-11-16 14:10:01"
+            "time": "2017-11-16T14:10:01+00:00"
         },
         {
             "name": "ik/migrations-bundle",
@@ -1611,7 +1611,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@bitbucket.org/ikflowdat/migrations.git",
-                "reference": "c5260fa99515a304953ae1fae08ddcf8c00755f6"
+                "reference": "db2d82800bca471cff76677b53aef5ec0ce6f374"
             },
             "type": "library",
             "autoload": {
@@ -1626,7 +1626,7 @@
                 "bundle",
                 "migrations"
             ],
-            "time": "2017-08-31 11:49:28"
+            "time": "2017-12-21T12:10:32+00:00"
         },
         {
             "name": "ik/oauthclient-bundle",
@@ -1653,7 +1653,7 @@
                 "bundle",
                 "oauth"
             ],
-            "time": "2017-10-11 14:15:38"
+            "time": "2017-10-11T14:15:38+00:00"
         },
         {
             "name": "ik/owner-voter-bundle",
@@ -1676,7 +1676,7 @@
                 "bundle",
                 "owner-voter"
             ],
-            "time": "2017-06-12 15:49:24"
+            "time": "2017-06-12T15:49:24+00:00"
         },
         {
             "name": "ik/template-bundle",
@@ -1702,7 +1702,7 @@
                 "bundle",
                 "template"
             ],
-            "time": "2017-08-02 18:42:10"
+            "time": "2017-08-02T18:42:10+00:00"
         },
         {
             "name": "ik/webservice-bundle",
@@ -1710,7 +1710,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/Webservice.git",
-                "reference": "75b52a5100bdb19cf6006dea5a8a92ae3047d87c"
+                "reference": "54bf24924767af1402cf95771c859c1f10a8632d"
             },
             "require": {
                 "ext-curl": "*",
@@ -1723,7 +1723,7 @@
                 }
             },
             "description": "The Flowdat3 Webservice Rest",
-            "time": "2017-12-18 13:14:57"
+            "time": "2018-01-02T19:07:42+00:00"
         },
         {
             "name": "ik/workflow-bundle",
@@ -1731,7 +1731,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
-                "reference": "dc130dd1b6bd8f609ade3b324798c70e20c5a977"
+                "reference": "e830889b31d990f9f56e90f840117f2e8f0df362"
             },
             "require": {
                 "php-amqplib/rabbitmq-bundle": "^1.12"
@@ -1761,7 +1761,7 @@
                 "bundle",
                 "workflow"
             ],
-            "time": "2017-11-09 15:34:00"
+            "time": "2018-01-05T15:29:31+00:00"
         },
         {
             "name": "incenteev/composer-parameter-handler",
@@ -3489,7 +3489,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-10-04 12:16:04"
+            "time": "2017-10-04T12:16:04+00:00"
         },
         {
             "name": "sonata-project/block-bundle",
@@ -4947,7 +4947,7 @@
                 }
             ],
             "description": "REST API Generator for Symfony 2",
-            "time": "2016-04-18 12:29:38"
+            "time": "2016-04-18T12:29:38+00:00"
         },
         {
             "name": "willdurand/jsonp-callback-validator",