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

correctly fetch media in QuestsController and -View

Browse source
This commit is contained in:
coderkun 2014-04-11 22:37:37 +02:00
commit ca94d18acd
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
controllers/QuestsController.inc
View file

@ -265,7 +265,7 @@
$questgroup = $this->Questgroups->getQuestgroupByUrl($seminary['id'], $questgroupUrl); $questgroup = $this->Questgroups->getQuestgroupByUrl($seminary['id'], $questgroupUrl);
$questgroup['picture'] = null; $questgroup['picture'] = null;
if(!is_null($questgroup['questgroupspicture_id'])) { if(!is_null($questgroup['questgroupspicture_id'])) {
$questgroup['picture'] = $this->Media->getMediaById($questgroup['questgroupspicture_id']); $questgroup['picture'] = $this->Media->getSeminaryMediaById($questgroup['questgroupspicture_id']);
} }
// Get Quest // Get Quest
@ -274,7 +274,7 @@
// Media // Media
$questmedia = null; $questmedia = null;
if(!is_null($quest['questsmedia_id'])) { if(!is_null($quest['questsmedia_id'])) {
$questmedia = $this->Media->getMediaById($quest['questsmedia_id']); $questmedia = $this->Media->getSeminaryMediaById($quest['questsmedia_id']);
} }
// Get submitted Character submissions // Get submitted Character submissions
@ -316,7 +316,7 @@
$questgroup = $this->Questgroups->getQuestgroupByUrl($seminary['id'], $questgroupUrl); $questgroup = $this->Questgroups->getQuestgroupByUrl($seminary['id'], $questgroupUrl);
$questgroup['picture'] = null; $questgroup['picture'] = null;
if(!is_null($questgroup['questgroupspicture_id'])) { if(!is_null($questgroup['questgroupspicture_id'])) {
$questgroup['picture'] = $this->Media->getMediaById($questgroup['questgroupspicture_id']); $questgroup['picture'] = $this->Media->getSeminaryMediaById($questgroup['questgroupspicture_id']);
} }
// Get Quest // Get Quest
@ -328,7 +328,7 @@
// Media // Media
$questmedia = null; $questmedia = null;
if(!is_null($quest['questsmedia_id'])) { if(!is_null($quest['questsmedia_id'])) {
$questmedia = $this->Media->getMediaById($quest['questsmedia_id']); $questmedia = $this->Media->getSeminaryMediaById($quest['questsmedia_id']);
} }
// Questtype // Questtype

4
views/html/quests/submission.tpl
View file

@ -1,6 +1,6 @@
<?php if(!is_null($questgroup['picture'])) : ?> <?php if(!is_null($questgroup['picture'])) : ?>
<div class="moodpic"> <div class="moodpic">
<img src="<?=$linker->link(array('media','index',$seminary['url'],$questgroup['picture']['url']))?>" /> <img src="<?=$linker->link(array('media','seminary',$seminary['url'],$questgroup['picture']['url']))?>" />
</div> </div>
<?php endif ?> <?php endif ?>
<h1><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></h1> <h1><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></h1>
@ -8,7 +8,7 @@
<h2><?=$quest['title']?></h2> <h2><?=$quest['title']?></h2>
<?php if(!is_null($media)) : ?> <?php if(!is_null($media)) : ?>
<img src="<?=$linker->link(array('media','index',$seminary['url'],$media['url']))?>" /> <img src="<?=$linker->link(array('media','seminary',$seminary['url'],$media['url']))?>" />
<?php endif ?> <?php endif ?>
<h2><?=sprintf(_('Submission of %s'),$character['name'])?></h2> <h2><?=sprintf(_('Submission of %s'),$character['name'])?></h2>

4
views/html/quests/submissions.tpl
View file

@ -1,6 +1,6 @@
<?php if(!is_null($questgroup['picture'])) : ?> <?php if(!is_null($questgroup['picture'])) : ?>
<div class="moodpic"> <div class="moodpic">
<img src="<?=$linker->link(array('media','index',$seminary['url'],$questgroup['picture']['url']))?>" /> <img src="<?=$linker->link(array('media','seminary',$seminary['url'],$questgroup['picture']['url']))?>" />
</div> </div>
<?php endif ?> <?php endif ?>
<h1><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></h1> <h1><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></h1>
@ -8,7 +8,7 @@
<h2><?=$quest['title']?></h2> <h2><?=$quest['title']?></h2>
<?php if(!is_null($media)) : ?> <?php if(!is_null($media)) : ?>
<img src="<?=$linker->link(array('media','index',$seminary['url'],$media['url']))?>" /> <img src="<?=$linker->link(array('media','seminary',$seminary['url'],$media['url']))?>" />
<?php endif ?> <?php endif ?>
<section> <section>