From 9e219cbf5014c8f4f52f3ca6722f7a20cdcc13dd Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Sun, 12 May 2013 19:21:39 +0200 Subject: Fix issue #70 : lorsqu'on rencontre un problème avec un flux, on l'indique à l'utilisateur (couleur rouge) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/configure/feed.phtml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'app/views/configure/feed.phtml') diff --git a/app/views/configure/feed.phtml b/app/views/configure/feed.phtml index 33483f72d..ad9c86d9e 100644 --- a/app/views/configure/feed.phtml +++ b/app/views/configure/feed.phtml @@ -7,6 +7,10 @@

flux->name (); ?>

flux->description (); ?> + flux->inError ()) { ?> +

+ +
-- cgit v1.2.3 From 746ae4b33a2e7a83d2623291c02d7b4292247103 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Fri, 14 Jun 2013 20:09:47 +0200 Subject: Fix issue #79 : possibilité de changer le nom d'un flux MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/configureController.php | 2 ++ app/models/Entry.php | 2 +- app/views/configure/feed.phtml | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) (limited to 'app/views/configure/feed.phtml') diff --git a/app/controllers/configureController.php b/app/controllers/configureController.php index 3b332de75..0d385daf9 100755 --- a/app/controllers/configureController.php +++ b/app/controllers/configureController.php @@ -91,6 +91,7 @@ class configureController extends ActionController { $this->view->categories = $catDAO->listCategories (); if (Request::isPost () && $this->view->flux) { + $name = Request::param ('name', ''); $cat = Request::param ('category', 0); $path = Request::param ('path_entries', ''); $priority = Request::param ('priority', 0); @@ -103,6 +104,7 @@ class configureController extends ActionController { } $values = array ( + 'name' => $name, 'category' => $cat, 'pathEntries' => $path, 'priority' => $priority, diff --git a/app/models/Entry.php b/app/models/Entry.php index f49e74239..1d944b184 100755 --- a/app/models/Entry.php +++ b/app/models/Entry.php @@ -239,7 +239,7 @@ class EntryDAO extends Model_pdo { return true; } else { $info = $stm->errorInfo(); - Log::record ('SQL error : ' . $info[2], Log::ERROR); + Log::record ('SQL error : ' . $info[2], Log::NOTICE); return false; } } diff --git a/app/views/configure/feed.phtml b/app/views/configure/feed.phtml index ad9c86d9e..650da5641 100644 --- a/app/views/configure/feed.phtml +++ b/app/views/configure/feed.phtml @@ -13,6 +13,12 @@ +
+ +
+ +
+
-- cgit v1.2.3 From 32499c0b3e519ef2fc255f5990448195256476ac Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Sun, 23 Jun 2013 12:45:27 +0200 Subject: Fix issue #91 : flux en erreur repasse normal Lorsqu'on actualise un flux en erreur, si celui-ci est de nouveau accessible, il repasse en normal Ajout d'un bouton pour actualiser les flux sur la page de gestion --- app/i18n/en.php | 2 +- app/i18n/fr.php | 2 +- app/models/Feed.php | 2 +- app/views/configure/feed.phtml | 8 ++++++++ 4 files changed, 11 insertions(+), 3 deletions(-) (limited to 'app/views/configure/feed.phtml') diff --git a/app/i18n/en.php b/app/i18n/en.php index 4dbfde715..209bbcd87 100644 --- a/app/i18n/en.php +++ b/app/i18n/en.php @@ -119,7 +119,7 @@ return array ( 'or' => 'or', 'informations' => 'Informations', - 'feed_in_error' => 'This feed has encountered a problem. Please verify that it is always reachable.', + 'feed_in_error' => 'This feed has encountered a problem. Please verify that it is always reachable then actualize it.', 'website_url' => 'Website URL', 'feed_url' => 'Feed URL', 'number_articles' => 'Number of articles', diff --git a/app/i18n/fr.php b/app/i18n/fr.php index 7a58b984c..172f06953 100644 --- a/app/i18n/fr.php +++ b/app/i18n/fr.php @@ -119,7 +119,7 @@ return array ( 'or' => 'ou', 'informations' => 'Informations', - 'feed_in_error' => 'Ce flux a rencontré un problème. Veuillez vérifier qu\'il est toujours accessible.', + 'feed_in_error' => 'Ce flux a rencontré un problème. Veuillez vérifier qu\'il est toujours accessible puis actualisez-le.', 'website_url' => 'URL du site', 'feed_url' => 'URL du flux', 'number_articles' => 'Nombre d\'articles', diff --git a/app/models/Feed.php b/app/models/Feed.php index 15568d06a..4c6a3d229 100644 --- a/app/models/Feed.php +++ b/app/models/Feed.php @@ -292,7 +292,7 @@ class FeedDAO extends Model_pdo { } public function updateLastUpdate ($id) { - $sql = 'UPDATE feed SET lastUpdate=? WHERE id=?'; + $sql = 'UPDATE feed SET lastUpdate=?, error=0 WHERE id=?'; $stm = $this->bd->prepare ($sql); $values = array ( diff --git a/app/views/configure/feed.phtml b/app/views/configure/feed.phtml index 650da5641..ec2ff3bdb 100644 --- a/app/views/configure/feed.phtml +++ b/app/views/configure/feed.phtml @@ -31,6 +31,14 @@ flux->url (); ?>
+
+ +
+ + + +
+
-- cgit v1.2.3