diff options
| author | Ludovic Pouzenc <ludovic@pouzenc.fr> | 2016-05-22 12:10:15 +0200 |
|---|---|---|
| committer | Ludovic Pouzenc <ludovic@pouzenc.fr> | 2016-05-22 12:10:15 +0200 |
| commit | d290f73ffaff3ba9117beecceb8ee8f08576d6c0 (patch) | |
| tree | 9481415aef0fde3e29d676d707a2acc1d69e0a6c | |
| parent | cfdff966c8c94c038ac9c556daa62c2298d3dbe3 (diff) | |
| download | chd_gestion-d290f73ffaff3ba9117beecceb8ee8f08576d6c0.zip chd_gestion-d290f73ffaff3ba9117beecceb8ee8f08576d6c0.tar.gz chd_gestion-d290f73ffaff3ba9117beecceb8ee8f08576d6c0.tar.bz2 | |
Filters : L10N, Improove Interesses, fixes about some DB schema changes
| -rw-r--r-- | generator/before-bake/config/bake_extra.php | 28 |
1 files changed, 19 insertions, 9 deletions
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', |