From 3f724f66ce8bad28efe4111087a3825f65977265 Mon Sep 17 00:00:00 2001 From: Mark Friedrich Date: Wed, 2 Oct 2019 19:09:13 +0200 Subject: [PATCH] - New map option for disabling "Abyss" jump tracking, closed #722 --- app/main/controller/api/map.php | 18 +++++++++++++ app/main/model/pathfinder/mapmodel.php | 7 +++++ js/app/ui/dialog/map_settings.js | 8 ++++++ .../js/v1.5.4/app/ui/dialog/map_settings.js | 8 ++++++ public/templates/dialog/map.html | 27 +++++++++++++------ 5 files changed, 60 insertions(+), 8 deletions(-) diff --git a/app/main/controller/api/map.php b/app/main/controller/api/map.php index 850d58e8..2758db2f 100644 --- a/app/main/controller/api/map.php +++ b/app/main/controller/api/map.php @@ -1068,6 +1068,24 @@ class Map extends Controller\AccessController { break; } + // check for "abyss" systems ===================================================================== + if(!$map->trackAbyssalJumps){ + if( + $sourceSystem->isAbyss() || + $targetSystem->isAbyss() + ){ + $addConnection = false; + + if($sourceSystem->isAbyss()){ + $addSourceSystem = false; + } + + if($targetSystem->isAbyss()){ + $addTargetSystem = false; + } + } + } + // save source system ============================================================================= if( $addSourceSystem && diff --git a/app/main/model/pathfinder/mapmodel.php b/app/main/model/pathfinder/mapmodel.php index a76b3d5a..24aef847 100644 --- a/app/main/model/pathfinder/mapmodel.php +++ b/app/main/model/pathfinder/mapmodel.php @@ -98,6 +98,12 @@ class MapModel extends AbstractMapTrackingModel { 'default' => 1, 'activity-log' => true ], + 'trackAbyssalJumps' => [ + 'type' => Schema::DT_BOOL, + 'nullable' => false, + 'default' => 1, + 'activity-log' => true + ], 'logActivity' => [ 'type' => Schema::DT_BOOL, 'nullable' => false, @@ -223,6 +229,7 @@ class MapModel extends AbstractMapTrackingModel { $mapData->deleteEolConnections = $this->deleteEolConnections; $mapData->persistentAliases = $this->persistentAliases; $mapData->persistentSignatures = $this->persistentSignatures; + $mapData->trackAbyssalJumps = $this->trackAbyssalJumps; // map scope $mapData->scope = (object) []; diff --git a/js/app/ui/dialog/map_settings.js b/js/app/ui/dialog/map_settings.js index 4e628d5c..56389ea0 100644 --- a/js/app/ui/dialog/map_settings.js +++ b/js/app/ui/dialog/map_settings.js @@ -36,6 +36,7 @@ define([ deleteEolConnectionsId: 'pf-map-dialog-delete-connections-eol', // id for "deleteEOLConnections" checkbox persistentAliasesId: 'pf-map-dialog-persistent-aliases', // id for "persistentAliases" checkbox persistentSignaturesId: 'pf-map-dialog-persistent-signatures', // id for "persistentSignatures" checkbox + trackAbyssalJumpsId: 'pf-map-dialog-track-abyss-jumps', // id for "trackAbyssalJumps" checkbox logHistoryId: 'pf-map-dialog-history', // id for "history logging" checkbox logActivityId: 'pf-map-dialog-activity', // id for "activity" checkbox @@ -159,6 +160,7 @@ define([ let deleteEolConnections = true; let persistentAliases = true; let persistentSignatures = true; + let trackAbyssalJumps = true; let logActivity = true; let logHistory = true; @@ -197,6 +199,7 @@ define([ deleteEolConnections = mapData.config.deleteEolConnections; persistentAliases = mapData.config.persistentAliases; persistentSignatures = mapData.config.persistentSignatures; + trackAbyssalJumps = mapData.config.trackAbyssalJumps; logActivity = mapData.config.logging.activity; logHistory = mapData.config.logging.history; @@ -255,10 +258,12 @@ define([ deleteEolConnectionsId : config.deleteEolConnectionsId, persistentAliasesId : config.persistentAliasesId, persistentSignaturesId : config.persistentSignaturesId, + trackAbyssalJumpsId : config.trackAbyssalJumpsId, deleteExpiredConnections: deleteExpiredConnections, deleteEolConnections: deleteEolConnections, persistentAliases: persistentAliases, persistentSignatures: persistentSignatures, + trackAbyssalJumps: trackAbyssalJumps, logHistoryId: config.logHistoryId, logActivityId: config.logActivityId, @@ -398,6 +403,9 @@ define([ if( form.find('#' + config.persistentSignaturesId).length ){ formData.persistentSignatures = formData.hasOwnProperty('persistentSignatures') ? parseInt( formData.persistentSignatures ) : 0; } + if( form.find('#' + config.trackAbyssalJumpsId).length ){ + formData.trackAbyssalJumps = formData.hasOwnProperty('trackAbyssalJumps') ? parseInt( formData.trackAbyssalJumps ) : 0; + } if( form.find('#' + config.logHistoryId).length ){ formData.logHistory = formData.hasOwnProperty('logHistory') ? parseInt( formData.logHistory ) : 0; } diff --git a/public/js/v1.5.4/app/ui/dialog/map_settings.js b/public/js/v1.5.4/app/ui/dialog/map_settings.js index 4e628d5c..56389ea0 100644 --- a/public/js/v1.5.4/app/ui/dialog/map_settings.js +++ b/public/js/v1.5.4/app/ui/dialog/map_settings.js @@ -36,6 +36,7 @@ define([ deleteEolConnectionsId: 'pf-map-dialog-delete-connections-eol', // id for "deleteEOLConnections" checkbox persistentAliasesId: 'pf-map-dialog-persistent-aliases', // id for "persistentAliases" checkbox persistentSignaturesId: 'pf-map-dialog-persistent-signatures', // id for "persistentSignatures" checkbox + trackAbyssalJumpsId: 'pf-map-dialog-track-abyss-jumps', // id for "trackAbyssalJumps" checkbox logHistoryId: 'pf-map-dialog-history', // id for "history logging" checkbox logActivityId: 'pf-map-dialog-activity', // id for "activity" checkbox @@ -159,6 +160,7 @@ define([ let deleteEolConnections = true; let persistentAliases = true; let persistentSignatures = true; + let trackAbyssalJumps = true; let logActivity = true; let logHistory = true; @@ -197,6 +199,7 @@ define([ deleteEolConnections = mapData.config.deleteEolConnections; persistentAliases = mapData.config.persistentAliases; persistentSignatures = mapData.config.persistentSignatures; + trackAbyssalJumps = mapData.config.trackAbyssalJumps; logActivity = mapData.config.logging.activity; logHistory = mapData.config.logging.history; @@ -255,10 +258,12 @@ define([ deleteEolConnectionsId : config.deleteEolConnectionsId, persistentAliasesId : config.persistentAliasesId, persistentSignaturesId : config.persistentSignaturesId, + trackAbyssalJumpsId : config.trackAbyssalJumpsId, deleteExpiredConnections: deleteExpiredConnections, deleteEolConnections: deleteEolConnections, persistentAliases: persistentAliases, persistentSignatures: persistentSignatures, + trackAbyssalJumps: trackAbyssalJumps, logHistoryId: config.logHistoryId, logActivityId: config.logActivityId, @@ -398,6 +403,9 @@ define([ if( form.find('#' + config.persistentSignaturesId).length ){ formData.persistentSignatures = formData.hasOwnProperty('persistentSignatures') ? parseInt( formData.persistentSignatures ) : 0; } + if( form.find('#' + config.trackAbyssalJumpsId).length ){ + formData.trackAbyssalJumps = formData.hasOwnProperty('trackAbyssalJumps') ? parseInt( formData.trackAbyssalJumps ) : 0; + } if( form.find('#' + config.logHistoryId).length ){ formData.logHistory = formData.hasOwnProperty('logHistory') ? parseInt( formData.logHistory ) : 0; } diff --git a/public/templates/dialog/map.html b/public/templates/dialog/map.html index 96a3524e..f6a556f8 100644 --- a/public/templates/dialog/map.html +++ b/public/templates/dialog/map.html @@ -44,10 +44,10 @@
-
+

Map options

-
+
@@ -58,7 +58,7 @@
-
+
@@ -69,7 +69,7 @@
-
+
@@ -80,7 +80,7 @@
-
+
@@ -90,14 +90,25 @@
+ +
+
+
+ + +
+
+
-
+

Map logging

-
+
@@ -108,7 +119,7 @@
-
+