Luciano Andrade 7 rokov pred
rodič
commit
57eda5eec1
5 zmenil súbory, kde vykonal 211 pridanie a 192 odobranie
  1. 1 0
      .gitignore
  2. 0 1
      app/config/security.yml
  3. 205 190
      composer.lock
  4. 4 0
      phpunit.xml.dist
  5. 1 1
      src/FTTHBundle/Admin/OLTModelAdmin.php

+ 1 - 0
.gitignore

@@ -1,5 +1,6 @@
 /app/config/parameters.yml
 /app/config/parameters.yml
 /app/config/bundles/ik/device-bundle/parameters.yml
 /app/config/bundles/ik/device-bundle/parameters.yml
+app/config/bundles/ik/audit-bundle/parameters.yml
 /app/config/url_webservice.yml
 /app/config/url_webservice.yml
 /app/config/hwioauthbundle/parameters.yml
 /app/config/hwioauthbundle/parameters.yml
 /build/
 /build/

+ 0 - 1
app/config/security.yml

@@ -15,7 +15,6 @@ security:
             
             
         api:
         api:
           pattern: ^/api
           pattern: ^/api
-          http_basic: true
           stateless: true
           stateless: true
           oauth_proxy: true
           oauth_proxy: true
 
 

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 205 - 190
composer.lock


+ 4 - 0
phpunit.xml.dist

@@ -17,6 +17,10 @@
             <directory>tests</directory>
             <directory>tests</directory>
             <directory>src/*Bundle/tests</directory>
             <directory>src/*Bundle/tests</directory>
         </testsuite>
         </testsuite>
+        <testsuite name="Ik vendors Test Suite">
+            <directory>tests</directory>
+            <directory>vendor/ik/*/tests</directory>
+        </testsuite>
     </testsuites>
     </testsuites>
 
 
     <filter>
     <filter>

+ 1 - 1
src/FTTHBundle/Admin/OLTModelAdmin.php

@@ -50,7 +50,7 @@ class OLTModelAdmin extends BaseAdmin
     protected function configureFormFields(FormMapper $formMapper)
     protected function configureFormFields(FormMapper $formMapper)
     {
     {
         $marks = ['FiberHome' => 'FiberHome', 'FiberLink' => 'FiberLink', 'Huawei' => 'Huawei', 'ZTE' => 'ZTE', 'Calix' => 'Calix'];
         $marks = ['FiberHome' => 'FiberHome', 'FiberLink' => 'FiberLink', 'Huawei' => 'Huawei', 'ZTE' => 'ZTE', 'Calix' => 'Calix'];
-        $libraries = ['OIDSBase' => 'OIDSBase','OIDSFiberHomeV1' => 'OIDSFiberHomeV1'];
+        $libraries = ['OIDSBase' => 'OIDSBase','OIDSFiberHomeV1' => 'OIDSFiberHomeV1','OIDSHuaweiV1' => 'OIDSHuaweiV1'];
         $formMapper
         $formMapper
             ->add('name')
             ->add('name')
             ->add('mark', 'choice', array('required'=>true, 'choices' => $marks))
             ->add('mark', 'choice', array('required'=>true, 'choices' => $marks))