dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fixed map filter for "killstream", closed #932

Browse Source
This commit is contained in:
Mark Friedrich
2020-03-25 16:32:56 +01:00
parent 96a8f399ca
commit 0cf4617376
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
js/app/ui/module/system_killboard.js
View File

@@ -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));
}
}

8
public/js/v2.0.0-rc.1/app/ui/module/system_killboard.js
View File

@@ -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));
}
}