浏览代码

agregado check sintax

gabriel 6 年之前
父节点
当前提交
9eafdbed28

文件差异内容过多而无法显示
+ 1 - 1
app/DoctrineMigrations/src/template.yml


+ 0 - 4
app/config/config_dev.yml

@@ -28,10 +28,6 @@ monolog:
             type:  stream
             path:  "%kernel.logs_dir%/%kernel.environment%.log"
             level: debug
-        amqp:
-            type:               service
-            id:                 monolog.amqp
-            level:              debug
         console:
             type:   console
         # uncomment to get logging in your browser

+ 1 - 1
app/config/config_prod.yml

@@ -27,5 +27,5 @@ monolog:
         amqp:
             type: service
             id: monolog.amqp
-            level: debug
+            level: error
             channels: ['devicelog', 'webservice']

+ 11 - 1
bin/composer-install.sh

@@ -1,8 +1,18 @@
 #!/bin/bash
+
+start=`date +%s`
+
 chmod 0400 keys/*
 eval $(ssh-agent)
 ssh-add keys/bitbucket.id_rsa
-composer install --no-progress -n
+
+command="composer install --no-progress -n $@"
+echo -e "Command: \e[42m$command\e[0m"
+$command
 
 kill $SSH_AGENT_PID
 unset SSH_AGENT_PID
+
+end=`date +%s`
+runtime=$((end-start))
+echo -e "\e[42mExecution time: $runtime s\e[0m"

+ 11 - 1
bin/composer-update.sh

@@ -1,8 +1,18 @@
 #!/bin/bash
+
+start=`date +%s`
+
 chmod 0400 keys/*
 eval $(ssh-agent)
 ssh-add keys/bitbucket.id_rsa
-composer update --prefer-dist --no-plugins --no-autoloader --no-scripts --no-progress --no-suggest --with-dependencies --ignore-platform-reqs --prefer-lowest -n
+
+command="composer update --prefer-dist --no-plugins --no-autoloader --no-scripts --no-progress --no-suggest --with-dependencies --ignore-platform-reqs --prefer-lowest -n $@"
+echo -e "Command: \e[42m$command\e[0m"
+$command
 
 kill $SSH_AGENT_PID
 unset SSH_AGENT_PID
+
+end=`date +%s`
+runtime=$((end-start))
+echo -e "\e[42mExecution time: $runtime s\e[0m"

+ 1 - 1
composer.lock

@@ -6763,7 +6763,7 @@
         "voryx/restgeneratorbundle": 20
     },
     "prefer-stable": false,
-    "prefer-lowest": false,
+    "prefer-lowest": true,
     "platform": {
         "php": ">=5.5.9"
     },

+ 15 - 14
src/FTTHBundle/Admin/ONUAdmin.php

@@ -444,8 +444,19 @@ class ONUAdmin extends WorkflowBaseAdmin
                     ->add('olt')
                     ->add('currentState')
                     ->add('position')
-                    ->add('ip')
-                ->end()
+                    ->add('ip');
+
+                    // Consulto en stats la url del detalle de onu
+                    $onuShowUrl = $this->getStatsShowOnuUrl();
+                    if ($onuShowUrl != '') {
+                        $showMapper->add('stats_onu', 'string', [
+                            'template' => 'FTTHBundle::stats_show_link.html.twig',
+                            'data' => [
+                                'url' => $onuShowUrl,
+                            ],
+                        ]);
+                    }
+        $showMapper->end()
                 ->with('Huawei', ['class' => "col-md-12 {$hidden['Huawei']} olt_mark Huawei"])
                     ->add('servicePorts', CollectionType::class, array(
                         'entry_type' => "FTTHBundle\\Form\\ServicePortType",
@@ -468,18 +479,8 @@ class ONUAdmin extends WorkflowBaseAdmin
                     ->add('vlans', null, array(
                         'required' => false,
                         'multiple' => true,
-                    ));
-        // Consulto en stats la url del detalle de onu
-        $onuShowUrl = $this->getStatsShowOnuUrl();
-        if ($onuShowUrl != '') {
-            $showMapper->add('stats_onu', 'string', [
-                'template' => 'FTTHBundle::stats_show_link.html.twig',
-                'data' => [
-                    'url' => $onuShowUrl,
-                ],
-            ]);
-        }
-        $showMapper->end()
+                    ))
+                    ->end()
             ->end()
             ->tab('Log')
                 ->with('Log')