From d290f73ffaff3ba9117beecceb8ee8f08576d6c0 Mon Sep 17 00:00:00 2001
From: Ludovic Pouzenc <ludovic@pouzenc.fr>
Date: Sun, 22 May 2016 12:10:15 +0200
Subject: Filters : L10N, Improove Interesses, fixes about some DB schema
 changes

---
 generator/before-bake/config/bake_extra.php | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

(limited to 'generator')

diff --git a/generator/before-bake/config/bake_extra.php b/generator/before-bake/config/bake_extra.php
index 6b71bb0..49f5023 100644
--- a/generator/before-bake/config/bake_extra.php
+++ b/generator/before-bake/config/bake_extra.php
@@ -25,6 +25,7 @@ return [
 	'AdherentStatuts'		=> [ 'actions' => [ '_empty' ] ],
 	'AdherentTypes'			=> [ 'actions' => [ '_empty' ] ],
 	'Civilites'				=> [ 'actions' => [ '_empty' ] ],
+	'InteresseStatuts'		=> [ 'actions' => [ '_empty' ] ],
 	'Periodicites'			=> [ 'actions' => [ '_empty' ] ],
 	'Secteurs'				=> [ 'actions' => [ '_empty' ] ],
 	'ServiceStatuts'		=> [ 'actions' => [ '_empty' ] ],
@@ -39,7 +40,7 @@ return [
 	'Adherents' => [
 		'title' => [ 
 			'custom_code' => <<<'EOT'
-"CHD" . $this->_properties['id'] . " - " . ( $this->_properties['raison']?($this->_properties['raison'] . " (" . $this->_properties['nom'] . ")" ):($this->_properties['nom'] . " " . $this->_properties['prenom']) )
+				"CHD" . $this->_properties['id'] . " - " . ( $this->_properties['raison']?($this->_properties['raison'] . " (" . $this->_properties['nom'] . ")" ):($this->_properties['nom'] . " " . $this->_properties['prenom']) )
 EOT
 		],
 		'filters' => [ 
@@ -49,7 +50,7 @@ EOT
 				'after' => 'true',
 				'columns' => ['id','nom','nom2','prenom','prenom2','raison','proprio','tel_mobile1','tel_mobile2'],
 				'colspan' => 5,
-				'hint' => 'Rechercher...',
+				'hint' => 'Find...',
 			],
 			'ville_id' => [
 				'mode' => 'value',
@@ -63,8 +64,9 @@ EOT
 	],
 	'Equipements' => [
 		'title' => [ 
-			'glue' => ' ',
-			'pieces' => ['mac'],
+			'custom_code' => <<<'EOT'
+				$this->_properties['ipmgmt_id'] . ( $this->_properties['hostname']?(" (" . $this->_properties['hostname'] . ")"):"")
+EOT
 		],
 		'filters' => [ 
 			'q' => [
@@ -73,7 +75,7 @@ EOT
 				'after' => 'true',
 				'columns' => ['mac', 'ipmgmt_id', 'hostname'],
 				'colspan' => 3,
-				'hint' => 'MAC, IPv4, Nom...',
+				'hint' => 'MAC, IPv4, Hostname...',
 			],
 			'equipement_modele_id' => [
 				'mode' => 'value',
@@ -134,16 +136,24 @@ EOT
 				'before' => 'true',
 				'after' => 'true',
                 'columns' => ['nom', 'prenom', 'date_demande', 'raison'],
-                'colspan' => 2,
-                'hint' => 'Rechercher...',
+                'colspan' => 5,
+                'hint' => 'Find...',
             ],
+			'interesse_statut_id' => [
+				'mode' => 'value',
+				'before' => 'false',
+				'after' => 'false',
+				'model' => 'InteresseStatuts',
+				'colspan' => 2,
+				'hint' => 'Interesse Statut',
+			],
         ],
     ],
 	'Ipmgmt'				=> [
 		'actions' => [ 'index', 'view', 'add' ],
 		'title' => [ 
 			'glue' => ' ',
-			'pieces' => ['ip4', 'ip6'],
+			'pieces' => ['ip4'],
 		],
 	],
 	'Ippubliques' => [
@@ -159,7 +169,7 @@ EOT
 				'after' => 'false',
 				'columns' => ['ip4','ip6'],
 				'colspan' => 2,
-				'hint' => 'Rechercher...',
+				'hint' => 'Find...',
 			],
 			'secteur_id' => [
 				'mode' => 'value',
-- 
cgit v1.1