From 05a327beadfdb779bdec5a55e4f5985669825314 Mon Sep 17 00:00:00 2001
From: Andreas <andreask@online.no>
Date: Tue, 15 Sep 2020 11:16:47 +0200
Subject: [PATCH] Selects measurement_base from config-file when creating a new
 user.

---
 application/controllers/User.php | 1 +
 application/views/user/add.php   | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/application/controllers/User.php b/application/controllers/User.php
index b6b7515bc..752b9cab9 100644
--- a/application/controllers/User.php
+++ b/application/controllers/User.php
@@ -39,6 +39,7 @@ class User extends CI_Controller {
 		if ($this->form_validation->run() == FALSE)
 		{
 			$data['page_title'] = "Add User";
+            $data['measurement_base'] = $this->config->item('measurement_base');
 
 			$this->load->view('interface_assets/header', $data);
 			if($this->input->post('user_name'))
diff --git a/application/views/user/add.php b/application/views/user/add.php
index 6e83a4cd9..3013d189a 100644
--- a/application/views/user/add.php
+++ b/application/views/user/add.php
@@ -85,9 +85,9 @@
         <div class="form-group">
             <label for="user_measurement_base">Measurement preference</label>
             <select class="custom-select" id="user_measurement_base" name="user_measurement_base" required>
-                <option value='K' selected='selected'>Kilometers</option>
-                <option value='M'>Miles</option>
-                <option value='N'>Nautical miles</option>
+                <option value='K' <?php if($measurement_base == "K") { echo "selected=\"selected\""; } ?>>Kilometers</option>
+                <option value='M' <?php if($measurement_base == "M") { echo "selected=\"selected\""; } ?>>Miles</option>
+                <option value='N' <?php if($measurement_base == "N") { echo "selected=\"selected\""; } ?>>Nautical miles</option>
             </select>
             <small id="user_measurement_base_Help" class="form-text text-muted">Choose which unit distances will be shown in.</small>
         </div>