From cfdff966c8c94c038ac9c556daa62c2298d3dbe3 Mon Sep 17 00:00:00 2001
From: Ludovic Pouzenc <ludovic@pouzenc.fr>
Date: Sun, 1 May 2016 18:44:43 +0200
Subject: Equipements : ajout hostname + tri mac uplink_id

---
 generator/after-bake/src/Template/Equipements/index.ctp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'generator/after-bake/src/Template/Equipements/index.ctp')

diff --git a/generator/after-bake/src/Template/Equipements/index.ctp b/generator/after-bake/src/Template/Equipements/index.ctp
index e6fce69..d1a294a 100644
--- a/generator/after-bake/src/Template/Equipements/index.ctp
+++ b/generator/after-bake/src/Template/Equipements/index.ctp
@@ -23,8 +23,6 @@
     <ul class="side-nav">
         <li class="heading"><?= __('Actions') ?></li>
         <li><?= $this->Html->link(__('New Equipement'), ['action' => 'add']) ?></li>
-        <li><?= $this->Html->link(__('List Services'), ['controller' => 'Services', 'action' => 'index']) ?></li>
-        <li><?= $this->Html->link(__('New Service'), ['controller' => 'Services', 'action' => 'add']) ?></li>
         <li><?= $this->Html->link(__('List Ipmgmt'), ['controller' => 'Ipmgmt', 'action' => 'index']) ?></li>
         <li><?= $this->Html->link(__('List Equipement Modeles'), ['controller' => 'EquipementModeles', 'action' => 'index']) ?></li>
         <li><?= $this->Html->link(__('New Equipement Modele'), ['controller' => 'EquipementModeles', 'action' => 'add']) ?></li>
@@ -63,8 +61,8 @@
 			</tr>
             <tr>
                 <th><?= $this->Paginator->sort('mac') ?></th>
+                <th><?= $this->Paginator->sort('hostname') ?></th>
                 <th><?= $this->Paginator->sort('ipmgmt_id') ?></th>
-                <th><?= $this->Paginator->sort('equipement_mode_id') ?></th>
                 <th><?= $this->Paginator->sort('equipement_modele_id') ?></th>
                 <th><?= $this->Paginator->sort('service_id') ?></th>
                 <th><?= $this->Paginator->sort('relais_id') ?></th>
@@ -77,8 +75,8 @@
             <?php foreach ($equipements as $equipement): ?>
             <tr>
                 <td><?= h($equipement->mac) ?></td>
+                <td><?= h($equipement->hostname) ?></td>
                 <td><?= $equipement->has('ipmgmt') ? $this->Html->link($equipement->ipmgmt->title, ['controller' => 'Ipmgmt', 'action' => 'view', $equipement->ipmgmt->id]) : '' ?></td>
-				<td><?= h($equipement->equipement_mode_id) ?></td>
                 <td><?= $equipement->has('equipement_modele') ? $this->Html->link($equipement->equipement_modele->title, ['controller' => 'EquipementModeles', 'action' => 'view', $equipement->equipement_modele->id]) : '' ?></td>
                 <td><?= $equipement->has('service') ? $this->Html->link($equipement->service->title, ['controller' => 'Services', 'action' => 'view', $equipement->service->id]) : '' ?></td>
                 <td><?= $equipement->has('relais') ? $this->Html->link($equipement->relais->title, ['controller' => 'Relais', 'action' => 'view', $equipement->relais->id]) : '' ?></td>
-- 
cgit v1.1