aboutsummaryrefslogtreecommitdiff
path: root/src/web/views/user.py
diff options
context:
space:
mode:
authorCédric Bonhomme <cedric@cedricbonhomme.org>2016-03-01 22:47:53 +0100
committerCédric Bonhomme <cedric@cedricbonhomme.org>2016-03-01 22:47:53 +0100
commit83081ad7e488c44757e43ff40e83458a2e1451ed (patch)
tree176b04327df88b899aa4172aa30d042a0e43b32a /src/web/views/user.py
parentUseless if no category set. (diff)
downloadnewspipe-83081ad7e488c44757e43ff40e83458a2e1451ed.tar.gz
newspipe-83081ad7e488c44757e43ff40e83458a2e1451ed.tar.bz2
newspipe-83081ad7e488c44757e43ff40e83458a2e1451ed.zip
begin integration of the new architecture
Diffstat (limited to 'src/web/views/user.py')
-rw-r--r--src/web/views/user.py22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/web/views/user.py b/src/web/views/user.py
index 06dc2089..24f9bedb 100644
--- a/src/web/views/user.py
+++ b/src/web/views/user.py
@@ -3,7 +3,7 @@ import random
from flask import (Blueprint, g, render_template, redirect,
flash, url_for, request)
from flask.ext.babel import gettext
-from flask.ext.login import login_required
+from flask.ext.login import login_required, current_user
import conf
from web import utils, notifications
@@ -30,9 +30,9 @@ def management():
flash(gettext('File not allowed.'), 'danger')
else:
try:
- nb = utils.import_opml(g.user.email, data.read())
+ nb = utils.import_opml(current_user.email, data.read())
if conf.CRAWLING_METHOD == "classic":
- utils.fetch(g.user.email, None)
+ utils.fetch(current_user.email, None)
flash(str(nb) + ' ' + gettext('feeds imported.'),
"success")
flash(gettext("Downloading articles..."), 'info')
@@ -46,7 +46,7 @@ def management():
flash(gettext('File not allowed.'), 'danger')
else:
try:
- nb = utils.import_json(g.user.email, data.read())
+ nb = utils.import_json(current_user.email, data.read())
flash(gettext('Account imported.'), "success")
except:
flash(gettext("Impossible to import the account."),
@@ -54,11 +54,11 @@ def management():
else:
flash(gettext('File not allowed.'), 'danger')
- nb_feeds = FeedController(g.user.id).read().count()
- art_contr = ArticleController(g.user.id)
+ nb_feeds = FeedController(current_user.id).read().count()
+ art_contr = ArticleController(current_user.id)
nb_articles = art_contr.read().count()
nb_unread_articles = art_contr.read(readed=False).count()
- return render_template('management.html', user=g.user,
+ return render_template('management.html', user=current_user,
nb_feeds=nb_feeds, nb_articles=nb_articles,
nb_unread_articles=nb_unread_articles)
@@ -69,13 +69,13 @@ def profile():
"""
Edit the profile of the currently logged user.
"""
- user_contr = UserController(g.user.id)
- user = user_contr.get(id=g.user.id)
+ user_contr = UserController(current_user.id)
+ user = user_contr.get(id=current_user.id)
form = ProfileForm()
if request.method == 'POST':
if form.validate():
- user_contr.update({'id': g.user.id},
+ user_contr.update({'id': current_user.id},
{'nickname': form.nickname.data,
'email': form.email.data,
'password': form.password.data,
@@ -98,7 +98,7 @@ def delete_account():
"""
Delete the account of the user (with all its data).
"""
- UserController(g.user.id).delete(g.user.id)
+ UserController(current_user.id).delete(current_user.id)
flash(gettext('Your account has been deleted.'), 'success')
return redirect(url_for('login'))
bgstack15