coderkun/questlab
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Wiki Activity

implement different media for Quest- and Sidequesttexts (Ticket #26)

Browse source
This commit is contained in:
coderkun 2014-02-17 02:19:00 +01:00
commit e356b71b17
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
controllers/QuestsController.inc
View file

@ -95,12 +95,14 @@
// Media // Media
$questmedia = null; $questmedia = null;
if(!is_null($quest['questsmedia_id'])) { if(!is_null($questtext) && !empty($questtext['questsmedia_id'])) {
$questmedia = $this->Media->getMediaById($questtext['questsmedia_id']);
}
elseif(!is_null($quest['questsmedia_id'])) {
$questmedia = $this->Media->getMediaById($quest['questsmedia_id']); $questmedia = $this->Media->getMediaById($quest['questsmedia_id']);
} }
// Pass data to view // Pass data to view
$this->set('seminary', $seminary); $this->set('seminary', $seminary);
$this->set('questgroup', $questgroup); $this->set('questgroup', $questgroup);
@ -166,7 +168,10 @@
// Media // Media
$sidequestmedia = null; $sidequestmedia = null;
if(!is_null($sidequest['questsmedia_id'])) { if(!is_null($sidequesttext) && !empty($sidequesttext['questsmedia_id'])) {
$sidequestmedia = $this->Media->getMediaById($sidequesttext['questsmedia_id']);
}
elseif(!is_null($sidequest['questsmedia_id'])) {
$sidequestmedia = $this->Media->getMediaById($sidequest['questsmedia_id']); $sidequestmedia = $this->Media->getMediaById($sidequest['questsmedia_id']);
} }

4
models/QuesttextsModel.inc
View file

@ -46,7 +46,7 @@
public function getQuesttextByUrl($questId, $questtexttypeUrl, $pos) public function getQuesttextByUrl($questId, $questtexttypeUrl, $pos)
{ {
$data = $this->db->query( $data = $this->db->query(
'SELECT questtexts.id, questtexts.text, questtexts.pos, questtexts.out_text, questtexttypes.id AS type_id, questtexttypes.type, questtexttypes.url AS type_url '. 'SELECT questtexts.id, questtexts.text, questtexts.pos, questtexts.out_text, questtexts.questsmedia_id, questtexttypes.id AS type_id, questtexttypes.type, questtexttypes.url AS type_url '.
'FROM questtexts '. 'FROM questtexts '.
'LEFT JOIN questtexttypes ON questtexttypes.id = questtexts.questtexttype_id '. 'LEFT JOIN questtexttypes ON questtexttypes.id = questtexts.questtexttype_id '.
'WHERE questtexts.quest_id = ? AND questtexttypes.url = ? AND questtexts.pos = ?', 'WHERE questtexts.quest_id = ? AND questtexttypes.url = ? AND questtexts.pos = ?',
@ -74,7 +74,7 @@
public function getSidequesttextByUrl($sidequestId, $questtexttypeUrl, $pos) public function getSidequesttextByUrl($sidequestId, $questtexttypeUrl, $pos)
{ {
$data = $this->db->query( $data = $this->db->query(
'SELECT sidequesttexts.id, sidequesttexts.text, sidequesttexts.pos, sidequesttexts.out_text, sidequesttexts.abort_text, questtexttypes.id AS type_id, questtexttypes.type, questtexttypes.url AS type_url '. 'SELECT sidequesttexts.id, sidequesttexts.text, sidequesttexts.pos, sidequesttexts.out_text, sidequesttexts.abort_text, sidequesttexts.questsmedia_id, questtexttypes.id AS type_id, questtexttypes.type, questtexttypes.url AS type_url '.
'FROM sidequesttexts '. 'FROM sidequesttexts '.
'LEFT JOIN questtexttypes ON questtexttypes.id = sidequesttexts.questtexttype_id '. 'LEFT JOIN questtexttypes ON questtexttypes.id = sidequesttexts.questtexttype_id '.
'WHERE sidequesttexts.sidequest_id = ? AND questtexttypes.url = ? AND sidequesttexts.pos = ?', 'WHERE sidequesttexts.sidequest_id = ? AND questtexttypes.url = ? AND sidequesttexts.pos = ?',