Commit 8e44938c by Tobin

Merge branch 'master' into 'dev_production'

daily commit See merge request !3
parents e90ca822 e1d52bec
......@@ -484,4 +484,4 @@ class Issue extends CI_Controller {
return $custData;
}
}
?>
\ No newline at end of file
?>
......@@ -46,7 +46,8 @@ class Mechanic extends CI_Controller {
!is_numeric($mechanic_id = decode_param($_POST['mechanic_id']))){
echo json_encode($resArr);exit;
}
$mechData = $this->Mechanic_model->getMechanic($mechanic_id);
$view_all = (isset($_POST['view_all']) && $_POST['view_all'] == 1)?1:0;
$mechData = $this->Mechanic_model->getMechanic($mechanic_id,$view_all);
if(empty($mechData)){
echo json_encode($resArr);exit;
......
......@@ -197,4 +197,4 @@ class Issue_model extends CI_Model {
}
}
?>
\ No newline at end of file
?>
......@@ -103,7 +103,7 @@ jQuery('[id="viewMechanic"]').on('click',function() {
jQuery.ajax({
url : base_url+"Mechanic/getMechanicData",
type : 'POST',
data : {'mechanic_id':mechanic_id},
data : {'mechanic_id':mechanic_id,'view_all':'1'},
success: function(resp){
if(resp == '' || resp == undefined || resp == 'undefined' || resp == null || resp == 'null'){
remModalLoader();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment