springup/cmc-sales
2
0
Fork 0
Code Issues 48 Pull requests Actions Packages Projects Releases Wiki Activity

Forgot to put principle TD in view and editable views for jobs list

Browse source
This commit is contained in:
Karl Cordes 2011-04-19 18:15:26 +10:00
parent 9af9ff7fba
commit dd0222c16c
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
controllers/jobs_controller.php
View file

@ -78,6 +78,7 @@ class JobsController extends AppController {
$this->set('freight_paid_by_options',$this->freight_paid_options()); $this->set('freight_paid_by_options',$this->freight_paid_options());
$this->set('gst_options', $this->gst_options()); $this->set('gst_options', $this->gst_options());
$this->set('job_status_options', $this->job_status_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('shipment_category_options', $this->shipment_category_options());
$this->set('freight_paid_by_options',$this->freight_paid_options()); $this->set('freight_paid_by_options',$this->freight_paid_options());
$this->set('gst_options', $this->gst_options()); $this->set('gst_options', $this->gst_options());
$this->set('principleList',$this->Job->Enquiry->Principle->find('list'));
} }

3
views/jobs/get_editable_row.ctp
View file

@ -159,7 +159,8 @@ else {
'type'=>'select','label'=>false,'value'=>$job['Job']['shipment_category']));?> 'type'=>'select','label'=>false,'value'=>$job['Job']['shipment_category']));?>
</td> </td>
<td><?=$html->link($job['Job']['title'], array('controller'=>'jobs', 'action'=>'view', $job['Job']['id']));?></td> <td><?=$html->link($job['Job']['title'], array('controller'=>'jobs', 'action'=>'view', $job['Job']['id']));?></td>
<td><?=$html->link($job['Enquiry']['title'], array('controller'=>'enquiries','action'=>'view', $job['Enquiry']['id']));?> <td><?=$html->link($job['Enquiry']['title'], array('controller'=>'enquiries','action'=>'view', $job['Enquiry']['id']));?></td>
<td><?=$html->link($principleList[$job['Enquiry']['principle_id']], '/principles/view/'.$job['Enquiry']['principle_id']);?></td>
<td><? <td><?
$poString = ''; $poString = '';
foreach($job['PurchaseOrder'] as $po) { foreach($job['PurchaseOrder'] as $po) {

3
views/jobs/get_viewable_row.ctp
View file

@ -18,7 +18,8 @@
<?=$job['Job']['job_type'];?></td> <?=$job['Job']['job_type'];?></td>
<td><?=$shipment_category_options[$job['Job']['shipment_category']];?></td> <td><?=$shipment_category_options[$job['Job']['shipment_category']];?></td>
<td class="nowrap"><?=$html->link($job['Job']['title'], array('controller'=>'jobs', 'action'=>'view', $job['Job']['id']));?></td> <td class="nowrap"><?=$html->link($job['Job']['title'], array('controller'=>'jobs', 'action'=>'view', $job['Job']['id']));?></td>
<td class="nowrap"><?=$html->link($job['Enquiry']['title'], array('controller'=>'enquiries','action'=>'view', $job['Enquiry']['id']));?> <td class="nowrap"><?=$html->link($job['Enquiry']['title'], array('controller'=>'enquiries','action'=>'view', $job['Enquiry']['id']));?></td>
<td><?=$html->link($principleList[$job['Enquiry']['principle_id']], '/principles/view/'.$job['Enquiry']['principle_id']);?></td>
<td><? <td><?
$poString = ''; $poString = '';
foreach($job['PurchaseOrder'] as $po) { foreach($job['PurchaseOrder'] as $po) {