From 69963b0e6f3d29829641462634479a19f851938d Mon Sep 17 00:00:00 2001 From: Ludovic Pouzenc Date: Sun, 27 Mar 2016 00:48:23 +0100 Subject: Equipements, ipmgmt : key is now ip4, searchable again. --- generator/after-bake/src/Template/Equipements/index.ctp | 4 ++-- generator/before-bake/config/bake_extra.php | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'generator') 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 @@ Form->input('q', [ - 'placeholder' => __('Adresse MAC...'), - 'empty' => __('Adresse MAC...') + 'placeholder' => __('Adresse MAC ou IPv4...'), + 'empty' => __('Adresse MAC ou IPv4...') ]) ?> 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', -- cgit v1.1