From 1b19cccd4403b92fa6ade7654d4e8f902c06fe04 Mon Sep 17 00:00:00 2001
From: Mark Friedrich <exodus4d@users.noreply.github.com>
Date: Sat, 27 Jul 2019 12:05:31 +0200
Subject: [PATCH] - Fixed "confirmation modal" for new added
 signature/structure data by `ctrl` + `v`. Current system is now correct.
 closed #821

---
 js/app/ui/module/system_intel.js                   | 4 ++--
 js/app/ui/module/system_signature.js               | 4 ++--
 public/js/v1.5.3/app/ui/module/system_intel.js     | 4 ++--
 public/js/v1.5.3/app/ui/module/system_signature.js | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/js/app/ui/module/system_intel.js b/js/app/ui/module/system_intel.js
index 8c2f7631..753e2b19 100644
--- a/js/app/ui/module/system_intel.js
+++ b/js/app/ui/module/system_intel.js
@@ -761,12 +761,12 @@ define([
             let currentLocationData = Util.getCurrentLocationData();
             if(
                 currentLocationData.id &&
-                currentLocationData.id !== systemData.id
+                currentLocationData.id !== systemData.systemId
             ){
                 let systemNameStr = (systemData.name === systemData.alias) ? '"' + systemData.name + '"' : '"' + systemData.alias + '" (' + systemData.name + ')';
                 systemNameStr = '<span class="txt-color txt-color-warning">' + systemNameStr + '</span>';
 
-                let msg = 'Update structures in ' + systemNameStr + ' ? This not your current location, "' + currentLocationData.name + '" !';
+                let msg = 'Update structures in ' + systemNameStr + ' ? This is not your current location, "' + currentLocationData.name + '" !';
                 bootbox.confirm(msg, result => {
                     if(result){
                         saveStructureData(structureData, context);
diff --git a/js/app/ui/module/system_signature.js b/js/app/ui/module/system_signature.js
index 3db47abd..1add92e8 100644
--- a/js/app/ui/module/system_signature.js
+++ b/js/app/ui/module/system_signature.js
@@ -742,12 +742,12 @@ define([
             let currentLocationData = Util.getCurrentLocationData();
             if(
                 currentLocationData.id &&
-                currentLocationData.id !== systemData.id
+                currentLocationData.id !== systemData.systemId
             ){
                 let systemNameStr = (systemData.name === systemData.alias) ? '"' + systemData.name + '"' : '"' + systemData.alias + '" (' + systemData.name + ')';
                 systemNameStr = '<span class="txt-color txt-color-warning">' + systemNameStr + '</span>';
 
-                let msg = 'Update signatures in ' + systemNameStr + ' ? This not your current location, "' + currentLocationData.name + '" !';
+                let msg = 'Update signatures in ' + systemNameStr + ' ? This is not your current location, "' + currentLocationData.name + '" !';
                 bootbox.confirm(msg, function(result){
                     if(result){
                         saveSignatureData(signatureData);
diff --git a/public/js/v1.5.3/app/ui/module/system_intel.js b/public/js/v1.5.3/app/ui/module/system_intel.js
index 8c2f7631..753e2b19 100644
--- a/public/js/v1.5.3/app/ui/module/system_intel.js
+++ b/public/js/v1.5.3/app/ui/module/system_intel.js
@@ -761,12 +761,12 @@ define([
             let currentLocationData = Util.getCurrentLocationData();
             if(
                 currentLocationData.id &&
-                currentLocationData.id !== systemData.id
+                currentLocationData.id !== systemData.systemId
             ){
                 let systemNameStr = (systemData.name === systemData.alias) ? '"' + systemData.name + '"' : '"' + systemData.alias + '" (' + systemData.name + ')';
                 systemNameStr = '<span class="txt-color txt-color-warning">' + systemNameStr + '</span>';
 
-                let msg = 'Update structures in ' + systemNameStr + ' ? This not your current location, "' + currentLocationData.name + '" !';
+                let msg = 'Update structures in ' + systemNameStr + ' ? This is not your current location, "' + currentLocationData.name + '" !';
                 bootbox.confirm(msg, result => {
                     if(result){
                         saveStructureData(structureData, context);
diff --git a/public/js/v1.5.3/app/ui/module/system_signature.js b/public/js/v1.5.3/app/ui/module/system_signature.js
index 3db47abd..1add92e8 100644
--- a/public/js/v1.5.3/app/ui/module/system_signature.js
+++ b/public/js/v1.5.3/app/ui/module/system_signature.js
@@ -742,12 +742,12 @@ define([
             let currentLocationData = Util.getCurrentLocationData();
             if(
                 currentLocationData.id &&
-                currentLocationData.id !== systemData.id
+                currentLocationData.id !== systemData.systemId
             ){
                 let systemNameStr = (systemData.name === systemData.alias) ? '"' + systemData.name + '"' : '"' + systemData.alias + '" (' + systemData.name + ')';
                 systemNameStr = '<span class="txt-color txt-color-warning">' + systemNameStr + '</span>';
 
-                let msg = 'Update signatures in ' + systemNameStr + ' ? This not your current location, "' + currentLocationData.name + '" !';
+                let msg = 'Update signatures in ' + systemNameStr + ' ? This is not your current location, "' + currentLocationData.name + '" !';
                 bootbox.confirm(msg, function(result){
                     if(result){
                         saveSignatureData(signatureData);