Merge branch 'master' into 'dev_production'

application/controllers/OrganizerServices.php

@@ -464,7 +464,7 @@ class OrganizerServices extends CI_Controller {
 
   public function getOrganizerCityList(){
     $data = (array)json_decode(file_get_contents('php://input'));
-    $res = $this->Organizer_model->getOrganizerCityList($data,0);
+    $res = $this->Organizer_model->getOrganizerCityList($data);
     if($res['status'] != 0){
       $this->response($res['data']);
     }else{
@@ -484,7 +484,7 @@ class OrganizerServices extends CI_Controller {
 
   public function editOrganizerCityDetails(){
     $data = $_POST;
-    $res = $this->Organizer_model->editOrganizerCityDetails($data,0);
+    $res = $this->Organizer_model->editOrganizerCityDetails($data);
     if($res['status'] != 0){
       $this->successResponse($res);
     }else{
@@ -494,7 +494,7 @@ class OrganizerServices extends CI_Controller {
 
   public function addCity(){
     $data = $_POST;
-    $res = $this->Organizer_model->addCity($data,0);
+    $res = $this->Organizer_model->addCity($data);
     if($res['status'] != 0){
       $this->successResponse($res);
     }else{

application/models/Organizer_model.php

@@ -1256,7 +1256,7 @@ class Organizer_model extends CI_Model {
  		return $res;
  	}
 
- 	public function getOrganizerCityList(){
+ 	public function getOrganizerCityList($data){
  		$res = array('status'=>0,'message'=>'Ohh No!! Something Went South','code'=>'ER06');	
  		try{
  			$count = $this->db->get_where('region')->num_rows();

application/models/Validation_organizer_model.php

@@ -522,12 +522,6 @@ class Validation_organizer_model extends CI_Model {
 					'message' => 'Organizer Id is null or empty'
 				)
 			),
-			'page' => array(
-				'required' => array(
-					'code' => 'ER04',
-					'message' => 'Page is null or empty'
-				)
-			),
 		),
 		'addHostCategory'=>array(
 			'organiser_id' => array(
@@ -584,12 +578,6 @@ class Validation_organizer_model extends CI_Model {
 					'message' => 'Organizer Id is null or empty'
 				)
 			),
-			'page' => array(
-				'required' => array(
-					'code' => 'ER04',
-					'message' => 'Page is null or empty'
-				)
-			)
 		),
 		'getCityDetails'=>array(
 			'organiser_id' => array(
@@ -674,12 +662,6 @@ class Validation_organizer_model extends CI_Model {
 					'message' => 'Organizer Id is null or empty'
 				)
 			),
-			'page' => array(
-				'required' => array(
-					'code' => 'ER04',
-					'message' => 'Page is null or empty'
-				)
-			)
 		),
 		'getOrganizerCategoryDetails'=>array(
 			'organiser_id' => array(