use Hierarchy name of related Quest?s Questgroup for optional Questgroups
This commit is contained in:
parent
0e557f2d0d
commit
49bed14214
2 changed files with 9 additions and 1 deletions
|
|
@ -56,11 +56,19 @@
|
||||||
}
|
}
|
||||||
if(is_null($questgroup['hierarchy']))
|
if(is_null($questgroup['hierarchy']))
|
||||||
{
|
{
|
||||||
|
// Get related Questgroup
|
||||||
$questtext = $this->Questtexts->getRelatedQuesttextForQuestgroup($currentQuestgroup['id']);
|
$questtext = $this->Questtexts->getRelatedQuesttextForQuestgroup($currentQuestgroup['id']);
|
||||||
$quest = $this->Quests->getQuestById($questtext['quest_id']);
|
$quest = $this->Quests->getQuestById($questtext['quest_id']);
|
||||||
$currentQuestgroup = $this->Questgroups->getQuestgroupById($quest['questgroup_id']);
|
$currentQuestgroup = $this->Questgroups->getQuestgroupById($quest['questgroup_id']);
|
||||||
$currentQuestgroup['hierarchy'] = $this->Questgroupshierarchy->getHierarchyForQuestgroup($currentQuestgroup['id']);
|
$currentQuestgroup['hierarchy'] = $this->Questgroupshierarchy->getHierarchyForQuestgroup($currentQuestgroup['id']);
|
||||||
$quest['questgroup'] = $currentQuestgroup;
|
$quest['questgroup'] = $currentQuestgroup;
|
||||||
|
|
||||||
|
// Use Hierarchy name for optional Questgroup
|
||||||
|
if(!empty($parentQuestgroupshierarchy)) {
|
||||||
|
$parentQuestgroupshierarchy[0]['hierarchy'] = $currentQuestgroup['hierarchy'];
|
||||||
|
unset($parentQuestgroupshierarchy[0]['hierarchy']['questgroup_pos']);
|
||||||
|
}
|
||||||
|
|
||||||
array_unshift($parentQuestgroupshierarchy, $quest);
|
array_unshift($parentQuestgroupshierarchy, $quest);
|
||||||
array_unshift($parentQuestgroupshierarchy, $currentQuestgroup);
|
array_unshift($parentQuestgroupshierarchy, $currentQuestgroup);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
<i class="fa fa-chevron-right fa-fw"></i>
|
<i class="fa fa-chevron-right fa-fw"></i>
|
||||||
<?php if(array_key_exists('hierarchy', $hierarchy)) : ?>
|
<?php if(array_key_exists('hierarchy', $hierarchy)) : ?>
|
||||||
<?php if(!is_null($hierarchy['hierarchy'])) : ?>
|
<?php if(!is_null($hierarchy['hierarchy'])) : ?>
|
||||||
<?=$hierarchy['hierarchy']['title_singular']?> <?=$hierarchy['hierarchy']['questgroup_pos']?>:
|
<?=$hierarchy['hierarchy']['title_singular']?><?php if(array_key_exists('questgroup_pos', $hierarchy['hierarchy'])) : ?> <?=$hierarchy['hierarchy']['questgroup_pos']?><?php endif ?>:
|
||||||
<?php endif ?>
|
<?php endif ?>
|
||||||
<a href="<?=$linker->link(array('questgroups','questgroup',$seminary['url'],$hierarchy['url']))?>"><?=$hierarchy['title']?></a>
|
<a href="<?=$linker->link(array('questgroups','questgroup',$seminary['url'],$hierarchy['url']))?>"><?=$hierarchy['title']?></a>
|
||||||
<?php else : ?>
|
<?php else : ?>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue