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

correct listing of Quests for Questtopics

Browse source
This commit is contained in:
coderkun 2014-04-28 13:44:58 +02:00
commit e90bfb7008
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
controllers/LibraryController.inc
View file

@ -111,7 +111,7 @@
$quests = array(); $quests = array();
foreach($this->Quests->getQuestsForQuesttopic($questtopic['id']) as $quest) foreach($this->Quests->getQuestsForQuesttopic($questtopic['id']) as $quest)
{ {
if($this->Quests->hasCharacterEnteredQuest($quest['id'], $character['id'])) if($this->Quests->hasCharacterEnteredQuest($quest['id'], $character['id']) || count(array_intersect(array('admin', 'moderator'), self::$character['characterroles'])) > 0)
{ {
// Get Questgroup // Get Questgroup
$quest['questgroup'] = $this->Questgroups->getQuestgroupById($quest['questgroup_id']); $quest['questgroup'] = $this->Questgroups->getQuestgroupById($quest['questgroup_id']);

3
models/QuestsModel.inc
View file

@ -355,8 +355,9 @@
return $this->db->query( return $this->db->query(
'SELECT DISTINCT quests.id, quests.questgroup_id, quests.questtype_id, quests.title, quests.url, quests.xps, quests.task, quests.wrong_text, quests.questsmedia_id '. 'SELECT DISTINCT quests.id, quests.questgroup_id, quests.questtype_id, quests.title, quests.url, quests.xps, quests.task, quests.wrong_text, quests.questsmedia_id '.
'FROM quests_questsubtopics '. 'FROM quests_questsubtopics '.
'INNER JOIN questsubtopics ON questsubtopics.id = quests_questsubtopics.questsubtopic_id '.
'INNER JOIN quests ON quests.id = quests_questsubtopics.quest_id '. 'INNER JOIN quests ON quests.id = quests_questsubtopics.quest_id '.
'WHERE quests_questsubtopics.questsubtopic_id = ?', 'WHERE questsubtopics.questtopic_id = ?',
'i', 'i',
$questtopicId $questtopicId
); );