diff options
| author | Anton Tananaev <anton@traccar.org> | 2024-05-09 07:28:07 -0700 |
|---|---|---|
| committer | Anton Tananaev <anton@traccar.org> | 2024-05-09 07:28:07 -0700 |
| commit | 7d4fabd576068cc968085bdfbd8e91035242a487 (patch) | |
| tree | 97d3eb7483c9c5d36f573cbf96bbce29dc896b21 | |
| parent | ee026cdce3e8191cba2628cd7245de3dd6e2b3e5 (diff) | |
| download | trackermap-server-7d4fabd576068cc968085bdfbd8e91035242a487.tar.gz trackermap-server-7d4fabd576068cc968085bdfbd8e91035242a487.tar.bz2 trackermap-server-7d4fabd576068cc968085bdfbd8e91035242a487.zip | |
Remove unused time configuration
| -rw-r--r-- | schema/changelog-6.2.xml | 16 | ||||
| -rw-r--r-- | schema/changelog-master.xml | 2 | ||||
| -rw-r--r-- | src/main/java/org/traccar/model/Server.java | 12 | ||||
| -rw-r--r-- | src/main/java/org/traccar/model/User.java | 12 |
4 files changed, 20 insertions, 22 deletions
diff --git a/schema/changelog-6.2.xml b/schema/changelog-6.2.xml new file mode 100644 index 000000000..471987d12 --- /dev/null +++ b/schema/changelog-6.2.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<databaseChangeLog + xmlns="http://www.liquibase.org/xml/ns/dbchangelog" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog + http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd" + logicalFilePath="changelog-6.2"> + + <changeSet author="author" id="changelog-6.2"> + + <dropColumn tableName="tc_servers" columnName="twelvehourformat" /> + <dropColumn tableName="tc_users" columnName="twelvehourformat" /> + + </changeSet> + +</databaseChangeLog> diff --git a/schema/changelog-master.xml b/schema/changelog-master.xml index 559d90923..e9ae52569 100644 --- a/schema/changelog-master.xml +++ b/schema/changelog-master.xml @@ -43,4 +43,6 @@ <include file="changelog-5.10.xml" relativeToChangelogFile="true" /> <include file="changelog-5.11.xml" relativeToChangelogFile="true" /> + <include file="changelog-6.2.xml" relativeToChangelogFile="true" /> + </databaseChangeLog> diff --git a/src/main/java/org/traccar/model/Server.java b/src/main/java/org/traccar/model/Server.java index 6442186b6..b29fe27cc 100644 --- a/src/main/java/org/traccar/model/Server.java +++ b/src/main/java/org/traccar/model/Server.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2023 Anton Tananaev (anton@traccar.org) + * Copyright 2015 - 2024 Anton Tananaev (anton@traccar.org) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -126,16 +126,6 @@ public class Server extends ExtendedModel implements UserRestrictions { this.zoom = zoom; } - private boolean twelveHourFormat; - - public boolean getTwelveHourFormat() { - return twelveHourFormat; - } - - public void setTwelveHourFormat(boolean twelveHourFormat) { - this.twelveHourFormat = twelveHourFormat; - } - private boolean forceSettings; public boolean getForceSettings() { diff --git a/src/main/java/org/traccar/model/User.java b/src/main/java/org/traccar/model/User.java index 8cfee0f48..9b8ee3e53 100644 --- a/src/main/java/org/traccar/model/User.java +++ b/src/main/java/org/traccar/model/User.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 - 2022 Anton Tananaev (anton@traccar.org) + * Copyright 2013 - 2024 Anton Tananaev (anton@traccar.org) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -133,16 +133,6 @@ public class User extends ExtendedModel implements UserRestrictions, Disableable this.zoom = zoom; } - private boolean twelveHourFormat; - - public boolean getTwelveHourFormat() { - return twelveHourFormat; - } - - public void setTwelveHourFormat(boolean twelveHourFormat) { - this.twelveHourFormat = twelveHourFormat; - } - private String coordinateFormat; public String getCoordinateFormat() { |