summaryrefslogtreecommitdiff
path: root/generator/after-bake/src/Template
diff options
context:
space:
mode:
authorLudovic Pouzenc <ludovic@pouzenc.fr>2016-05-01 18:44:43 +0200
committerLudovic Pouzenc <ludovic@pouzenc.fr>2016-05-01 18:44:43 +0200
commitcfdff966c8c94c038ac9c556daa62c2298d3dbe3 (patch)
tree0797a184cee4281151630645a1bb1d2a13d652a0 /generator/after-bake/src/Template
parent31cc4b4268525f34bd3be0d679180133e9545301 (diff)
downloadchd_gestion-cfdff966c8c94c038ac9c556daa62c2298d3dbe3.zip
chd_gestion-cfdff966c8c94c038ac9c556daa62c2298d3dbe3.tar.gz
chd_gestion-cfdff966c8c94c038ac9c556daa62c2298d3dbe3.tar.bz2
Equipements : ajout hostname + tri mac uplink_id
Diffstat (limited to 'generator/after-bake/src/Template')
-rw-r--r--generator/after-bake/src/Template/Equipements/index.ctp6
-rw-r--r--generator/after-bake/src/Template/Equipements/view.ctp10
2 files changed, 7 insertions, 9 deletions
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>
diff --git a/generator/after-bake/src/Template/Equipements/view.ctp b/generator/after-bake/src/Template/Equipements/view.ctp
index 99d6542..9a0f167 100644
--- a/generator/after-bake/src/Template/Equipements/view.ctp
+++ b/generator/after-bake/src/Template/Equipements/view.ctp
@@ -31,22 +31,22 @@
<li><?= $this->Html->link(__('New Equipement Modele'), ['controller' => 'EquipementModeles', 'action' => 'add']) ?> </li>
<li><?= $this->Html->link(__('List Relais'), ['controller' => 'Relais', 'action' => 'index']) ?> </li>
<li><?= $this->Html->link(__('New Relais'), ['controller' => 'Relais', '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 Equipements'), ['controller' => 'Equipements', 'action' => 'index']) ?> </li>
- <li><?= $this->Html->link(__('New Equipement'), ['controller' => 'Equipements', 'action' => 'add']) ?> </li>
<li><?= $this->Html->link(__('List Equipement Modes'), ['controller' => 'EquipementModes', 'action' => 'index']) ?> </li>
<li><?= $this->Html->link(__('New Equipement Mode'), ['controller' => 'EquipementModes', 'action' => 'add']) ?> </li>
</ul>
</nav>
<div class="equipements view large-10 medium-9 columns content">
- <h3><?= h($equipement->id) ?></h3>
+ <h3><?= h($equipement->title) ?></h3>
<table class="vertical-table">
<tr>
<th><?= __('Mac') ?></th>
<td><?= h($equipement->mac) ?></td>
</tr>
<tr>
+ <th><?= __('Hostname') ?></th>
+ <td><?= h($equipement->hostname) ?></td>
+ </tr>
+ <tr>
<th><?= __('Ipmgmt') ?></th>
<td><?= $equipement->has('ipmgmt') ? $this->Html->link($equipement->ipmgmt->title, ['controller' => 'Ipmgmt', 'action' => 'view', $equipement->ipmgmt->id]) : '' ?></td>
</tr>