Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/polls.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorv1r0x <vinzenz.rosenkranz@gmail.com>2016-03-05 00:44:12 +0300
committerv1r0x <vinzenz.rosenkranz@gmail.com>2016-03-05 00:44:12 +0300
commit8ff1076155889a1765555daccb4d9f0bc9a0ff39 (patch)
treeda67ef6efde806d9e286b76535b0d79ad8825074 /controller
parent7b3e5cb45dd3adb46fcdc9e80d931ca057276015 (diff)
parent6ab8a715c0a06ba920e37ed3a5b8f5a75d7cccd9 (diff)
Merge pull request #8 from v1r0x/user-avatars
add user avatar to vote page
Diffstat (limited to 'controller')
-rw-r--r--controller/pagecontroller.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/controller/pagecontroller.php b/controller/pagecontroller.php
index aaf5dcf3..aaa74825 100644
--- a/controller/pagecontroller.php
+++ b/controller/pagecontroller.php
@@ -27,6 +27,7 @@ use \OCA\Polls\Db\NotificationMapper;
use \OCA\Polls\Db\ParticipationMapper;
use \OCA\Polls\Db\TextMapper;
use \OCP\IUserManager;
+use \OCP\IAvatarManager;
use \OCP\ILogger;
use \OCP\IRequest;
use \OCP\IURLGenerator;
@@ -48,9 +49,11 @@ class PageController extends Controller {
private $textMapper;
private $urlGenerator;
private $manager;
+ private $avatarManager;
private $logger;
public function __construct($appName, IRequest $request,
IUserManager $manager,
+ IAvatarManager $avatarManager,
ILogger $logger,
IURLGenerator $urlGenerator,
$userId,
@@ -63,6 +66,7 @@ class PageController extends Controller {
TextMapper $textMapper) {
parent::__construct($appName, $request);
$this->manager = $manager;
+ $this->avatarManager = $avatarManager;
$this->logger = $logger;
$this->urlGenerator = $urlGenerator;
$this->userId = $userId;
@@ -147,7 +151,7 @@ class PageController extends Controller {
} catch(\OCP\AppFramework\Db\DoesNotExistException $e) {
$notification = null;
}
- if($this->hasUserAccess($poll)) return new TemplateResponse('polls', 'goto.tmpl', ['poll' => $poll, 'dates' => $dates, 'comments' => $comments, 'votes' => $votes, 'notification' => $notification, 'userId' => $this->userId, 'userMgr' => $this->manager, 'urlGenerator' => $this->urlGenerator]);
+ if($this->hasUserAccess($poll)) return new TemplateResponse('polls', 'goto.tmpl', ['poll' => $poll, 'dates' => $dates, 'comments' => $comments, 'votes' => $votes, 'notification' => $notification, 'userId' => $this->userId, 'userMgr' => $this->manager, 'urlGenerator' => $this->urlGenerator, 'avatarManager' => $this->avatarManager]);
else return new TemplateResponse('polls', 'no.acc.tmpl', []);
}