From f78568dcc1b1d4e92a7bda703b7d4177ac95b31b Mon Sep 17 00:00:00 2001
From: coderkun
Date: Wed, 9 Apr 2014 00:07:37 +0200
Subject: [PATCH] disable links based on permissions
---
controllers/SeminariesController.inc | 11 ++++++++++-
views/html/characters/index.tpl | 2 +-
views/html/seminaries/index.tpl | 20 ++++++++++++++++++--
views/html/users/user.tpl | 16 ++++++++++++++--
4 files changed, 43 insertions(+), 6 deletions(-)
diff --git a/controllers/SeminariesController.inc b/controllers/SeminariesController.inc
index 8294c0f7..c45aaad2 100644
--- a/controllers/SeminariesController.inc
+++ b/controllers/SeminariesController.inc
@@ -24,7 +24,7 @@
*
* @var array
*/
- public $models = array('seminaries', 'users', 'questgroupshierarchy', 'questgroups', 'media');
+ public $models = array('seminaries', 'users', 'userseminaryroles', 'questgroupshierarchy', 'questgroups', 'media');
/**
* User permissions
*
@@ -71,6 +71,15 @@
if(!is_null($seminary['media_id'])) {
$seminary['media'] = $this->Media->getMediaById($seminary['media_id']);
}
+
+ // Character of currently logged-in user
+ try {
+ $seminary['usercharacter'] = $this->Characters->getCharacterForUserAndSeminary($this->Auth->getUserId(), $seminary['id']);
+ }
+ catch(\nre\exceptions\IdNotFoundException $e) {
+ }
+ $seminary['userroles'] = $this->Userseminaryroles->getUserseminaryrolesForUserById(IntermediateController::$user['id'], $seminary['id']);
+
}
diff --git a/views/html/characters/index.tpl b/views/html/characters/index.tpl
index ee1c4454..478c0a65 100644
--- a/views/html/characters/index.tpl
+++ b/views/html/characters/index.tpl
@@ -6,7 +6,7 @@
=_('Characters')?>
-
+
diff --git a/views/html/seminaries/index.tpl b/views/html/seminaries/index.tpl
index 611fdaf8..4ad92986 100644
--- a/views/html/seminaries/index.tpl
+++ b/views/html/seminaries/index.tpl
@@ -1,16 +1,32 @@
=_('Seminaries')?>
+ 0) : ?>
=_('Create new seminary')?>
+
-
+
- =sprintf(_('created by %s on %s'), $seminary['creator']['username'], $dateFormatter->format(new \DateTime($seminary['created'])))?>
+
+ =\hhu\z\Utils::t($seminary['description'])?>
+ =sprintf(_('created by %s on %s'), $seminary['creator']['username'], $dateFormatter->format(new \DateTime($seminary['created'])))?>
+
+ =_('Create a Character')?>
+
+ =sprintf(_('Your Character ā%sā has not been activated yet'), $seminary['usercharacter']['name'])?>
+
+
diff --git a/views/html/users/user.tpl b/views/html/users/user.tpl
index e40d2fb0..f5615f3e 100644
--- a/views/html/users/user.tpl
+++ b/views/html/users/user.tpl
@@ -11,9 +11,21 @@
=_('Characters')?>
-