diff options
Diffstat (limited to 'generator/after-bake/src/Controller/EquipementsController.php')
| -rw-r--r-- | generator/after-bake/src/Controller/EquipementsController.php | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/generator/after-bake/src/Controller/EquipementsController.php b/generator/after-bake/src/Controller/EquipementsController.php index a17a724..65260b5 100644 --- a/generator/after-bake/src/Controller/EquipementsController.php +++ b/generator/after-bake/src/Controller/EquipementsController.php @@ -126,15 +126,18 @@ class EquipementsController extends AppController $this->Flash->error(__('At least one Equipement is invalid. None Saved.')); } } - $equipements = $this->Equipements->Equipements->find('list')->order('mac'); + /* + $uplinks = $this->Equipements->find('list'); + $uplinks->order($uplinks->newExpr()->add(['INET_ATON(ipmgmt_id)'])); $services = $this->Equipements->Services->find('list')->order(['service_type_id', 'adherent_id', 'id']); + $relais = $this->Equipements->Relais->find('list'); + */ $ipmgmt = $this->Equipements->Ipmgmt->find('list')->notMatching('Equipements'); $ipmgmt->order($ipmgmt->newExpr()->add(['INET_ATON(ip4)'])); $equipementModeles = $this->Equipements->EquipementModeles->find('list'); $equipementModes = $this->Equipements->EquipementModes->find('list'); - $relais = $this->Equipements->Relais->find('list'); - $this->set(compact('equipement', 'equipements', 'services', 'ipmgmt', 'equipementModeles', 'equipementModes', 'relais')); - //$this->set(compact('entities')); + //$this->set(compact('equipement', 'uplinks', 'services', 'ipmgmt', 'equipementModeles', 'equipementModes', 'relais')); + $this->set(compact('equipement', 'ipmgmt', 'equipementModeles', 'equipementModes')); $this->set('_serialize', ['equipement']); } @@ -159,7 +162,8 @@ class EquipementsController extends AppController $this->Flash->error(__('The equipement could not be saved. Please, try again.')); } } - $equipements = $this->Equipements->Equipements->find('list', array('order' => array('mac' => 'asc'))); + $uplinks = $this->Equipements->find('list'); + $uplinks->order($uplinks->newExpr()->add(['INET_ATON(ipmgmt_id)'])); $services = $this->Equipements->Services->find('list'); // IPmgmt list : own IP + unused IP // XXX Cake bug ->orWhere(['Ipmgmt.ip4' => $equipement->ipmgmt_id]) does a AND WHERE after ->notMatching('Equipements') so forced to use leftJoinWith() @@ -169,7 +173,7 @@ class EquipementsController extends AppController $equipementModeles = $this->Equipements->EquipementModeles->find('list'); $equipementModes = $this->Equipements->EquipementModes->find('list'); $relais = $this->Equipements->Relais->find('list'); - $this->set(compact('equipement', 'equipements', 'services', 'ipmgmt', 'equipementModeles', 'equipementModes', 'relais')); + $this->set(compact('equipement', 'uplinks', 'services', 'ipmgmt', 'equipementModeles', 'equipementModes', 'relais')); $this->set('_serialize', ['equipement']); } } |