From dd0222c16ce962855ea408f58918ebb9a16c5bbe Mon Sep 17 00:00:00 2001 From: Karl Cordes Date: Tue, 19 Apr 2011 18:15:26 +1000 Subject: [PATCH] Forgot to put principle TD in view and editable views for jobs list --- controllers/jobs_controller.php | 2 ++ views/jobs/get_editable_row.ctp | 3 ++- views/jobs/get_viewable_row.ctp | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/controllers/jobs_controller.php b/controllers/jobs_controller.php index 12201e64..297f9ccd 100755 --- a/controllers/jobs_controller.php +++ b/controllers/jobs_controller.php @@ -78,6 +78,7 @@ class JobsController extends AppController { $this->set('freight_paid_by_options',$this->freight_paid_options()); $this->set('gst_options', $this->gst_options()); $this->set('job_status_options', $this->job_status_options()); + $this->set('principleList',$this->Job->Enquiry->Principle->find('list')); } @@ -93,6 +94,7 @@ class JobsController extends AppController { $this->set('shipment_category_options', $this->shipment_category_options()); $this->set('freight_paid_by_options',$this->freight_paid_options()); $this->set('gst_options', $this->gst_options()); + $this->set('principleList',$this->Job->Enquiry->Principle->find('list')); } diff --git a/views/jobs/get_editable_row.ctp b/views/jobs/get_editable_row.ctp index 41050985..ab42229c 100644 --- a/views/jobs/get_editable_row.ctp +++ b/views/jobs/get_editable_row.ctp @@ -159,7 +159,8 @@ else { 'type'=>'select','label'=>false,'value'=>$job['Job']['shipment_category']));?> link($job['Job']['title'], array('controller'=>'jobs', 'action'=>'view', $job['Job']['id']));?> -link($job['Enquiry']['title'], array('controller'=>'enquiries','action'=>'view', $job['Enquiry']['id']));?> +link($job['Enquiry']['title'], array('controller'=>'enquiries','action'=>'view', $job['Enquiry']['id']));?> +link($principleList[$job['Enquiry']['principle_id']], '/principles/view/'.$job['Enquiry']['principle_id']);?> link($job['Job']['title'], array('controller'=>'jobs', 'action'=>'view', $job['Job']['id']));?> - link($job['Enquiry']['title'], array('controller'=>'enquiries','action'=>'view', $job['Enquiry']['id']));?> + link($job['Enquiry']['title'], array('controller'=>'enquiries','action'=>'view', $job['Enquiry']['id']));?> + link($principleList[$job['Enquiry']['principle_id']], '/principles/view/'.$job['Enquiry']['principle_id']);?>