Merge branch 'dev' into lba_db_tools

This commit is contained in:
Andreas Kristiansen
2025-12-14 11:37:50 +01:00
committed by GitHub
84 changed files with 16044 additions and 14788 deletions

View File

@@ -316,26 +316,15 @@ class Update extends CI_Controller {
private function fix_migrations(){
$res = $this->db->query("SELECT version FROM migrations");
if ($res->num_rows() >0){
$row = $res->row();
$version = $row->version;
$res = $this->db->query("SELECT version FROM migrations");
if ($res->num_rows() >0){
$row = $res->row();
$version = $row->version;
if ($version < 7){
$this->db->query("UPDATE migrations SET version=7");
}
}
}
public function check_missing_grid($all = false){
$this->load->model('user_model');
if (!$this->user_model->authorize(99)) {
$this->session->set_flashdata('error', __("You're not allowed to do that!"));
redirect('dashboard');
if ($version < 7){
$this->db->query("UPDATE migrations SET version=7");
}
}
$this->load->model('logbook_model');
$this->logbook_model->check_missing_grid_id($all);
}
public function update_clublog_scp() {