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

close #50 changed table names back to "default" camelCase names, fixed map query bug

Browse Source
This commit is contained in:
Exodus4D
2015-11-10 22:41:21 +01:00
parent 9989e51f6f
commit 4837b46e87
5 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/main/controller/api/map.php
View File

@@ -175,6 +175,10 @@ class Map extends \Controller\AccessController {
isset($mapData['data']['systems']) &&
isset($mapData['data']['connections'])
){
if(isset($mapData['id'])){
unset($mapData['id']);
}
$map->setData($mapData['config']);
$map->typeId = (int)$importData['typeId'];
$map->save();
@@ -184,6 +188,9 @@ class Map extends \Controller\AccessController {
$tempSystemIdMapping = [];
foreach($mapData['data']['systems'] as $systemData){
if(isset($systemData['id'])){
unset($systemData['id']);
}
$system->setData($systemData);
$system->mapId = $map;
$system->createdCharacterId = $activeCharacter->characterId;
@@ -200,6 +207,10 @@ class Map extends \Controller\AccessController {
isset( $tempSystemIdMapping[$connectionData['source']] ) &&
isset( $tempSystemIdMapping[$connectionData['target']] )
){
if(isset($connectionData['id'])){
unset($connectionData['id']);
}
$connection->setData($connectionData);
$connection->mapId = $map;
$connection->source = $tempSystemIdMapping[$connectionData['source']];
@@ -502,10 +513,10 @@ class Map extends \Controller\AccessController {
foreach($systems as $i => $systemData){
// check if current system belongs to the current map
$map->filter('systems', array('id = ?', $systemData['id'] ));
$map->filter('systems', ['id = ?', $systemData['id'] ]);
$filteredMap = $map->find(
array('id = ?', $map->id ),
array('limit' => 1)
['id = ?', $map->id ],
['limit' => 1]
);
// this should never fail
@@ -531,10 +542,10 @@ class Map extends \Controller\AccessController {
foreach($connections as $i => $connectionData){
// check if the current connection belongs to the current map
$map->filter('connections', array('id = ?', $connectionData['id'] ));
$map->filter('connections', ['id = ?', $connectionData['id'] ]);
$filteredMap = $map->find(
array('id = ?', $map->id ),
array('limit' => 1)
['id = ?', $map->id ],
['limit' => 1]
);
// this should never fail