Przeglądaj źródła

Se agrega library al modelo de nas.

Maxi Schvindt 7 lat temu
rodzic
commit
aa65828f8d

+ 49 - 49
composer.lock

@@ -755,9 +755,9 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "url": "https://satis.infra.flowdat.com/dist/doctrine/instantiator/doctrine-instantiator-8e884e78f9f0eb1329e445619e04456e64d8051d-zip-681b88.zip",
                 "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "shasum": ""
+                "shasum": "62a7b8d59ce1dc5627bd2aed2882f18ff1138219"
             },
             "require": {
                 "php": ">=5.3,<8.0-DEV"
@@ -1271,9 +1271,9 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/hwi/HWIOAuthBundle/zipball/50f4bcbe5c217cfdf0f7f40a174b87199b76d1e1",
+                "url": "https://satis.infra.flowdat.com/dist/hwi/oauth-bundle/hwi-oauth-bundle-50f4bcbe5c217cfdf0f7f40a174b87199b76d1e1-zip-0aca95.zip",
                 "reference": "50f4bcbe5c217cfdf0f7f40a174b87199b76d1e1",
-                "shasum": ""
+                "shasum": "b6918d1815cc36aff59cf0d12764bb0324ff1549"
             },
             "require": {
                 "kriswallsmith/buzz": "~0.13",
@@ -1433,7 +1433,7 @@
                 "audit",
                 "bundle"
             ],
-            "time": "2017-11-24 15:24:36"
+            "time": "2017-11-24T15:24:36+00:00"
         },
         {
             "name": "ik/auth-bundle",
@@ -1456,7 +1456,7 @@
                 "auth",
                 "bundle"
             ],
-            "time": "2017-12-05 15:22:24"
+            "time": "2017-12-05T15:22:24+00:00"
         },
         {
             "name": "ik/base-admin-bundle",
@@ -1479,7 +1479,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-12-26 15:41:06"
+            "time": "2017-12-26T15:41:06+00:00"
         },
         {
             "name": "ik/device-bundle",
@@ -1487,7 +1487,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/DeviceBundle.git",
-                "reference": "44b9f6833db9d9611e9065615888ddbe96993537"
+                "reference": "17a53335cc1ba075f2bca4b5f78400d27e94ff85"
             },
             "type": "library",
             "autoload": {
@@ -1502,7 +1502,7 @@
                 "bundle",
                 "validators"
             ],
-            "time": "2017-12-26 12:26:50"
+            "time": "2018-01-03T15:05:50+00:00"
         },
         {
             "name": "ik/extra-data-bundle",
@@ -1525,7 +1525,7 @@
                 "bundle",
                 "extra-data"
             ],
-            "time": "2017-12-27 13:01:33"
+            "time": "2017-12-27T13:01:33+00:00"
         },
         {
             "name": "ik/leaflet-bundle",
@@ -1546,7 +1546,7 @@
                 }
             },
             "description": "The Flowdat3 Leaflet Resource",
-            "time": "2017-12-12 17:52:51"
+            "time": "2017-12-12T17:52:51+00:00"
         },
         {
             "name": "ik/map-bundle",
@@ -1569,7 +1569,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-11-16 14:10:01"
+            "time": "2017-11-16T14:10:01+00:00"
         },
         {
             "name": "ik/migrations-bundle",
@@ -1592,7 +1592,7 @@
                 "bundle",
                 "migrations"
             ],
-            "time": "2017-12-21 12:10:32"
+            "time": "2017-12-21T12:10:32+00:00"
         },
         {
             "name": "ik/oauthclient-bundle",
@@ -1619,7 +1619,7 @@
                 "bundle",
                 "oauth"
             ],
-            "time": "2017-10-11 14:15:38"
+            "time": "2017-10-11T14:15:38+00:00"
         },
         {
             "name": "ik/owner-voter-bundle",
@@ -1642,7 +1642,7 @@
                 "bundle",
                 "owner-voter"
             ],
-            "time": "2017-06-12 15:49:24"
+            "time": "2017-06-12T15:49:24+00:00"
         },
         {
             "name": "ik/template-bundle",
@@ -1668,7 +1668,7 @@
                 "bundle",
                 "template"
             ],
-            "time": "2017-08-02 18:42:10"
+            "time": "2017-08-02T18:42:10+00:00"
         },
         {
             "name": "ik/webservice-bundle",
@@ -1676,7 +1676,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/Webservice.git",
-                "reference": "75b52a5100bdb19cf6006dea5a8a92ae3047d87c"
+                "reference": "54bf24924767af1402cf95771c859c1f10a8632d"
             },
             "require": {
                 "ext-curl": "*",
@@ -1689,7 +1689,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",
@@ -1697,7 +1697,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
-                "reference": "360f6a217c6ebdbc7d39b608d5cc63f28dbde47e"
+                "reference": "9a876ef9dffb79b642bd790512956e0a494325a3"
             },
             "require": {
                 "php-amqplib/rabbitmq-bundle": "^1.12"
@@ -1727,7 +1727,7 @@
                 "bundle",
                 "workflow"
             ],
-            "time": "2017-12-21 16:04:13"
+            "time": "2018-01-03T13:28:51+00:00"
         },
         {
             "name": "incenteev/composer-parameter-handler",
@@ -1739,9 +1739,9 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Incenteev/ParameterHandler/zipball/d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc",
+                "url": "https://satis.infra.flowdat.com/dist/incenteev/composer-parameter-handler/incenteev-composer-parameter-handler-d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc-zip-06d0a7.zip",
                 "reference": "d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc",
-                "shasum": ""
+                "shasum": "78accafc69077c94e2b5c40dcac6a23149e62a2d"
             },
             "require": {
                 "php": ">=5.3.3",
@@ -1884,9 +1884,9 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/parser-lib/zipball/c509473bc1b4866415627af0e1c6cc8ac97fa51d",
+                "url": "https://satis.infra.flowdat.com/dist/jms/parser-lib/jms-parser-lib-c509473bc1b4866415627af0e1c6cc8ac97fa51d-zip-d6e55f.zip",
                 "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d",
-                "shasum": ""
+                "shasum": "2ea232ddbcd3fb65004c7454244af057fb422817"
             },
             "require": {
                 "phpoption/phpoption": ">=0.9,<2.0-dev"
@@ -2003,9 +2003,9 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/85ee039a2b7f89d77c403e33cee7b43a875c31e5",
+                "url": "https://satis.infra.flowdat.com/dist/jms/serializer-bundle/jms-serializer-bundle-85ee039a2b7f89d77c403e33cee7b43a875c31e5-zip-e99b92.zip",
                 "reference": "85ee039a2b7f89d77c403e33cee7b43a875c31e5",
-                "shasum": ""
+                "shasum": "8ceb3e6f31ad9b250fe9070661ee2d4b4d52c0f2"
             },
             "require": {
                 "jms/serializer": "^1.7",
@@ -2919,9 +2919,9 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/eb6266b3b472e4002538610b28a0a04bcf94891a",
+                "url": "https://satis.infra.flowdat.com/dist/sensio/distribution-bundle/sensio-distribution-bundle-eb6266b3b472e4002538610b28a0a04bcf94891a-zip-b89371.zip",
                 "reference": "eb6266b3b472e4002538610b28a0a04bcf94891a",
-                "shasum": ""
+                "shasum": "c880207d73e5af5719bf65852f2890e55cb488d6"
             },
             "require": {
                 "php": ">=5.3.9",
@@ -3259,7 +3259,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-10-04 12:16:04"
+            "time": "2017-10-04T12:16:04+00:00"
         },
         {
             "name": "sonata-project/block-bundle",
@@ -3686,9 +3686,9 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/stof/StofDoctrineExtensionsBundle/zipball/4e7499d25dc5d0862da09fa8e336164948a29a25",
+                "url": "https://satis.infra.flowdat.com/dist/stof/doctrine-extensions-bundle/stof-doctrine-extensions-bundle-4e7499d25dc5d0862da09fa8e336164948a29a25-zip-803a48.zip",
                 "reference": "4e7499d25dc5d0862da09fa8e336164948a29a25",
-                "shasum": ""
+                "shasum": "5f6b05de8625fea312c1ae92066580864eea07d5"
             },
             "require": {
                 "gedmo/doctrine-extensions": "^2.3.1",
@@ -4192,9 +4192,9 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/security-acl/zipball/053b49bf4aa333a392c83296855989bcf88ddad1",
+                "url": "https://satis.infra.flowdat.com/dist/symfony/security-acl/symfony-security-acl-053b49bf4aa333a392c83296855989bcf88ddad1-zip-4a92bd.zip",
                 "reference": "053b49bf4aa333a392c83296855989bcf88ddad1",
-                "shasum": ""
+                "shasum": "9562593da89cd1ab1a2d69962cc0d933cea99714"
             },
             "require": {
                 "php": ">=5.5.9",
@@ -4582,9 +4582,9 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/voryx/restgeneratorbundle/zipball/72b61d2188662da453d2e2a9cd625a60b6f3233b",
+                "url": "https://satis.infra.flowdat.com/dist/voryx/restgeneratorbundle/voryx-restgeneratorbundle-72b61d2188662da453d2e2a9cd625a60b6f3233b-zip-888957.zip",
                 "reference": "72b61d2188662da453d2e2a9cd625a60b6f3233b",
-                "shasum": ""
+                "shasum": "5ca3bc614a05b341c7857876407dc54e73dcde0c"
             },
             "require": {
                 "friendsofsymfony/rest-bundle": "~1.7",
@@ -4617,7 +4617,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",
@@ -5138,9 +5138,9 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
+                "url": "https://satis.infra.flowdat.com/dist/phpunit/php-file-iterator/phpunit-php-file-iterator-3cc8f69b3028d0f96a9078e6295d86e9bf019be5-zip-184bc9.zip",
                 "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
-                "shasum": ""
+                "shasum": "d3ce5a919fe743126f331988b9a0f7b8302b999a"
             },
             "require": {
                 "php": ">=5.3.3"
@@ -5185,9 +5185,9 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "url": "https://satis.infra.flowdat.com/dist/phpunit/php-text-template/phpunit-php-text-template-31f8b717e51d9a2afca6c9f046f5d69fc27c8686-zip-c6bcbd.zip",
                 "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "shasum": ""
+                "shasum": "4122b00281fc98e1733bd9ca446002393c452f84"
             },
             "require": {
                 "php": ">=5.3.3"
@@ -5226,9 +5226,9 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "url": "https://satis.infra.flowdat.com/dist/phpunit/php-timer/phpunit-php-timer-3dcf38ca72b158baf0bc245e9184d3fdffa9c46f-zip-c27592.zip",
                 "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
-                "shasum": ""
+                "shasum": "f67f992aca05457e1e21f619250770b09092ff7b"
             },
             "require": {
                 "php": "^5.3.3 || ^7.0"
@@ -5467,9 +5467,9 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
+                "url": "https://satis.infra.flowdat.com/dist/sebastian/code-unit-reverse-lookup/sebastian-code-unit-reverse-lookup-4419fcdb5eabb9caa61a27c7a1db532a6b55dd18-zip-2b8d33.zip",
                 "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
-                "shasum": ""
+                "shasum": "8470a6b3ca913a110aa2580255552a06e995710c"
             },
             "require": {
                 "php": "^5.6 || ^7.0"
@@ -5941,9 +5941,9 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
+                "url": "https://satis.infra.flowdat.com/dist/sebastian/resource-operations/sebastian-resource-operations-ce990bb21759f94aeafd30209e8cfcdfa8bc3f52-zip-4a3a08.zip",
                 "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
-                "shasum": ""
+                "shasum": "248cd12206b575057bf0b19f306d92a2f818dfb1"
             },
             "require": {
                 "php": ">=5.6.0"
@@ -5983,9 +5983,9 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "url": "https://satis.infra.flowdat.com/dist/sebastian/version/sebastian-version-99732be0ddb3361e16ad77b68ba41efc8e979019-zip-0eee83.zip",
                 "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
-                "shasum": ""
+                "shasum": "dff8de471afebba9fc6837bb8c886ddc7ebe41bb"
             },
             "require": {
                 "php": ">=5.6"
@@ -6185,7 +6185,7 @@
         "voryx/restgeneratorbundle": 20
     },
     "prefer-stable": false,
-    "prefer-lowest": false,
+    "prefer-lowest": true,
     "platform": {
         "php": ">=5.5.9"
     },

+ 5 - 0
src/RadiusBundle/Admin/NASModelAdmin.php

@@ -16,6 +16,7 @@ class NASModelAdmin extends BaseAdmin
     protected function configureDatagridFilters(DatagridMapper $datagridMapper)
     {
         $datagridMapper
+            ->add('library')
             ->add('name');
     }
 
@@ -26,6 +27,7 @@ class NASModelAdmin extends BaseAdmin
     {
         $listMapper
             ->add('name')
+            ->add('library')
             ->add('extraData')
             ->add('_action', null, array(
                 'actions' => array(
@@ -41,8 +43,10 @@ class NASModelAdmin extends BaseAdmin
      */
     protected function configureFormFields(FormMapper $formMapper)
     {
+        $libraries = ['OIDSBase' => 'OIDSBase'];
         $formMapper
             ->add('name')
+            ->add('library', 'choice', array('required'=>true, 'choices' => $libraries))
             ->add('extraData');
     }
 
@@ -53,6 +57,7 @@ class NASModelAdmin extends BaseAdmin
     {
         $showMapper
             ->add('name')
+            ->add('library')
             ->add('extraData');
     }
 

+ 27 - 0
src/RadiusBundle/Entity/NASModel.php

@@ -41,6 +41,13 @@ class NASModel implements TenancyIdTraitInterface
      */
     protected $nass;
 
+    /**
+     * @var string $library
+     *
+     * @ORM\Column(type="string", length=255, nullable=true)
+     */
+    protected $library;
+
     /**
      * @return string
      */
@@ -89,4 +96,24 @@ class NASModel implements TenancyIdTraitInterface
         return $this;
     }
 
+    /**
+     * @param string $library
+     *
+     * @return OLTModel
+     */
+    public function setLibrary($library)
+    {
+        $this->library = $library;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getLibrary()
+    {
+        return $this->library;
+    }
+
 }

+ 4 - 0
src/RadiusBundle/Resources/translations/RadiusBundle.es.yml

@@ -25,6 +25,7 @@ filter:
     label_radius_password: Contraseña
     label_model: Modelo
     label_acct_enabled: Cuenta Habilitada
+    label_library: Librería
 
 breadcrumb:
     link_profile_list: Listado Perfiles
@@ -59,6 +60,7 @@ form:
     label_model: Modelo
     label_acct_enabled: Cuenta Habilitada
     label_extra_data: Extra Data
+    label_library: Librería
 
 list:
     label__action: Acciones
@@ -79,6 +81,7 @@ list:
     label_model: Modelo
     label_acct_enabled: Cuenta Habilitada
     label_extra_data: Extra Data
+    label_library: Librería
 
 show:
     label__action: Acciones
@@ -99,6 +102,7 @@ show:
     label_model: Modelo
     label_acct_enabled: Cuenta Habilitada
     label_extra_data: Extra Data
+    label_library: Librería
 
 error:
     address_not_found: Dirección no encontrada.