From fcdc5355cdab621670d189e5402235324ceb52c9 Mon Sep 17 00:00:00 2001 From: Karl Cordes Date: Tue, 18 Mar 2025 20:41:00 +1100 Subject: [PATCH] Fix changing enquiry status on principle view page --- app/controllers/principles_controller.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app/controllers/principles_controller.php b/app/controllers/principles_controller.php index 33d37546..bf8ab420 100755 --- a/app/controllers/principles_controller.php +++ b/app/controllers/principles_controller.php @@ -13,6 +13,7 @@ class PrinciplesController extends AppController { $this->Principle->recursive = 0; $this->set('principles', $this->paginate()); $this->set('enquiries', $this->paginate()); + } function view($id = null) { @@ -24,14 +25,14 @@ class PrinciplesController extends AppController { $this->set('enquiries', $this->paginate('Enquiry', array('Enquiry.principle_id' => $id))); $this->set('addresses', $this->Principle->PrincipleAddress->findAllByPrincipleId($id)); $this->set('principleContacts', $this->Principle->PrincipleContact->find('all', array('conditions'=>array('PrincipleContact.principle_id'=>$id)))); - $statuses = $this->Principle->Enquiry->Status->find('all'); - $status_list = array(); - foreach ($statuses as $status) { - $status_list[] = array($status['Status']['id'], $status['Status']['name']); - } - $this->set('status_list', $status_list); - $this->set('enquiries', $this->paginate('Enquiry', array('Enquiry.principle_id' => $id))); + $status_list = $this->Principle->Enquiry->Status->getJSON(); + $this->set('status_list', $status_list); + + $classNames = $this->Principle->Enquiry->Status->getClassNamesJSON(); + $this->set('class_names', $classNames); + + $this->set('enquiries', $this->paginate('Enquiry', array('Enquiry.principle_id' => $id))); } function add() {