From 0c7b2374df22e8ddb1fc52a8914d772a4a0e1eb9 Mon Sep 17 00:00:00 2001
From: coderkun
Date: Fri, 7 Mar 2014 13:37:59 +0100
Subject: [PATCH] implement avatar pictures
---
controllers/CharactersController.inc | 2 +-
models/CharactersModel.inc | 5 ++++-
views/html/characters/character.tpl | 3 +++
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/controllers/CharactersController.inc b/controllers/CharactersController.inc
index 4e65ed40..581b5b5a 100644
--- a/controllers/CharactersController.inc
+++ b/controllers/CharactersController.inc
@@ -17,7 +17,7 @@
*
* @author Oliver Hanraths
*/
- class CharactersController extends \hhu\z\Controller
+ class CharactersController extends \hhu\z\controllers\SeminaryRoleController
{
/**
* User permissions
diff --git a/models/CharactersModel.inc b/models/CharactersModel.inc
index c2899d8e..59125e32 100644
--- a/models/CharactersModel.inc
+++ b/models/CharactersModel.inc
@@ -132,9 +132,12 @@
public function getCharacterByUrl($seminaryId, $characterUrl)
{
$data = $this->db->query(
- 'SELECT characters.id, characters.created, characters.charactertype_id, characters.name, characters.url, characters.user_id, characters.xps, characters.xplevel, charactertypes.name AS charactertype_name, charactertypes.url AS charactertypes_url '.
+ 'SELECT characters.id, characters.created, characters.charactertype_id, characters.name, characters.url, characters.user_id, characters.xps, characters.xplevel, charactertypes.name AS charactertype_name, charactertypes.url AS charactertypes_url, media.url AS avatar_url, media.description AS avatar_description '.
'FROM v_characters AS characters '.
'LEFT JOIN charactertypes ON charactertypes.id = characters.charactertype_id '.
+ 'LEFT JOIN avatars ON avatars.id = characters.avatar_id '.
+ 'LEFT JOIN avatarpictures ON avatarpictures.media_id = avatars.avatarpicture_id '.
+ 'LEFT JOIN media ON media.id = avatarpictures.media_id '.
'WHERE charactertypes.seminary_id = ? AND characters.url = ?',
'is',
$seminaryId, $characterUrl
diff --git a/views/html/characters/character.tpl b/views/html/characters/character.tpl
index b2130746..b4bb166d 100644
--- a/views/html/characters/character.tpl
+++ b/views/html/characters/character.tpl
@@ -10,6 +10,9 @@
=$field['title']?>: =$field['value']?>
+
+
+