diff options
| author | Cédric Bonhomme <kimble.mandel+bitbucket@gmail.com> | 2015-04-14 09:16:37 +0200 |
|---|---|---|
| committer | Cédric Bonhomme <kimble.mandel+bitbucket@gmail.com> | 2015-04-14 09:16:37 +0200 |
| commit | 4cb2b6cfe87721be61e82c0594a09df01f010e44 (patch) | |
| tree | e5c6bdb02c2ed6d30ec2f0aff17b49390d386614 /pyaggr3g470r/views/feed.py | |
| parent | Removed a link pointing to a deleted page. (diff) | |
| parent | making fetch call dependent to the crawling method option (diff) | |
| download | newspipe-4cb2b6cfe87721be61e82c0594a09df01f010e44.tar.gz newspipe-4cb2b6cfe87721be61e82c0594a09df01f010e44.tar.bz2 newspipe-4cb2b6cfe87721be61e82c0594a09df01f010e44.zip | |
Merged in jaesivsm/pyaggr3g470r (pull request #9)
adding conf defaults and using conf in templates
Diffstat (limited to 'pyaggr3g470r/views/feed.py')
| -rw-r--r-- | pyaggr3g470r/views/feed.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pyaggr3g470r/views/feed.py b/pyaggr3g470r/views/feed.py index 846df06d..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', @@ -175,9 +176,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) |