From b32ca6c0f5968f5e9f59847db5012e3ef7f98631 Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Wed, 2 Mar 2016 08:25:52 +0100 Subject: Code update. Some problems with CSRF token on Chromium... --- src/web/controllers/user.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/web/controllers') diff --git a/src/web/controllers/user.py b/src/web/controllers/user.py index ee2eb4c2..1b5c123e 100644 --- a/src/web/controllers/user.py +++ b/src/web/controllers/user.py @@ -1,9 +1,10 @@ -import random -import hashlib +import logging from werkzeug import generate_password_hash, check_password_hash from .abstract import AbstractController from web.models import User +logger = logging.getLogger(__name__) + class UserController(AbstractController): _db_cls = User @@ -11,7 +12,7 @@ class UserController(AbstractController): def _handle_password(self, attrs): if attrs.get('password'): - attrs['pwdhash'] = generate_password_hash(attrs.pop('password')) + attrs['password'] = generate_password_hash(attrs.pop('password')) elif 'password' in attrs: del attrs['password'] -- cgit From 0187a4f32f2af5b535b0d87e4a3a1bdf9c5806b5 Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Tue, 22 Mar 2016 13:36:49 +0100 Subject: check the value of 'category_id'. --- src/web/controllers/feed.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/web/controllers') diff --git a/src/web/controllers/feed.py b/src/web/controllers/feed.py index 95b1eceb..b78d6928 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 not attrs['category_id'] or attrs['category_id'] == 0: + del attrs['category_id'] + else: art_contr = ArticleController(self.user_id) for feed in self.read(**filters): art_contr.update({'feed_id': feed.id}, -- cgit From 3e9d26b704e4435a644255ffac9fae106fe9c09c Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Tue, 22 Mar 2016 14:23:06 +0100 Subject: fix... --- src/web/controllers/feed.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/web/controllers') diff --git a/src/web/controllers/feed.py b/src/web/controllers/feed.py index b78d6928..4bb683e0 100644 --- a/src/web/controllers/feed.py +++ b/src/web/controllers/feed.py @@ -84,9 +84,10 @@ class FeedController(AbstractController): def update(self, filters, attrs): from .article import ArticleController self._ensure_icon(attrs) - if not attrs['category_id'] or attrs['category_id'] == 0: + if 'category_id' in attrs and attrs['category_id'] == 0: del attrs['category_id'] - else: + elif 'category_id' in attrs: + print(attrs['category_id']) art_contr = ArticleController(self.user_id) for feed in self.read(**filters): art_contr.update({'feed_id': feed.id}, -- cgit From 3d199ce8955c035a5a1bc4569058e2f84ef9cfe0 Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Tue, 22 Mar 2016 14:30:54 +0100 Subject: fixes --- src/web/controllers/feed.py | 1 - 1 file changed, 1 deletion(-) (limited to 'src/web/controllers') diff --git a/src/web/controllers/feed.py b/src/web/controllers/feed.py index 4bb683e0..a3f5cae7 100644 --- a/src/web/controllers/feed.py +++ b/src/web/controllers/feed.py @@ -87,7 +87,6 @@ class FeedController(AbstractController): if 'category_id' in attrs and attrs['category_id'] == 0: del attrs['category_id'] elif 'category_id' in attrs: - print(attrs['category_id']) art_contr = ArticleController(self.user_id) for feed in self.read(**filters): art_contr.update({'feed_id': feed.id}, -- cgit