From 4b904673a27e033be13b932970eee66ec4cb88f7 Mon Sep 17 00:00:00 2001 From: Karl Cordes Date: Wed, 20 Apr 2011 16:48:29 +1000 Subject: [PATCH] Removed most of the validation on the job model --- controllers/jobs_controller.php | 1 - models/job.php | 6 ++++-- views/jobs/get_editable_row.ctp | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/controllers/jobs_controller.php b/controllers/jobs_controller.php index 297f9ccd..e3ccc822 100755 --- a/controllers/jobs_controller.php +++ b/controllers/jobs_controller.php @@ -300,7 +300,6 @@ class JobsController extends AppController { function ajax_edit() { if(!empty($this->data)) { - //print_r($this->data); if ($this->Job->save($this->data)) { echo "SUCCESS"; } diff --git a/models/job.php b/models/job.php index 4558ca8d..fb67692e 100755 --- a/models/job.php +++ b/models/job.php @@ -2,16 +2,18 @@ class Job extends AppModel { var $name = 'Job'; + + var $validate = array( 'title' => array('notempty'), 'enquiry_id' => array('numeric'), - 'date_order_received' => array('date'), + /* 'date_order_received' => array('date'), 'domestic_freight_paid_by' => array('notempty'), 'sale_category' => array('notempty'), - 'shipment_category' => array('notempty') + 'shipment_category' => array('notempty') */ ); diff --git a/views/jobs/get_editable_row.ctp b/views/jobs/get_editable_row.ctp index 1838647b..d3bd86e5 100644 --- a/views/jobs/get_editable_row.ctp +++ b/views/jobs/get_editable_row.ctp @@ -89,9 +89,9 @@ if(currencyID == 2) {//Export Sale. AUD $('.export_sale_aud').attr("readonly",false); $(".export_sale_aud").addClass("highlighted"); + $(".aust_sale_aud").addClass("highlighted"); $(".aust_sale_fc").attr("readonly",true); - $(".aust_sale_aud").attr("readonly",true); $('.export_sale_fc').attr("readonly",true); }