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

alliance/corp maps. build process optimization, new/edit map dialog fixes

Browse Source
This commit is contained in:
exodus4d
2015-05-20 20:32:15 +02:00
parent e2945ea058
commit 34e41a6553
80 changed files with 3692 additions and 2182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
app/main/model/UserCharacterModel.php
View File

@@ -27,13 +27,6 @@ class UserCharacterModel extends BasicModel {
'characterId' => array(
'belongs-to-one' => 'Model\CharacterModel'
)
/*
,
'log' => array(
'has-one' => array('Model\CharacterLogModel', 'userCharacterId')
) */
);
/**
@@ -69,17 +62,13 @@ class UserCharacterModel extends BasicModel {
$characterData->isMain = $this->isMain;
// check for corporation
if($characterModel->corporationId){
$characterData->corporation = (object) [];
$characterData->corporation->id = $characterModel->corporationId;
$characterData->corporation->name = $characterModel->corporationName;
if( is_object( $characterModel->corporationId ) ){
$characterData->corporation = $characterModel->corporationId->getData();
}
// check for alliance
if($characterModel->allianceId){
$characterData->alliance = (object) [];
$characterData->alliance->id = $characterModel->allianceId;
$characterData->alliance->name = $characterModel->allianceName;
if( is_object( $characterModel->allianceId ) ){
$characterData->alliance = $characterModel->allianceId->getData();
}
// add character Log (current pilot data)
@@ -114,19 +103,23 @@ class UserCharacterModel extends BasicModel {
$this->isMain = $value;
}
/**
* get the character model of this character
* @return mixed
*/
public function getCharacter(){
return $this->characterId;
}
/**
* get character log model (if exists)
* @return bool|mixed
*/
public function getLog(){
//$this->filter('log', array('active = ?', 1));
$characterLog = $this->characterId->getLog();
if($this->log){
$characterLog = $this->log;
}
$characterLog = $this->getCharacter()->getLog();
return $characterLog;
}
}