diff options
| author | François Schmidts <francois.schmidts@gmail.com> | 2015-03-03 23:30:16 +0100 |
|---|---|---|
| committer | François Schmidts <francois.schmidts@gmail.com> | 2015-03-03 23:30:16 +0100 |
| commit | 41cb78173636e0f6f463280afdf050583dbdb3dc (patch) | |
| tree | 42224fe408d3048f210b565413feb34bfe08940c /pyaggr3g470r/views | |
| parent | last fixes (diff) | |
| parent | Typo. (diff) | |
| download | newspipe-41cb78173636e0f6f463280afdf050583dbdb3dc.tar.gz newspipe-41cb78173636e0f6f463280afdf050583dbdb3dc.tar.bz2 newspipe-41cb78173636e0f6f463280afdf050583dbdb3dc.zip | |
Merge remote-tracking branch 'origin/master' into evol/api
Conflicts:
bootstrap.py
pyaggr3g470r/models.py
pyaggr3g470r/notifications.py
pyaggr3g470r/rest.py
Diffstat (limited to 'pyaggr3g470r/views')
| -rw-r--r-- | pyaggr3g470r/views/api/feed.py | 1 | ||||
| -rw-r--r-- | pyaggr3g470r/views/views.py | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/pyaggr3g470r/views/api/feed.py b/pyaggr3g470r/views/api/feed.py index 625ad52d..898e30b0 100644 --- a/pyaggr3g470r/views/api/feed.py +++ b/pyaggr3g470r/views/api/feed.py @@ -13,7 +13,6 @@ FEED_ATTRS = {'title': {'type': str}, 'description': {'type': str}, 'link': {'type': str}, 'site_link': {'type': str}, - 'email_notification': {'type': bool, 'default': False}, 'enabled': {'type': bool, 'default': True}, 'etag': {'type': str, 'default': ''}, 'last_modified': {'type': str}, diff --git a/pyaggr3g470r/views/views.py b/pyaggr3g470r/views/views.py index 0f8fc04d..d42d5db8 100644 --- a/pyaggr3g470r/views/views.py +++ b/pyaggr3g470r/views/views.py @@ -571,8 +571,7 @@ def edit_feed(feed_id=None): existing_feed = [f for f in g.user.feeds if feed.link == form.link.data] if len(existing_feed) == 0: new_feed = Feed(title=form.title.data, description="", link=form.link.data, \ - site_link=form.site_link.data, email_notification=form.email_notification.data, \ - enabled=form.enabled.data) + site_link=form.site_link.data, enabled=form.enabled.data) g.user.feeds.append(new_feed) #user.feeds = sorted(user.feeds, key=lambda t: t.title.lower()) db.session.commit() |