From 0cf4617376e248842d626d16c5e3b7b42e6c8803 Mon Sep 17 00:00:00 2001 From: Mark Friedrich Date: Wed, 25 Mar 2020 16:32:56 +0100 Subject: [PATCH] - fixed map filter for "killstream", closed #932 --- js/app/ui/module/system_killboard.js | 8 ++++++-- public/js/v2.0.0-rc.1/app/ui/module/system_killboard.js | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/js/app/ui/module/system_killboard.js b/js/app/ui/module/system_killboard.js index b7c53215..47ff2308 100644 --- a/js/app/ui/module/system_killboard.js +++ b/js/app/ui/module/system_killboard.js @@ -566,7 +566,7 @@ define([ let streams = this._filterStreams || []; return !!(streams.includes('all') || (streams.includes('system') && this._systemData.systemId === killmailData.solar_system_id) || - (streams.includes('map') && MapUtil.getSystemData(this._mapId, 'systemId', killmailData.solar_system_id))); + (streams.includes('map') && MapUtil.getSystemData(this._mapId, killmailData.solar_system_id, 'systemId'))); } @@ -591,7 +591,11 @@ define([ this._killboardEl.prepend(this._listStreamHeadline); } - this.renderKillmail(zkbData, killmailData, null, 0, 'top') + // get systemData for killmailData + // -> systemData should exist if KM belongs to any system on any map + let systemData = MapUtil.getSystemData(this._mapId, killmailData.solar_system_id, 'systemId') || null; + + this.renderKillmail(zkbData, killmailData, systemData, 0, 'top') .catch(e => console.warn(e)); } } diff --git a/public/js/v2.0.0-rc.1/app/ui/module/system_killboard.js b/public/js/v2.0.0-rc.1/app/ui/module/system_killboard.js index b7c53215..47ff2308 100644 --- a/public/js/v2.0.0-rc.1/app/ui/module/system_killboard.js +++ b/public/js/v2.0.0-rc.1/app/ui/module/system_killboard.js @@ -566,7 +566,7 @@ define([ let streams = this._filterStreams || []; return !!(streams.includes('all') || (streams.includes('system') && this._systemData.systemId === killmailData.solar_system_id) || - (streams.includes('map') && MapUtil.getSystemData(this._mapId, 'systemId', killmailData.solar_system_id))); + (streams.includes('map') && MapUtil.getSystemData(this._mapId, killmailData.solar_system_id, 'systemId'))); } @@ -591,7 +591,11 @@ define([ this._killboardEl.prepend(this._listStreamHeadline); } - this.renderKillmail(zkbData, killmailData, null, 0, 'top') + // get systemData for killmailData + // -> systemData should exist if KM belongs to any system on any map + let systemData = MapUtil.getSystemData(this._mapId, killmailData.solar_system_id, 'systemId') || null; + + this.renderKillmail(zkbData, killmailData, systemData, 0, 'top') .catch(e => console.warn(e)); } }