Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed controller

Browse Source
This commit is contained in:
Andreas Kristiansen
2025-07-18 16:57:38 +02:00
parent 09bb91eaf8
commit ee87141f58
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/Oqrs.php
View File

@@ -113,7 +113,7 @@ class Oqrs extends CI_Controller {
if($this->input->post('widget') != 'true') { if($this->input->post('widget') != 'true') {
$this->load->view('oqrs/request_grouped', $data); $this->load->view('oqrs/request_grouped', $data);
} else { } 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['page_title'] = __("Log Search & OQRS");
$data['global_oqrs_text'] = $this->optionslib->get_option('global_oqrs_text'); $data['global_oqrs_text'] = $this->optionslib->get_option('global_oqrs_text');
$data['groupedSearch'] = 'on'; $data['groupedSearch'] = 'on';

9
application/migrations/250_move_oqrs_global_to_user.php
View File

@@ -35,15 +35,6 @@ class Migration_move_oqrs_global_to_user extends CI_Migration {
public function down() 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');");
} }
} }