From 462f6d3b21558ed0a283c24e0e0332eac6ccbbb3 Mon Sep 17 00:00:00 2001 From: François Schmidts Date: Fri, 11 Sep 2015 18:28:12 +0200 Subject: base modification in model for category support --- src/web/models/feed.py | 1 + 1 file changed, 1 insertion(+) (limited to 'src/web/models/feed.py') diff --git a/src/web/models/feed.py b/src/web/models/feed.py index 59456a7f..87616e02 100644 --- a/src/web/models/feed.py +++ b/src/web/models/feed.py @@ -56,6 +56,7 @@ class Feed(db.Model): # relationship icon_url = db.Column(db.String(), db.ForeignKey('icon.url'), default=None) user_id = db.Column(db.Integer(), db.ForeignKey('user.id')) + category_id = db.Column(db.Integer(), db.ForeignKey('category.id')) articles = db.relationship('Article', backref='source', lazy='dynamic', cascade='all,delete-orphan', order_by=desc("Article.date")) -- cgit From 2ca3246de2b7b54452ba7d996064ae32258f9cd3 Mon Sep 17 00:00:00 2001 From: François Schmidts Date: Mon, 12 Oct 2015 21:56:48 +0200 Subject: fixing sqlalchemy resolving warning --- src/web/models/feed.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/web/models/feed.py') diff --git a/src/web/models/feed.py b/src/web/models/feed.py index 87616e02..9d08a972 100644 --- a/src/web/models/feed.py +++ b/src/web/models/feed.py @@ -59,7 +59,7 @@ class Feed(db.Model): category_id = db.Column(db.Integer(), db.ForeignKey('category.id')) articles = db.relationship('Article', backref='source', lazy='dynamic', cascade='all,delete-orphan', - order_by=desc("Article.date")) + order_by=desc("date")) def __repr__(self): return '' % (self.title) -- cgit From 2c0e17cb977a1e8782799b337df8b1583d019906 Mon Sep 17 00:00:00 2001 From: François Schmidts Date: Mon, 12 Oct 2015 22:36:01 +0200 Subject: bootstraping react --- src/web/models/feed.py | 1 + 1 file changed, 1 insertion(+) (limited to 'src/web/models/feed.py') diff --git a/src/web/models/feed.py b/src/web/models/feed.py index 9d08a972..29d5bc4c 100644 --- a/src/web/models/feed.py +++ b/src/web/models/feed.py @@ -67,6 +67,7 @@ class Feed(db.Model): def dump(self): return {"id": self.id, "user_id": self.user_id, + "category_id": self.category_id, "title": self.title, "description": self.description, "link": self.link, -- cgit From 56ab5f6df51ff301a4dccc458eb83917bba49afc Mon Sep 17 00:00:00 2001 From: François Schmidts Date: Fri, 29 Jan 2016 00:27:47 +0100 Subject: wip right panel --- src/web/models/feed.py | 1 + 1 file changed, 1 insertion(+) (limited to 'src/web/models/feed.py') diff --git a/src/web/models/feed.py b/src/web/models/feed.py index 29d5bc4c..a9c49282 100644 --- a/src/web/models/feed.py +++ b/src/web/models/feed.py @@ -75,5 +75,6 @@ class Feed(db.Model): "etag": self.etag, "icon_url": self.icon_url, "error_count": self.error_count, + "created_date": self.created_date, "last_modified": self.last_modified, "last_retrieved": self.last_retrieved} -- cgit From f334fb4b355d90cbf0b8d9e658a87ebeec7fbe90 Mon Sep 17 00:00:00 2001 From: François Schmidts Date: Sat, 30 Jan 2016 01:44:13 +0100 Subject: wip redoing feed panel --- src/web/models/feed.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/web/models/feed.py') diff --git a/src/web/models/feed.py b/src/web/models/feed.py index a9c49282..c5fcbe4c 100644 --- a/src/web/models/feed.py +++ b/src/web/models/feed.py @@ -73,6 +73,8 @@ class Feed(db.Model): "link": self.link, "site_link": self.site_link, "etag": self.etag, + "enabled": self.enabled, + "filters": self.filters, "icon_url": self.icon_url, "error_count": self.error_count, "created_date": self.created_date, -- cgit From 64964d2fcfa73e18b1316d788bacd11e2180bb7d Mon Sep 17 00:00:00 2001 From: François Schmidts Date: Sun, 31 Jan 2016 18:59:36 +0100 Subject: handling errors from one page app --- src/web/models/feed.py | 1 + 1 file changed, 1 insertion(+) (limited to 'src/web/models/feed.py') diff --git a/src/web/models/feed.py b/src/web/models/feed.py index c5fcbe4c..7768ee50 100644 --- a/src/web/models/feed.py +++ b/src/web/models/feed.py @@ -77,6 +77,7 @@ class Feed(db.Model): "filters": self.filters, "icon_url": self.icon_url, "error_count": self.error_count, + "last_error": self.last_error, "created_date": self.created_date, "last_modified": self.last_modified, "last_retrieved": self.last_retrieved} -- cgit