Merge branch '2.7.x' of https://github.com/centreon/centreon into 2.7.x

www/class/config-generate/generate.class.php

@@ -100,13 +100,13 @@ class Generate {
             
             # Meta services
             if ($localhost == 1) {
-                $meta_services = &MetaService::getInstance()->getGeneratedServices();
+                $meta_services = &MetaService::getInstance()->getMetaServices();
                 $host_id = MetaHost::getInstance()->getHostIdByHostName('_Module_Meta');
-                foreach ($meta_services as $meta_id) {
+                foreach ($meta_services as $meta_id => $meta_service) {
                     $stmt->bindValue(':host_name', '_Module_Meta', PDO::PARAM_STR);
-                    $stmt->bindValue(':service_description', '_meta_' . $meta_id, PDO::PARAM_STR);
+                    $stmt->bindValue(':service_description', 'meta_' . $meta_id, PDO::PARAM_STR);
                     $stmt->bindParam(':host_id', $host_id, PDO::PARAM_INT);
-                    $stmt->bindParam(':service_id', $meta_id, PDO::PARAM_INT);
+                    $stmt->bindParam(':service_id', $meta_service['service_id'], PDO::PARAM_INT);
                     $stmt->execute();
                 }
             }

www/class/config-generate/meta_service.class.php

@@ -96,7 +96,7 @@ class MetaService extends AbstractObject {
                 service_id
             FROM service
             WHERE service_register = '2'
-            AND display_name = :meta_name");
+            AND service_description = :meta_name");
         $stmt->bindParam(':meta_name', $meta_name);
         $stmt->execute();
 
@@ -129,7 +129,7 @@ class MetaService extends AbstractObject {
         
     }
     
-    private function getMetaServices() {
+    private function buildCacheMetaServices() {
         $stmt = $this->backend_instance->db->prepare("SELECT 
               $this->attributes_select
             FROM meta_service
@@ -143,7 +143,7 @@ class MetaService extends AbstractObject {
     }
     
     public function generateObjects() {
-        $this->getMetaServices();
+        $this->buildCacheMetaServices();
         if (count($this->meta_services) == 0) {
             return 0;
         }
@@ -175,6 +175,10 @@ class MetaService extends AbstractObject {
         }
     }
 
+    public function getMetaServices() {
+        return $this->meta_services;
+    }
+
     public function hasMetaServices() {
         return $this->has_meta_services;
     }

www/include/configuration/configObject/service/formService.php

@@ -1016,6 +1016,10 @@ if ($o != "mc") {
     }
 }
 
+if (isset($service['service_template_model_stm_id']) && ($service['service_template_model_stm_id'] === '')) {
+    unset($service['service_template_model_stm_id']);
+}
+
 #
 ##End of form definition
 #