Merge pull request #558 from it-novum/ITC-1110

[*] add main container and shared container info in host browser devi…
it-novum · May 3, 2017 · f064256 · f064256
2 parents ddaca2f + e778560
commit f064256
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/app/Controller/HostsController.php b/app/Controller/HostsController.php
@@ -2455,20 +2455,35 @@ function browser($id = null) {
 
         $servicestatus = $this->Servicestatus->byUuid(Hash::extract($services, '{n}.Service.uuid'));
         $username = $this->Auth->user('full_name');
+
+        $mainContainer = $this->Tree->treePath($host['Host']['container_id'], ['delimiter'=> '/']);
+        //get the already shared containers
+        if (is_array($host['Container']) && !empty($host['Container'])) {
+            foreach ($host['Container'] as $container){
+                if($container != $host['Host']['container_id']){
+                    $sharedContainers[] = $this->Tree->treePath($container, ['delimiter'=> '/']);
+                }
+            }
+        } else {
+            $sharedContainers = [];
+        }
+
+
         $this->set(compact([
                 'host',
                 'hoststatus',
                 'servicestatus',
                 'services',
                 'username',
-                'path',
                 'commandarguments',
                 'acknowledged',
                 'docuExists',
                 'ContactsInherited',
                 'parenthosts',
                 'allowEdit',
                 'ticketSystem',
+                'mainContainer',
+                'sharedContainers',
             ])
         );
 

diff --git a/app/View/Hosts/browser.ctp b/app/View/Hosts/browser.ctp
@@ -318,6 +318,12 @@
 
                         </div>
                         <div id="tab2" class="tab-pane fade">
+                            <strong><?php echo __('Container') ?>:</strong>
+                            <?php echo h($mainContainer); ?>
+                            <br/>
+                            <strong><?php echo __('Shared containers') ?>:</strong>
+                            <?php echo empty($sharedContainers) ? '-' : h(implode( ', ', $sharedContainers));?>
+                            <br/>
                             <strong><?php echo __('Check period') ?>
                                 :</strong> <?php echo h($host['CheckPeriod']['name']); ?><br/>
                             <strong><?php echo __('Check interval') ?>:</strong>