aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bonhomme <cedric@cedricbonhomme.org>2015-03-09 13:35:33 +0100
committerCédric Bonhomme <cedric@cedricbonhomme.org>2015-03-09 13:35:33 +0100
commit7a3c694e4b62ea73df023fe8a675896bd70ce1e5 (patch)
treede35e2a9ccf7ae14276dc121ff9133a83d0845a8
parentTest (diff)
downloadnewspipe-7a3c694e4b62ea73df023fe8a675896bd70ce1e5.tar.gz
newspipe-7a3c694e4b62ea73df023fe8a675896bd70ce1e5.tar.bz2
newspipe-7a3c694e4b62ea73df023fe8a675896bd70ce1e5.zip
Bug fix.
-rw-r--r--pyaggr3g470r/models/feed.py2
-rw-r--r--pyaggr3g470r/views/views.py9
2 files changed, 2 insertions, 9 deletions
diff --git a/pyaggr3g470r/models/feed.py b/pyaggr3g470r/models/feed.py
index 24542c28..9002aec3 100644
--- a/pyaggr3g470r/models/feed.py
+++ b/pyaggr3g470r/models/feed.py
@@ -47,7 +47,7 @@ class Feed(db.Model):
# cache handling
etag = db.Column(db.String(), default="")
- last_modified = db.Column(db.String(), default="")
+ last_modified = db.Column(db.DateTime(), default=datetime.now)
last_retrieved = db.Column(db.DateTime(), default=datetime(1970, 1, 1))
# error logging
diff --git a/pyaggr3g470r/views/views.py b/pyaggr3g470r/views/views.py
index 579d1e1b..9d368c42 100644
--- a/pyaggr3g470r/views/views.py
+++ b/pyaggr3g470r/views/views.py
@@ -574,18 +574,11 @@ def edit_feed(feed_id=None):
# Create a new feed
existing_feed = [f for f in g.user.feeds if f.link == form.link.data]
if len(existing_feed) == 0:
- print("Test 1")
new_feed = Feed(title=form.title.data, description="", link=form.link.data, \
site_link=form.site_link.data, enabled=form.enabled.data)
- print("Test 2")
g.user.feeds.append(new_feed)
#user.feeds = sorted(user.feeds, key=lambda t: t.title.lower())
- print("Test 3")
- try:
- db.session.commit()
- except Ecxeption as e:
- print(e)
- print("Test 4")
+ db.session.commit()
flash(gettext('Feed successfully created.'), 'success')
utils.fetch(g.user.id, Feed.query.filter(Feed.link == form.link.data).first().id)
bgstack15