From 58074ae62d1f8423895e8ad28bd11371627be022 Mon Sep 17 00:00:00 2001 From: François Schmidts Date: Tue, 7 Jul 2015 10:37:06 +0200 Subject: using bookmarklet for adding feed from navbar --- pyaggr3g470r/views/views.py | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'pyaggr3g470r/views') diff --git a/pyaggr3g470r/views/views.py b/pyaggr3g470r/views/views.py index a4e799cc..189fd53f 100644 --- a/pyaggr3g470r/views/views.py +++ b/pyaggr3g470r/views/views.py @@ -137,17 +137,6 @@ def get_timezone(): except: return conf.TIME_ZONE["en"] - -@app.context_processor -def inject_feed_form(): - """ - Injects the 'AddFeedForm' objects in all templates. - - Context processors run before the template is rendered and have the - ability to inject new values into the template context. - """ - return dict(create_feed_form=AddFeedForm()) - # # Views. # -- cgit From 5091c44181db05822e27b58a145de56395795768 Mon Sep 17 00:00:00 2001 From: François Schmidts Date: Tue, 7 Jul 2015 10:58:00 +0200 Subject: protecting pyagg against empty feed --- pyaggr3g470r/views/feed.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'pyaggr3g470r/views') diff --git a/pyaggr3g470r/views/feed.py b/pyaggr3g470r/views/feed.py index 18e110af..86d07e18 100644 --- a/pyaggr3g470r/views/feed.py +++ b/pyaggr3g470r/views/feed.py @@ -102,7 +102,12 @@ def bookmarklet(): "warning") return redirect(url_for('feed.form', feed_id=feed_exists[0].id)) - feed = feed_contr.create(**construct_feed_from(url)) + feed = construct_feed_from(url) + if not feed.get('link'): + feed['enabled'] = False + flash(gettext("Couldn't find a feed url, you'll need to find a Atom or" + "RSS link manually and reactivate this feed"), 'warning') + feed = feed_contr.create(**feed) flash(gettext('Feed was successfully created.'), 'success') if conf.CRAWLING_METHOD == "classic": utils.fetch(g.user.id, feed.id) -- cgit