Skip to content

T
TimeOutAdmin
Commit 5febebfd by Tobin
Options

Merge branch 'master' into 'uat_staging'

Master See merge request !148
parents edf07537 edfb145e
Showing with 3 additions and 1 deletion
application/models/Webservice_model.php
...@@ -1700,6 +1700,7 @@ class Webservice_model extends CI_Model { ...@@ -1700,6 +1700,7 @@ class Webservice_model extends CI_Model {
ORDER BY EVT.event_id DESC ORDER BY EVT.event_id DESC
LIMIT $limit"; LIMIT $limit";
$resp = array();
$result = $this->db->query($sql)->result(); $result = $this->db->query($sql)->result();
foreach ($result AS $key => $rs) { foreach ($result AS $key => $rs) {
if(!empty($dates = explode(',',$rs->date_time)) && count($dates) > 0){ if(!empty($dates = explode(',',$rs->date_time)) && count($dates) > 0){
...@@ -1718,8 +1719,9 @@ class Webservice_model extends CI_Model { ...@@ -1718,8 +1719,9 @@ class Webservice_model extends CI_Model {
unset($result[$key]); unset($result[$key]);
} }
unset($result[$key]->date_time); unset($result[$key]->date_time);
$resp[] = $result[$key];
} }
$res = array('status'=>1,'data'=>array('events'=>$result,'meta'=>$meta)); $res = array('status'=>1,'data'=>array('events'=>$resp,'meta'=>$meta));
} else { } else {
$res = array('status'=>1,'data'=>array('events'=>[],'meta'=>$meta)); $res = array('status'=>1,'data'=>array('events'=>[],'meta'=>$meta));
} }
......
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