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

get next and previous Questgroups for correct Seminary (fixes #92)

Browse source
This commit is contained in:
oliver 2015-04-26 18:50:10 +02:00
commit fa2dc75be6
3 changed files with 27 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

3
controllers/QuestgroupsController.inc
View file

@ -92,7 +92,7 @@
// Only check permissions if Character has not entered Quest before
if(!$this->Questgroups->hasCharacterEnteredQuestgroup($questgroup['id'], $character['id']))
{
$previousQuestgroup = $this->Questgroups->getPreviousQuestgroup($questgroup['id']);
$previousQuestgroup = $this->Questgroups->getPreviousQuestgroup($seminary['id'], $questgroup['id']);
if(!is_null($previousQuestgroup)) {
if(!$this->Questgroups->hasCharacterSolvedQuestgroup($previousQuestgroup['id'], $character['id'])) {
throw new \nre\exceptions\AccessDeniedException();
@ -316,7 +316,6 @@
);
// Upload moodpic
var_dump($moodpic);
if(!is_null($moodpic))
{
$mediaId = $this->Media->createQuestgrouppicture(

4
controllers/QuestsController.inc
View file

@ -184,7 +184,7 @@
if(count($previousQuests) == 0)
{
// Previous Questgroup
$previousQuestgroup = $this->Questgroups->getPreviousQuestgroup($questgroup['id']);
$previousQuestgroup = $this->Questgroups->getPreviousQuestgroup($seminary['id'], $questgroup['id']);
if(!is_null($previousQuestgroup) && !$this->Questgroups->hasCharacterSolvedQuestgroup($previousQuestgroup['id'], $character['id'])) {
throw new \nre\exceptions\AccessDeniedException();
}
@ -309,7 +309,7 @@
{
if(is_null($relatedQuesttext))
{
$nextQuestgroup = $this->Questgroups->getNextQuestgroup($questgroup['id']);
$nextQuestgroup = $this->Questgroups->getNextQuestgroup($seminary['id'], $questgroup['id']);
if(!is_null($nextQuestgroup)) {
$nextQuestgroup['hierarchy'] = $this->Questgroupshierarchy->getHierarchyForQuestgroup($nextQuestgroup['id']);
}