From 2436cf5da5ee0fc4bec6387bb7a6a17b02e5365a Mon Sep 17 00:00:00 2001 From: jekkos Date: Tue, 8 Mar 2016 08:39:21 +0100 Subject: [PATCH] Fix suggestions for item kits (by name and KIT id) (#328) --- application/controllers/Giftcards.php | 2 +- application/controllers/Item_kits.php | 7 ++----- application/controllers/interfaces/Idata_controller.php | 2 +- application/views/giftcards/manage.php | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/application/controllers/Giftcards.php b/application/controllers/Giftcards.php index f7b06356d..6f6b406d4 100644 --- a/application/controllers/Giftcards.php +++ b/application/controllers/Giftcards.php @@ -39,7 +39,7 @@ class Giftcards extends Secure_area implements iData_controller /* Gives search suggestions based on what is being searched for */ - function suggest() + function suggest_search() { $suggestions = $this->Giftcard->get_search_suggestions($this->input->post('term')); echo json_encode($suggestions); diff --git a/application/controllers/Item_kits.php b/application/controllers/Item_kits.php index 7645058e1..419fada21 100644 --- a/application/controllers/Item_kits.php +++ b/application/controllers/Item_kits.php @@ -68,12 +68,9 @@ class Item_kits extends Secure_area implements iData_controller echo json_encode(array('total_rows' => $total_rows, 'rows' => $data_rows, 'pagination' => $links)); } - /* - Gives search suggestions based on what is being searched for - */ - function suggest() + function suggest_search() { - $suggestions = $this->Item_kit->get_search_suggestions($this->input->post('term'), TRUE); + $suggestions = $this->Item_kit->get_search_suggestions($this->input->post('term')); echo json_encode($suggestions); } diff --git a/application/controllers/interfaces/Idata_controller.php b/application/controllers/interfaces/Idata_controller.php index eba816219..8721e6ed4 100644 --- a/application/controllers/interfaces/Idata_controller.php +++ b/application/controllers/interfaces/Idata_controller.php @@ -7,7 +7,7 @@ interface iData_controller { public function index(); public function search(); - public function suggest(); + public function suggest_search(); public function get_row(); public function view($data_item_id=-1); public function save($data_item_id=-1); diff --git a/application/views/giftcards/manage.php b/application/views/giftcards/manage.php index 1682d94e0..f48983a17 100644 --- a/application/views/giftcards/manage.php +++ b/application/views/giftcards/manage.php @@ -6,7 +6,7 @@ $(document).ready(function() enable_select_all(); enable_checkboxes(); enable_row_selection(); - enable_search({suggest_url: '', + enable_search({suggest_url: '', confirm_message: 'lang->line("common_confirm_search")?>'}); enable_delete('lang->line($controller_name."_confirm_delete")?>','lang->line($controller_name."_none_selected")?>'); });