diff --git a/application/controllers/Oqrs.php b/application/controllers/Oqrs.php index 41ac2c5d6..802948b64 100644 --- a/application/controllers/Oqrs.php +++ b/application/controllers/Oqrs.php @@ -113,7 +113,7 @@ class Oqrs extends CI_Controller { if($this->input->post('widget') != 'true') { $this->load->view('oqrs/request_grouped', $data); } else { - $data['stations'] = $this->oqrs_model->get_oqrs_stations($userid); + $data['stations'] = $this->oqrs_model->get_oqrs_stations($userid)->result(); $data['page_title'] = __("Log Search & OQRS"); $data['global_oqrs_text'] = $this->optionslib->get_option('global_oqrs_text'); $data['groupedSearch'] = 'on'; diff --git a/application/migrations/250_move_oqrs_global_to_user.php b/application/migrations/250_move_oqrs_global_to_user.php index 7776c6e7b..65767fecc 100644 --- a/application/migrations/250_move_oqrs_global_to_user.php +++ b/application/migrations/250_move_oqrs_global_to_user.php @@ -35,15 +35,6 @@ class Migration_move_oqrs_global_to_user extends CI_Migration { public function down() { - // $this->db->query("insert into options (option_name, option_value) - // select option_name, option_value from user_options where option_type = 'oqrs' and option_name = 'global_oqrs_text';"); - // $this->db->query("insert into options (option_name, option_value) - // select 'groupedSearch', option_value from user_options where option_type = 'oqrs' and option_name = 'oqrs_grouped_search';"); - - // $this->db->query("insert into options (option_name, option_value) - // select 'groupedSearchShowStationName', option_value from user_options where option_type = 'oqrs' and option_name = 'oqrs_grouped_search_show_station_name';"); - - $this->db->query("delete from user_options where option_type = 'oqrs' and option_name in ('global_oqrs_text', 'oqrs_grouped_search', 'oqrs_grouped_search_show_station_name');"); } }