diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-02-04 15:59:57 +0100 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-02-04 15:59:57 +0100 |
commit | e008c037f53324b931f027483f9f1053171109c5 (patch) | |
tree | 441c54eb946ffb53a161cad8f686ce7aff875abd /src/Wallabag/CoreBundle/Controller | |
parent | 74f39b0952440fa0c55e5e8a2e1a8d2bbd3acfd7 (diff) | |
parent | 79b9e49d9464e9a67f6ee66fbf6f6c541b1a29f4 (diff) | |
download | wallabag-e008c037f53324b931f027483f9f1053171109c5.tar.gz wallabag-e008c037f53324b931f027483f9f1053171109c5.tar.zst wallabag-e008c037f53324b931f027483f9f1053171109c5.zip |
Merge pull request #1612 from wallabag/v2-settings-page
Settings page
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller')
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/ConfigController.php | 9 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/RssController.php | 2 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/StaticController.php | 5 |
3 files changed, 10 insertions, 6 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index b01aaa7f..b7799746 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php | |||
@@ -133,10 +133,10 @@ class ConfigController extends Controller | |||
133 | $userManager->updateUser($newUser, true); | 133 | $userManager->updateUser($newUser, true); |
134 | 134 | ||
135 | $config = new Config($newUser); | 135 | $config = new Config($newUser); |
136 | $config->setTheme($this->container->getParameter('theme')); | 136 | $config->setTheme($this->getParameter('wallabag_core.theme')); |
137 | $config->setItemsPerPage($this->container->getParameter('items_on_page')); | 137 | $config->setItemsPerPage($this->getParameter('wallabag_core.items_on_page')); |
138 | $config->setRssLimit($this->container->getParameter('rss_limit')); | 138 | $config->setRssLimit($this->getParameter('wallabag_core.rss_limit')); |
139 | $config->setLanguage($this->container->getParameter('language')); | 139 | $config->setLanguage($this->getParameter('wallabag_core.language')); |
140 | 140 | ||
141 | $em->persist($config); | 141 | $em->persist($config); |
142 | 142 | ||
@@ -163,6 +163,7 @@ class ConfigController extends Controller | |||
163 | 'username' => $user->getUsername(), | 163 | 'username' => $user->getUsername(), |
164 | 'token' => $config->getRssToken(), | 164 | 'token' => $config->getRssToken(), |
165 | ), | 165 | ), |
166 | 'twofactor_auth' => $this->getParameter('twofactor_auth'), | ||
166 | )); | 167 | )); |
167 | } | 168 | } |
168 | 169 | ||
diff --git a/src/Wallabag/CoreBundle/Controller/RssController.php b/src/Wallabag/CoreBundle/Controller/RssController.php index 2b7ef598..a4f7a200 100644 --- a/src/Wallabag/CoreBundle/Controller/RssController.php +++ b/src/Wallabag/CoreBundle/Controller/RssController.php | |||
@@ -84,7 +84,7 @@ class RssController extends Controller | |||
84 | $pagerAdapter = new DoctrineORMAdapter($qb->getQuery()); | 84 | $pagerAdapter = new DoctrineORMAdapter($qb->getQuery()); |
85 | $entries = new Pagerfanta($pagerAdapter); | 85 | $entries = new Pagerfanta($pagerAdapter); |
86 | 86 | ||
87 | $perPage = $user->getConfig()->getRssLimit() ?: $this->container->getParameter('rss_limit'); | 87 | $perPage = $user->getConfig()->getRssLimit() ?: $this->getParameter('wallabag_core.rss_limit'); |
88 | $entries->setMaxPerPage($perPage); | 88 | $entries->setMaxPerPage($perPage); |
89 | 89 | ||
90 | return $this->render('WallabagCoreBundle:Entry:entries.xml.twig', array( | 90 | return $this->render('WallabagCoreBundle:Entry:entries.xml.twig', array( |
diff --git a/src/Wallabag/CoreBundle/Controller/StaticController.php b/src/Wallabag/CoreBundle/Controller/StaticController.php index 9ada371b..5b7bd56e 100644 --- a/src/Wallabag/CoreBundle/Controller/StaticController.php +++ b/src/Wallabag/CoreBundle/Controller/StaticController.php | |||
@@ -25,7 +25,10 @@ class StaticController extends Controller | |||
25 | { | 25 | { |
26 | return $this->render( | 26 | return $this->render( |
27 | 'WallabagCoreBundle:Static:about.html.twig', | 27 | 'WallabagCoreBundle:Static:about.html.twig', |
28 | array() | 28 | array( |
29 | 'version' => $this->getParameter('wallabag_core.version'), | ||
30 | 'paypal_url' => $this->getParameter('wallabag_core.paypal_url'), | ||
31 | ) | ||
29 | ); | 32 | ); |
30 | } | 33 | } |
31 | 34 | ||