diff options
| author | Ludovic Pouzenc <ludovic@pouzenc.fr> | 2016-03-27 00:48:23 +0100 |
|---|---|---|
| committer | Ludovic Pouzenc <ludovic@pouzenc.fr> | 2016-03-27 00:48:23 +0100 |
| commit | 69963b0e6f3d29829641462634479a19f851938d (patch) | |
| tree | d76a28c5d7aaf060797c75efc68a7a09f1487ad9 | |
| parent | ba054ddf34df734463e5ffeb64ea247d8db87d6a (diff) | |
| download | chd_gestion-69963b0e6f3d29829641462634479a19f851938d.zip chd_gestion-69963b0e6f3d29829641462634479a19f851938d.tar.gz chd_gestion-69963b0e6f3d29829641462634479a19f851938d.tar.bz2 | |
Equipements, ipmgmt : key is now ip4, searchable again.
| -rw-r--r-- | generator/after-bake/src/Template/Equipements/index.ctp | 4 | ||||
| -rw-r--r-- | generator/before-bake/config/bake_extra.php | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/generator/after-bake/src/Template/Equipements/index.ctp b/generator/after-bake/src/Template/Equipements/index.ctp index 3d5406c..e6fce69 100644 --- a/generator/after-bake/src/Template/Equipements/index.ctp +++ b/generator/after-bake/src/Template/Equipements/index.ctp @@ -40,8 +40,8 @@ <tr class="filter"> <th colspan="3"> <?= $this->Form->input('q', [ - 'placeholder' => __('Adresse MAC...'), - 'empty' => __('Adresse MAC...') + 'placeholder' => __('Adresse MAC ou IPv4...'), + 'empty' => __('Adresse MAC ou IPv4...') ]) ?> </th> <th colspan="2"> diff --git a/generator/before-bake/config/bake_extra.php b/generator/before-bake/config/bake_extra.php index 5ebc26b..d75cc2e 100644 --- a/generator/before-bake/config/bake_extra.php +++ b/generator/before-bake/config/bake_extra.php @@ -72,10 +72,9 @@ EOT 'mode' => 'like', 'before' => 'true', 'after' => 'true', - //'columns' => ['id', 'ipmgmt.ip4','ipmgmt.ip6', 'mac'], - 'columns' => ['mac'], + 'columns' => ['mac', 'ipmgmt_id'], 'colspan' => 3, - 'hint' => 'Adresse MAC...', + 'hint' => 'Adresse MAC ou IPv4...', ], 'equipement_modele_id' => [ 'mode' => 'value', |