From dc0cf1a2789293bb3459ea8fe1f611edda075eba Mon Sep 17 00:00:00 2001 From: François Schmidts Date: Sun, 12 Apr 2015 21:44:20 +0200 Subject: redoing conf gathering and using it in templates --- pyaggr3g470r/views/feed.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pyaggr3g470r/views/feed.py') diff --git a/pyaggr3g470r/views/feed.py b/pyaggr3g470r/views/feed.py index 846df06d..11d14ac2 100644 --- a/pyaggr3g470r/views/feed.py +++ b/pyaggr3g470r/views/feed.py @@ -175,9 +175,8 @@ def form(feed_id=None): form = AddFeedForm(obj=feed) return render_template('edit_feed.html', action=gettext("Edit the feed"), - form=form, feed=feed, - not_on_heroku=not conf.ON_HEROKU) + form=form, feed=feed) # Return an empty form in order to create a new feed return render_template('edit_feed.html', action=gettext("Add a feed"), - form=form, not_on_heroku=not conf.ON_HEROKU) + form=form) -- cgit From b8416422b53a8b99738fef712a1857cdbbf8b887 Mon Sep 17 00:00:00 2001 From: François Schmidts Date: Tue, 14 Apr 2015 08:53:40 +0200 Subject: making fetch call dependent to the crawling method option --- pyaggr3g470r/views/feed.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pyaggr3g470r/views/feed.py') diff --git a/pyaggr3g470r/views/feed.py b/pyaggr3g470r/views/feed.py index 11d14ac2..159dce64 100644 --- a/pyaggr3g470r/views/feed.py +++ b/pyaggr3g470r/views/feed.py @@ -163,7 +163,8 @@ def form(feed_id=None): flash(gettext('Feed %(feed_title)r successfully created.', feed_title=new_feed.title), 'success') - utils.fetch(g.user.id, new_feed.id) + if conf.CRAWLING_METHOD == "classic": + utils.fetch(g.user.id, new_feed.id) flash(gettext("Downloading articles for the new feed..."), 'info') return redirect(url_for('feed.form', -- cgit