aboutsummaryrefslogtreecommitdiff
path: root/pyaggr3g470r/views
diff options
context:
space:
mode:
authorFrançois Schmidts <francois.schmidts@gmail.com>2015-04-12 21:44:20 +0200
committerFrançois Schmidts <francois.schmidts@gmail.com>2015-04-14 08:49:15 +0200
commitdc0cf1a2789293bb3459ea8fe1f611edda075eba (patch)
treeaf1755fb38baac94c3efa37eacc11e0d04c2a6dc /pyaggr3g470r/views
parentRemoved a link pointing to a deleted page. (diff)
downloadnewspipe-dc0cf1a2789293bb3459ea8fe1f611edda075eba.tar.gz
newspipe-dc0cf1a2789293bb3459ea8fe1f611edda075eba.tar.bz2
newspipe-dc0cf1a2789293bb3459ea8fe1f611edda075eba.zip
redoing conf gathering and using it in templates
Diffstat (limited to 'pyaggr3g470r/views')
-rw-r--r--pyaggr3g470r/views/feed.py5
-rw-r--r--pyaggr3g470r/views/views.py7
2 files changed, 5 insertions, 7 deletions
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)
diff --git a/pyaggr3g470r/views/views.py b/pyaggr3g470r/views/views.py
index 1918b1b5..e70a8c6f 100644
--- a/pyaggr3g470r/views/views.py
+++ b/pyaggr3g470r/views/views.py
@@ -139,6 +139,7 @@ def get_timezone():
except:
return conf.TIME_ZONE["en"]
+
@app.context_processor
def inject_feed_form():
"""
@@ -147,8 +148,7 @@ def inject_feed_form():
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(),
- on_heroku=conf.ON_HEROKU)
+ return dict(create_feed_form=AddFeedForm())
#
# Views.
@@ -285,8 +285,7 @@ def home(favorites=False):
return render_template('home.html', gen_url=gen_url, feed_id=feed_id,
filter_=filter_, limit=limit, feeds=feeds,
unread=unread, articles=articles, in_error=in_error,
- head_title=head_title, favorites=favorites,
- default_max_error = conf.DEFAULT_MAX_ERROR)
+ head_title=head_title, favorites=favorites)
@app.route('/favorites')
bgstack15