← All changes | application/models/Location_m.php +60 -0 1.3.0 → 1.5.9 View file →

		@@ -14,13 +14,49 @@
14	14	public $_timestamps = TRUE;
15	15	protected $_primary_filter = 'intval';
16	16	public $form_admin = array();
17	17	public $fields_list = NULL;
	18	+ public $allowedOrderBy = array(
	19	+ 'idlocation',
	20	+ 'parent_id',
	21	+ 'page_id',
	22	+ 'lang_code',
	23	+ 'date',
	24	+ 'parent_path',
	25	+ 'order_index',
	26	+ 'level',
	27	+ 'icon_id',
	28	+ 'image_id',
	29	+ 'font_icon_code',
	30	+ 'code',
	31	+ 'hubspot_id',
	32	+ 'location_title',
	33	+ 'marker_image_id',
	34	+ 'level_0_id',
	35	+ 'icon_path',
	36	+ 'image_path',
	37	+ 'marker_image_path',
	38	+ 'location_color',
	39	+ 'titles_for_search'
	40	+ );
18	41
19	42	public function __construct(){
20	43	parent::__construct();
	44	+
	45	+ // Add allowedOrderBy with table + prefix format
	46	+ $table_prefix = $this->db->prefix . $this->_table_name . '.';
	47	+ $updatedAllowedOrderBy = array();
	48	+ foreach ($this->allowedOrderBy as $col) {
	49	+ $updatedAllowedOrderBy[] = $col;
	50	+ $updatedAllowedOrderBy[] = $table_prefix . $col;
	51	+ }
	52	+ $this->allowedOrderBy = array_unique($updatedAllowedOrderBy);
21	53	}
22	54
	55	+ public function getAllowedOrderBy() {
	56	+ return $this->allowedOrderBy;
	57	+ }
	58	+
23	59	/* [START] For dynamic data table */
24	60
25	61	public function get_available_fields()
26	62	{
		@@ -59,8 +95,32 @@
59	95	('.$this->listing_m->_table_name.'.location_id = '.$this->_table_name.'.idlocation
60	96	OR '.$this->listing_m->_table_name.'.location_id = location_table.idlocation)
61	97
62	98	)', TRUE, 'LEFT');
	99	+
	100	+ $this->db->from($this->_table_name);
	101	+ $this->db->where($where);
	102	+ $this->db->limit($limit);
	103	+ $this->db->offset($offset);
	104	+ $this->db->group_by('idlocation');
	105	+
	106	+ if(!empty($order_by)){
	107	+ $this->db->order_by($order_by);
	108	+ } else {
	109	+ $this->db->order_by($this->_order_by);
	110	+ }
	111	+
	112	+ $query = $this->db->get();
	113	+
	114	+ if ($this->db->num_rows() > 0)
	115	+ return $this->db->results();
	116	+
	117	+ return array();
	118	+ }
	119	+
	120	+ public function get_pagination_simple($limit, $offset, $where = array(), $order_by = NULL)
	121	+ {
	122	+ $this->load->model('listing_m');
63	123
64	124	$this->db->from($this->_table_name);
65	125	$this->db->where($where);
66	126	$this->db->limit($limit);