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:
authorVinzenz Rosenkranz <v1r0x@users.noreply.github.com>2016-10-22 02:03:56 +0300
committerGitHub <noreply@github.com>2016-10-22 02:03:56 +0300
commita6bc014a564d523f17fddf23983c19e35e7a6b11 (patch)
tree8d4268fcddd63a727e45e06057a269c4020e707a /appinfo
parent329f52e0d4fb2426c57b065071e8b8c6bd1b266c (diff)
parentfe86cb3e34957c8b0afd5d91f8957a4f647caeca (diff)
Merge pull request #80 from v1r0x/enh-group-display
enhance the user/group selections
Diffstat (limited to 'appinfo')
-rw-r--r--appinfo/application.php10
-rw-r--r--appinfo/routes.php2
2 files changed, 10 insertions, 2 deletions
diff --git a/appinfo/application.php b/appinfo/application.php
index 9791b6c4..123e436d 100644
--- a/appinfo/application.php
+++ b/appinfo/application.php
@@ -32,16 +32,19 @@ class Application extends App {
parent::__construct('polls', $urlParams);
$container = $this->getContainer();
+ $server = $container->getServer();
/**
* Controllers
*/
- $container->registerService('PageController', function($c) {
+ $container->registerService('PageController', function($c) use($server) {
/** @var SimpleContainer $c */
return new PageController(
$c->query('AppName'),
$c->query('Request'),
$c->query('UserManager'),
+ $c->query('GroupManager'),
+ $server->getShareManager(),
$c->query('AvatarManager'),
$c->query('Logger'),
$c->query('L10N'),
@@ -62,6 +65,10 @@ class Application extends App {
return $c->query('ServerContainer')->getUserManager();
});
+ $container->registerService('GroupManager', function($c) {
+ return $c->query('ServerContainer')->getGroupManager();
+ });
+
$container->registerService('AvatarManager', function($c) {
return $c->query('ServerContainer')->getAvatarManager();
});
@@ -74,7 +81,6 @@ class Application extends App {
return $c->query('ServerContainer')->getL10N($c->query('AppName'));
});
- $server = $container->getServer();
$container->registerService('AccessMapper', function($c) use ($server) {
/** @var SimpleContainer $c */
return new AccessMapper(
diff --git a/appinfo/routes.php b/appinfo/routes.php
index d594d1ec..312856e1 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -29,4 +29,6 @@ $application->registerRoutes($this, array('routes' => array(
array('name' => 'page#insert_poll', 'url' => '/insert', 'verb' => 'POST'),
array('name' => 'page#insert_vote', 'url' => '/insert/vote', 'verb' => 'POST'),
array('name' => 'page#insert_comment', 'url' => '/insert/comment', 'verb' => 'POST'),
+ array('name' => 'page#search', 'url' => '/search', 'verb' => 'POST'),
+ array('name' => 'page#get_display_name', 'url' => '/get/displayname', 'verb' => 'POST'),
)));