diff --git a/application/controllers/Welcome.php b/application/controllers/Welcome.php index 4f434086..adefaf27 100644 --- a/application/controllers/Welcome.php +++ b/application/controllers/Welcome.php @@ -31,12 +31,18 @@ class Welcome extends CI_Controller { $this->load->model('note'); $data['NumberOfNotes'] = $this->note->CountAllNotes(); - // load views - $this->load->view('interface_assets/mini_header', $data); - $this->load->view('welcome/index'); - $this->load->view('interface_assets/footer'); + if(!$data['CountAllStationLocations'] && !$data['NumberOfStationLogbooks'] && !$data['NumberOfAPIKeys'] && !$data['NumberOfNotes']) { + // load views + $this->load->view('interface_assets/mini_header', $data); + $this->load->view('welcome/index'); + $this->load->view('interface_assets/footer'); + } else { + $data['NoMigrationRequired'] = false; + $this->optionslib->update('version2_trigger', "true"); + redirect('dashboard'); + } } else { - redirect('login'); + redirect('dashboard'); } } diff --git a/application/libraries/OptionsLib.php b/application/libraries/OptionsLib.php index c595bbb3..a7e8acc3 100644 --- a/application/libraries/OptionsLib.php +++ b/application/libraries/OptionsLib.php @@ -37,6 +37,13 @@ class OptionsLib { } else { $CI->config->set_item('option_'.$item->option_name, $item->option_value); } + + // if version 2 mirgation has not been run then run it + if($item->option_name == "version2_trigger") { + if($item->option_value == "false") { + redirect('welcome'); + } + } } } } diff --git a/application/views/welcome/index.php b/application/views/welcome/index.php index f6b78040..3ec40c0f 100644 --- a/application/views/welcome/index.php +++ b/application/views/welcome/index.php @@ -1,6 +1,3 @@ -config->item('option_version2_trigger'); -?>