From 5d220e360454e7643eb5539fa329702cb5c273c5 Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Wed, 9 Apr 2014 20:14:33 +0200 Subject: Management of users via the administrator's account. --- pyaggr3g470r/templates/admin/create_user.html | 29 +++++++ pyaggr3g470r/templates/admin/dashboard.html | 44 ++++++++++ pyaggr3g470r/templates/admin/user.html | 49 +++++++++++ pyaggr3g470r/templates/home.html | 2 +- pyaggr3g470r/templates/layout.html | 3 + pyaggr3g470r/views.py | 120 +++++++++++++++++++++++++- 6 files changed, 245 insertions(+), 2 deletions(-) create mode 100644 pyaggr3g470r/templates/admin/create_user.html create mode 100644 pyaggr3g470r/templates/admin/dashboard.html create mode 100644 pyaggr3g470r/templates/admin/user.html (limited to 'pyaggr3g470r') diff --git a/pyaggr3g470r/templates/admin/create_user.html b/pyaggr3g470r/templates/admin/create_user.html new file mode 100644 index 00000000..5a6838bd --- /dev/null +++ b/pyaggr3g470r/templates/admin/create_user.html @@ -0,0 +1,29 @@ +{% extends "layout.html" %} +{% block head%} +{{super()}} +{% endblock %} +{% block content %} +
+
+

{{ message|safe }}

+
+ {{ form.hidden_tag() }} + + {{ form.firstname.label }} + {{ form.firstname(class_="form-control") }} {% for error in form.firstname.errors %} {{ error }}
{% endfor %} + + {{ form.lastname.label }} + {{ form.lastname(class_="form-control") }} {% for error in form.lastname.errors %} {{ error }}
{% endfor %} + + {{ form.email.label }} + {{ form.email(class_="form-control") }} {% for error in form.email.errors %} {{ error }}
{% endfor %} + + {{ form.password.label }} + {{ form.password(class_="form-control") }} {% for error in form.password.errors %} {{ error }}
{% endfor %} + +
+ {{ form.submit(class_="btn") }} +
+
+
+{% endblock %} \ No newline at end of file diff --git a/pyaggr3g470r/templates/admin/dashboard.html b/pyaggr3g470r/templates/admin/dashboard.html new file mode 100644 index 00000000..2913d603 --- /dev/null +++ b/pyaggr3g470r/templates/admin/dashboard.html @@ -0,0 +1,44 @@ +{% extends "layout.html" %} +{% block head%} +{{super()}} +{% endblock %} +{% block content %} +
+

Registered users

+ + + + + + + + + + + + {% for user in users|sort(attribute="firstname") %} + + + + + + + + {% endfor %} + +
#FirstnameLastnameEmailActions
{{ loop.index }}{{ user.firstname }}{{ user.lastname }}{{ user.email }} + + + {% if user.apikey == "" %} + + {% else %} + + {% endif %} + +
+
+Add a new user +

+

As an administrator you are not listed in this table.

+
+{% endblock %} \ No newline at end of file diff --git a/pyaggr3g470r/templates/admin/user.html b/pyaggr3g470r/templates/admin/user.html new file mode 100644 index 00000000..767ff460 --- /dev/null +++ b/pyaggr3g470r/templates/admin/user.html @@ -0,0 +1,49 @@ +{% extends "layout.html" %} +{% block head%} +{{super()}} +{% endblock %} +{% block content %} +
+
+ Edit this user +

Membership

+

Contributor since {{ user.date_created.strftime('%A, %d %B %Y') }}.

+

Last seen: {{ user.last_seen.strftime('%A, %d %B %Y at %H:%M:%S') }}.

+
+
+ {% if user.feeds.all()|count == 0 %} +

This user is not subscribed to any feed.

+ {% else %} +

Feeds

+ + + + + + + + + + + + + {% for feed in user.feeds|sort(attribute="name") %} + + + + + + + + {% endfor %} + +
#NameFeed linkSite linkNumber of articlesActions
{{ loop.index }}{{ feed.title }}{{ feed.link }}{{ feed.site_link }}{{ feed.articles.all()|count }} + + + +
+ {% endif %} + Add a new feed +
+
+{% endblock %} \ No newline at end of file diff --git a/pyaggr3g470r/templates/home.html b/pyaggr3g470r/templates/home.html index 223653c1..6363ee06 100644 --- a/pyaggr3g470r/templates/home.html +++ b/pyaggr3g470r/templates/home.html @@ -2,7 +2,7 @@ {% block content %}
{% if user.feeds.all()|count == 0 %} -

You are not subscribed to any feed. Fix this.

+

You are not subscribed to any feed. Fix this.

{% else %} {% for feed in user.feeds|sort(attribute="title") %}
diff --git a/pyaggr3g470r/templates/layout.html b/pyaggr3g470r/templates/layout.html index e89706e9..71572181 100644 --- a/pyaggr3g470r/templates/layout.html +++ b/pyaggr3g470r/templates/layout.html @@ -56,6 +56,9 @@
  • Management
    • + {% if g.user.is_admin() %} +
  • Dashboard
    • + {% endif %}
  • About
  • Logout
  • diff --git a/pyaggr3g470r/views.py b/pyaggr3g470r/views.py index 1a5d45a9..7ca3ac02 100644 --- a/pyaggr3g470r/views.py +++ b/pyaggr3g470r/views.py @@ -31,6 +31,7 @@ import datetime from flask import render_template, jsonify, request, flash, session, url_for, redirect, g, current_app, make_response from flask.ext.login import LoginManager, login_user, logout_user, login_required, current_user, AnonymousUserMixin from flask.ext.principal import Principal, Identity, AnonymousIdentity, identity_changed, identity_loaded, Permission, RoleNeed, UserNeed +from werkzeug import generate_password_hash import utils import export @@ -41,6 +42,10 @@ from forms import SigninForm, AddFeedForm, ProfileForm from pyaggr3g470r import app, db from pyaggr3g470r.models import User, Feed, Article, Role +Principal(app) +# Create a permission with a single Need, in this case a RoleNeed. +admin_permission = Permission(RoleNeed('admin')) + login_manager = LoginManager() login_manager.init_app(app) @@ -156,7 +161,7 @@ def logout(): identity_changed.send(current_app._get_current_object(), identity=AnonymousIdentity()) flash("Logged out successfully.", 'success') - return redirect(url_for('map_view')) + return redirect(url_for('login')) @app.route('/') @login_required @@ -556,3 +561,116 @@ def profile(): if request.method == 'GET': form = ProfileForm(obj=user) return render_template('profile.html', user=user, form=form) + + + +# +# Views dedicated to administration tasks. +# +@app.route('/admin/dashboard/', methods=['GET', 'POST']) +@login_required +@admin_permission.require() +def dashboard(): + """ + Adminstrator's dashboard. + """ + users = User.query.all() + users.remove(g.user) + return render_template('admin/dashboard.html', users=users) + +@app.route('/admin/create_user/', methods=['GET', 'POST']) +@app.route('/admin/edit_user//', methods=['GET', 'POST']) +@login_required +@admin_permission.require() +def create_user(user_id=None): + """ + Create or edit a user. + """ + form = ProfileForm() + + if request.method == 'POST': + if form.validate(): + if user_id != None: + # Edit a user + user = User.query.filter(User.id == user_id).first() + form.populate_obj(user) + if form.password.data != "": + user.set_password(form.password.data) + db.session.commit() + flash('User "' + user.firstname + '" successfully updated.', 'success') + else: + # Create a new user + role_user = Role.query.filter(Role.name == "user").first() + user = User(firstname=form.firstname.data, + lastname=form.lastname.data, + email=form.email.data, + pwdhash=generate_password_hash(form.password.data)) + user.roles.extend([role_user]) + db.session.add(user) + db.session.commit() + flash('User "' + user.firstname + '" successfully created.', 'success') + return redirect("/admin/edit_user/"+str(user.id)+"/") + else: + return render_template('profile.html', form=form) + + if request.method == 'GET': + if user_id != None: + user = User.query.filter(User.id == user_id).first() + form = ProfileForm(obj=user) + message = "Edit the user " + user.firstname + "" + else: + form = ProfileForm() + message="Add a new user" + return render_template('/admin/create_user.html', form=form, message=message) + +@app.route('/admin/user//', methods=['GET']) +@login_required +@admin_permission.require() +def user(user_id=None): + """ + See information about a user (stations, etc.). + """ + user = User.query.filter(User.id == user_id).first() + if user is not None: + return render_template('/admin/user.html', user=user) + else: + flash('This user does not exist.', 'danger') + return redirect(redirect_url()) + +@app.route('/admin/delete_user//', methods=['GET']) +@login_required +@admin_permission.require() +def delete_user(user_id=None): + """ + Delete a user (with its stations and measures). + """ + user = User.query.filter(User.id == user_id).first() + if user is not None: + db.session.delete(user) + db.session.commit() + flash('User "' + user.firstname + '" successfully deleted.', 'success') + else: + flash('This user does not exist.', 'danger') + return redirect(redirect_url()) + +@app.route('/admin/enable_user//', methods=['GET']) +@app.route('/admin/disable_user//', methods=['GET']) +@login_required +@admin_permission.require() +def disable_user(user_id=None): + """ + Enable or disable the API key of a user. + """ + user = User.query.filter(User.id == user_id).first() + if user is not None: + if user.apikey != "": + user.pwdhash = "" + flash(user.firstname + '" successfully disabled.', 'success') + else: + #import random, base64, hashlib + user.pwdhash = "newpass" + flash(user.firstname + '" successfully enabled.', 'success') + db.session.commit() + else: + flash('This user does not exist.', 'danger') + return redirect(redirect_url()) \ No newline at end of file -- cgit