Skip to content

T
TimeOutAdmin
Commit 6d748bbf by Jansa Jose
Options

Merge branch 'master' into 'dev_production'

chnages in category list city list See merge request !263
parents 0eda0533 ebb0a869
Showing with 4 additions and 4 deletions
application/models/Organizer_model.php
...@@ -1259,14 +1259,14 @@ class Organizer_model extends CI_Model { ...@@ -1259,14 +1259,14 @@ class Organizer_model extends CI_Model {
public function getOrganizerCityList($data){ public function getOrganizerCityList($data){
$res = array('status'=>0,'message'=>'Ohh No!! Something Went South','code'=>'ER06'); $res = array('status'=>0,'message'=>'Ohh No!! Something Went South','code'=>'ER06');
try{ try{
$count = $this->db->get_where('region')->num_rows(); $count = $this->db->get_where('region',array('status !='=>2))->num_rows();
if($count > 0){ if($count > 0){
$perPage = 10; $perPage = 10;
$page = (isset($data['page']))?$data['page']:1; $page = (isset($data['page']))?$data['page']:1;
$limit = ($page - 1) * $perPage; $limit = ($page - 1) * $perPage;
$meta = array('total_pages'=>ceil($count/$perPage),'total'=>$count, $meta = array('total_pages'=>ceil($count/$perPage),'total'=>$count,
'current_page'=>$page,'per_page'=>$perPage); 'current_page'=>$page,'per_page'=>$perPage);
$sql = $this->db->query("SELECT * FROM region LIMIT $limit,$perPage"); $sql = $this->db->query("SELECT * FROM region WHERE status !='2' LIMIT $limit,$perPage");
if(empty($sql) || empty($regionData = $sql->result_array())){ if(empty($sql) || empty($regionData = $sql->result_array())){
return $res; exit; return $res; exit;
} }
...@@ -1397,14 +1397,14 @@ class Organizer_model extends CI_Model { ...@@ -1397,14 +1397,14 @@ class Organizer_model extends CI_Model {
public function getOrganizerCategoryList($data){ public function getOrganizerCategoryList($data){
$res = array('status'=>0,'message'=>'Ohh No!! Something Went South','code'=>'ER06'); $res = array('status'=>0,'message'=>'Ohh No!! Something Went South','code'=>'ER06');
try{ try{
$count = $this->db->query("SELECT * FROM event_category ORDER BY priority")->num_rows(); $count = $this->db->query("SELECT * FROM event_category WHERE status != '2' ORDER BY priority")->num_rows();
if($count > 0){ if($count > 0){
$perPage = 10; $perPage = 10;
$page = (isset($data['page']))?$data['page']:1; $page = (isset($data['page']))?$data['page']:1;
$limit = ($page - 1) * $perPage; $limit = ($page - 1) * $perPage;
$meta = array('total_pages'=>ceil($count/$perPage),'total'=>$count, $meta = array('total_pages'=>ceil($count/$perPage),'total'=>$count,
'current_page'=>$page,'per_page'=>$perPage); 'current_page'=>$page,'per_page'=>$perPage);
$sql = $this->db->query("SELECT * FROM event_category ORDER BY priority LIMIT $limit,$perPage"); $sql = $this->db->query("SELECT * FROM event_category WHERE status != '2' ORDER BY priority LIMIT $limit,$perPage");
if(empty($sql) || empty($categoryData = $sql->result_array())){ if(empty($sql) || empty($categoryData = $sql->result_array())){
return $res; exit; return $res; exit;
} }
......
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