From c39342398677923c9fae7b1b86bb11914eafb847 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sat, 8 Oct 2016 16:04:44 +1300
Subject: Add flag to force server settings

---
 schema/changelog-3.8.xml          |  6 ++++++
 src/org/traccar/model/Server.java | 10 ++++++++++
 2 files changed, 16 insertions(+)

diff --git a/schema/changelog-3.8.xml b/schema/changelog-3.8.xml
index 1008b9b77..e7aa1ad58 100644
--- a/schema/changelog-3.8.xml
+++ b/schema/changelog-3.8.xml
@@ -68,5 +68,11 @@
 
     <modifyDataType tableName="server" columnName="mapurl" newDataType="VARCHAR(512)" />
 
+    <addColumn tableName="server">
+      <column name="forcesettings" type="BOOLEAN" defaultValueBoolean="false">
+        <constraints nullable="false" />
+      </column>
+    </addColumn>
+
   </changeSet>
 </databaseChangeLog>
diff --git a/src/org/traccar/model/Server.java b/src/org/traccar/model/Server.java
index b1557bf8f..0cd23865f 100644
--- a/src/org/traccar/model/Server.java
+++ b/src/org/traccar/model/Server.java
@@ -127,4 +127,14 @@ public class Server extends Extensible {
         this.twelveHourFormat = twelveHourFormat;
     }
 
+    private boolean forceSettings;
+
+    public boolean getForceSettings() {
+        return forceSettings;
+    }
+
+    public void setForceSettings(boolean forceSettings) {
+        this.forceSettings = forceSettings;
+    }
+
 }
-- 
cgit v1.2.3