diff options
| author | Cédric Bonhomme <cedric@cedricbonhomme.org> | 2016-04-06 23:59:01 +0200 |
|---|---|---|
| committer | Cédric Bonhomme <cedric@cedricbonhomme.org> | 2016-04-06 23:59:01 +0200 |
| commit | a0a3bda9340a57203391400a5ac32e87281e8a19 (patch) | |
| tree | 040d69d70cb9e2b649259052ecc1f6984b123db2 /src/web/controllers/feed.py | |
| parent | major problems fixed. (diff) | |
| parent | create a new user is now working (diff) | |
| download | newspipe-a0a3bda9340a57203391400a5ac32e87281e8a19.tar.gz newspipe-a0a3bda9340a57203391400a5ac32e87281e8a19.tar.bz2 newspipe-a0a3bda9340a57203391400a5ac32e87281e8a19.zip | |
Fixed merge conflicts.
Diffstat (limited to 'src/web/controllers/feed.py')
| -rw-r--r-- | src/web/controllers/feed.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/web/controllers/feed.py b/src/web/controllers/feed.py index 95b1eceb..a3f5cae7 100644 --- a/src/web/controllers/feed.py +++ b/src/web/controllers/feed.py @@ -84,7 +84,9 @@ class FeedController(AbstractController): def update(self, filters, attrs): from .article import ArticleController self._ensure_icon(attrs) - if 'category_id' in attrs: + if 'category_id' in attrs and attrs['category_id'] == 0: + del attrs['category_id'] + elif 'category_id' in attrs: art_contr = ArticleController(self.user_id) for feed in self.read(**filters): art_contr.update({'feed_id': feed.id}, |