Bug fixing, new map info dialog

This commit is contained in:
Exodus4D
2015-08-25 23:04:47 +02:00
parent e3591e5d05
commit 52957d1ac8
70 changed files with 3320 additions and 1452 deletions

View File

@@ -13,17 +13,17 @@ class CharacterModel extends BasicModel {
protected $table = 'character';
protected $fieldConf = array(
'corporationId' => array(
protected $fieldConf = [
'corporationId' => [
'belongs-to-one' => 'Model\CorporationModel'
),
'allianceId' => array(
],
'allianceId' => [
'belongs-to-one' => 'Model\AllianceModel'
),
'characterLog' => array(
'has-one' => array('Model\CharacterLogModel', 'characterId')
)
);
],
'characterLog' => [
'has-one' => ['Model\CharacterLogModel', 'characterId']
]
];
/**
* get character data
@@ -33,6 +33,7 @@ class CharacterModel extends BasicModel {
public function getData($addCharacterLogData = false){
// check if there is cached data
// temporary disabled (performance test)
$characterData = null; //$this->getCacheData();
if(is_null($characterData)){