From 393fce3e8aaef1b00ab34bf35b7e8b329a5e3dc5 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Tue, 19 Aug 2014 08:55:44 -0400
Subject: Add a feed selector in repartition statistics.

Before we could choose the feed in the statistics only from the feed options in the main view. Now with the new drop-down list, it is possible to choose it from the statistics page.
The rendering needs to be polished to be nicer.
---
 app/Controllers/statsController.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app/Controllers/statsController.php')

diff --git a/app/Controllers/statsController.php b/app/Controllers/statsController.php
index 06a20c2a6..934b076a5 100644
--- a/app/Controllers/statsController.php
+++ b/app/Controllers/statsController.php
@@ -58,9 +58,11 @@ class FreshRSS_stats_Controller extends Minz_ActionController {
 
 	public function repartitionAction() {
 		$statsDAO = FreshRSS_Factory::createStatsDAO();
+		$categoryDAO = new FreshRSS_CategoryDAO();
 		$feedDAO = FreshRSS_Factory::createFeedDao();
 		Minz_View::appendScript(Minz_Url::display('/scripts/flotr2.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/flotr2.min.js')));
 		$id = Minz_Request::param ('id', null);
+		$this->view->categories = $categoryDAO->listCategories ();
 		$this->view->feed = $feedDAO->searchById($id);
 		$this->view->days = $statsDAO->getDays();
 		$this->view->months = $statsDAO->getMonths();
-- 
cgit v1.2.3


From ea99ac1259083ff0a9eb6131d777454b54045626 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 19 Aug 2014 21:55:49 +0200
Subject: Syntax 581

#581
---
 app/Controllers/statsController.php |  2 +-
 app/views/stats/repartition.phtml   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'app/Controllers/statsController.php')

diff --git a/app/Controllers/statsController.php b/app/Controllers/statsController.php
index 934b076a5..98f46f0d2 100644
--- a/app/Controllers/statsController.php
+++ b/app/Controllers/statsController.php
@@ -62,7 +62,7 @@ class FreshRSS_stats_Controller extends Minz_ActionController {
 		$feedDAO = FreshRSS_Factory::createFeedDao();
 		Minz_View::appendScript(Minz_Url::display('/scripts/flotr2.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/flotr2.min.js')));
 		$id = Minz_Request::param ('id', null);
-		$this->view->categories = $categoryDAO->listCategories ();
+		$this->view->categories = $categoryDAO->listCategories();
 		$this->view->feed = $feedDAO->searchById($id);
 		$this->view->days = $statsDAO->getDays();
 		$this->view->months = $statsDAO->getMonths();
diff --git a/app/views/stats/repartition.phtml b/app/views/stats/repartition.phtml
index 3dc319731..1f920a7ae 100644
--- a/app/views/stats/repartition.phtml
+++ b/app/views/stats/repartition.phtml
@@ -6,16 +6,16 @@
 	<h1><?php echo _t('stats_repartition'); ?></h1>
 
 	<select id="feed_select">
-		<option data-url="<?php echo _url ('stats', 'repartition')?>"></option>
+		<option data-url="<?php echo _url('stats', 'repartition')?>"></option>
 	<?php foreach ($this->categories as $category) {
-		$feeds = $category->feeds ();
-		if (!empty ($feeds)) {
+		$feeds = $category->feeds();
+		if (!empty($feeds)) {
 			echo '<optgroup label=', $category->name(), '>';
 			foreach ($feeds as $feed) {
 				if ($this->feed && $feed->id() == $this->feed->id()){
-					echo '<option value ="', $feed->id(), '" selected data-url="', _url ('stats', 'repartition', 'id', $feed->id()), '">', $feed->name(), '</option>';
+					echo '<option value ="', $feed->id(), '" selected data-url="', _url('stats', 'repartition', 'id', $feed->id()), '">', $feed->name(), '</option>';
 				} else {
-					echo '<option value ="', $feed->id(), '" data-url="', _url ('stats', 'repartition', 'id', $feed->id()), '">', $feed->name(), '</option>';
+					echo '<option value ="', $feed->id(), '" data-url="', _url('stats', 'repartition', 'id', $feed->id()), '">', $feed->name(), '</option>';
 				}
 			}
 			echo '</optgroup>';
-- 
cgit v1.2.3