Removed 'articles' view.

4 files changed, 1 insertions, 62 deletions

diff --git a/pyaggr3g470r/templates/articles.html b/pyaggr3g470r/templates/articles.html
deleted file mode 100644
index 383c28a4..00000000
--- a/pyaggr3g470r/templates/articles.html
+++ /dev/null
@@ -1,43 +0,0 @@
-{% extends "layout.html" %}
-{% block content %}
-<div class="container">
-    <div class="well">
-        <h2><a href="{{ feed.site_link }}">{{ feed.title|safe }}</a></h2>
-        <a href="/feed/{{ feed.id }}"><i class="glyphicon glyphicon-info-sign" title="Details"></i></a>
-        <a href="/edit_feed/{{ feed.id }}"><i class="glyphicon glyphicon-edit" title="Edit this feed"></i></a>
-        {% if nb_articles == 10**9 %}
-            <h3>{{ feed.articles.all()|count  }} articles.</h3>
-        {% else %}
-            <h3>Last {{ feed.articles.all()|count }} articles. See <a href="/articles/{{ feed.id }}">all articles</a>.</h3>
-        {% endif %}
-    </div>
-    {% if feed.articles.all()|count == 0  %}
-        <h1>No articles.</h1>
-    {% else %}
-        {% for number in range(0, feed.articles.all()|length-(feed.articles.all()|length % 3), 3) %}
-            <div class="row">
-                {% for n in range(number, number+3) %}
-                <div class="col-xs-6 col-sm-4 col-md-4">
-                    {% if feed.articles[n].readed %}<h3>{% else %}<h1>{% endif %}
-                        <a href="/article/{{ feed.articles[n].id }}">{{ feed.articles[n].title|safe }}</a>
-                    {% if feed.articles[n].readed %}</h3>{% else %}</h1>{% endif %}
-                    <h6>{{ feed.articles[n].date }}</h6>
-                </div>
-                {% endfor %}
-            </div>
-        {% endfor %}
-        {% if feed.articles.all()|length % 3 != 0 %}
-            <div class="row">
-                 {% for n in range(feed.articles.all()|length-(feed.articles.all()|length % 3), feed.articles.all()|length) %}
-                    <div class="col-xs-6 col-sm-4 col-md-4">
-                        {% if feed.articles[n].readed %}<h3>{% else %}<h1>{% endif %}
-                            <a href="/article/{{ feed.articles[n].id }}">{{ feed.articles[n].title|safe }}</a>
-                        {% if feed.articles[n].readed %}</h3>{% else %}</h1>{% endif %}
-                        <h6>{{ feed.articles[n].date }}</h6>
-                    </div>
-                {% endfor %}
-            </div>
-        {% endif %}
-    {% endif %}
-</div><!-- /.container -->
-{% endblock %}
diff --git a/pyaggr3g470r/templates/feed.html b/pyaggr3g470r/templates/feed.html
index c888e04f..09a064e5 100644
--- a/pyaggr3g470r/templates/feed.html
+++ b/pyaggr3g470r/templates/feed.html
@@ -9,7 +9,7 @@
     </div>
     <div class="well">
         <p>
-        {{ _('This feed contains') }} {{ feed.articles.all()|count }} <a href="/articles/{{ feed.id }}/100">{{ _('articles') }}</a>.<br />
+        {{ _('This feed contains') }} {{ feed.articles.all()|count }} <a href= "{{ url_for("home", feed_id=feed.id, filter_="all")  }}">{{ _('articles') }}</a>.<br />
         {{ _('Address of the feed') }}: <a href="{{ feed.link }}" target="_blank">{{ feed.link }}</a><br />
         {% if feed.site_link != "" %}
             {{ _('Address of the site') }}: <a href="{{ feed.site_link }}" target="_blank">{{ feed.site_link }}</a><br />
diff --git a/pyaggr3g470r/templates/home.html b/pyaggr3g470r/templates/home.html
index 82f23dfa..e5db30e1 100644
--- a/pyaggr3g470r/templates/home.html
+++ b/pyaggr3g470r/templates/home.html
@@ -29,7 +29,6 @@
             </a></li>
             <li class="feed-commands"><span>
                 <a href="/feed/{{ fid }}"><i class="glyphicon glyphicon-info-sign" title="{{ _('Details') }}"></i></a>
-                <a href="/articles/{{ fid }}/100"><i class="glyphicon glyphicon-th-list" title="{{ _('Articles') }}"></i></a>
                 <a href="{{ url_for("feed.form", feed_id=fid) }}"><i class="glyphicon glyphicon-edit" title="{{ _('Edit this feed') }}"></i></a>
                 <a href="{{ url_for("feed.delete", feed_id=fid) }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this feed') }}" onclick="return confirm('{{ _('You are going to delete this feed.') }}');"></i></a>
                 <a href="{{ url_for("feed.update", feed_id=fid, action="read") }}"><i class="glyphicon glyphicon-check" title="{{ _('Mark this feed as read') }}"></i></a>
@@ -47,7 +46,6 @@
             </a></li>
             <li class="feed-commands"><span>
                 <a href="{{ url_for("feed.feed", feed_id=fid) }}"><i class="glyphicon glyphicon-info-sign" title="{{ _('Details') }}"></i></a>
-                <a href="/articles/{{ fid }}/100"><i class="glyphicon glyphicon-th-list" title="{{ _('Articles') }}"></i></a>
                 <a href="{{ url_for("feed.form", feed_id=fid) }}"><i class="glyphicon glyphicon-edit" title="{{ _('Edit this feed') }}"></i></a>
                 <a href="{{ url_for("feed.delete", feed_id=fid) }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this feed') }}" onclick="return confirm('{{ _('You are going to delete this feed.') }}');"></i></a>
                 <a href="{{ url_for("feed.update", feed_id=fid, action="read") }}"><i class="glyphicon glyphicon-check" title="{{ _('Mark this feed as read') }}"></i></a>
diff --git a/pyaggr3g470r/views/article.py b/pyaggr3g470r/views/article.py
index 75360485..5843551e 100644
--- a/pyaggr3g470r/views/article.py
+++ b/pyaggr3g470r/views/article.py
@@ -11,22 +11,6 @@ articles_bp = Blueprint('articles', __name__, url_prefix='/articles')
 article_bp = Blueprint('article', __name__, url_prefix='/article')
 
 
-@articles_bp.route('/<feed_id>', methods=['GET'])
-@articles_bp.route('/<feed_id>/<int:nb_articles>', methods=['GET'])
-@pyagg_default_decorator
-def articles(feed_id=None, nb_articles=-1):
-    """List articles of a feed. The administrator of the platform is able to
-    access to this view for every users."""
-    feed = controllers.FeedController(g.user.id).get(id=feed_id)
-    feed.articles = controllers.ArticleController(g.user.id)\
-                               .read(feed_id=feed.id)\
-                               .order_by(desc("Article.date"))
-    if len(feed.articles.all()) <= nb_articles or nb_articles == -1:
-        nb_articles = int(1e9)
-    feed.articles = feed.articles.limit(nb_articles)
-    return render_template('articles.html', feed=feed, nb_articles=nb_articles)
-
-
 @article_bp.route('/redirect/<int:article_id>', methods=['GET'])
 @pyagg_default_decorator
 def redirect_to_article(article_id):