summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-06-23 12:45:27 +0200
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-06-23 12:45:27 +0200
commit32499c0b3e519ef2fc255f5990448195256476ac (patch)
tree1356db734a5ba725bc5ae289cbd08348bea10c56
parenta73c6de610c33e4431dc8bca0758319bc3e831bd (diff)
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
-rw-r--r--app/i18n/en.php2
-rw-r--r--app/i18n/fr.php2
-rw-r--r--app/models/Feed.php2
-rw-r--r--app/views/configure/feed.phtml8
4 files changed, 11 insertions, 3 deletions
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
@@ -32,6 +32,14 @@
</div>
</div>
<div class="form-group">
+ <label class="group-name"></label>
+ <div class="group-controls">
+ <a class="btn" href="<?php echo _url ('feed', 'actualize', 'id', $this->flux->id ()); ?>">
+ <i class="icon i_refresh"></i> <?php echo Translate::t('actualize'); ?>
+ </a>
+ </div>
+ </div>
+ <div class="form-group">
<label class="group-name"><?php echo Translate::t ('number_articles'); ?></label>
<div class="group-controls">
<span class="control"><?php echo $this->flux->nbEntries (); ?></span>