Updated URL Logic for admin package

app/admin/views.py

@@ -5,64 +5,51 @@ from app.tables import AdminUserItem, AdminUserTable
 from app.profile.background_functions import delete_user_
 from flask import current_app, flash, redirect, render_template, url_for
 from flask_login import login_required
+from threading import Thread
 from . import admin
 from .forms import EditProfileAdminForm
-import threading
 
 
-@admin.route('/overview', methods=['GET', 'POST'])
+@admin.route('/board')
 @login_required
 @admin_required
-def for_admins_only():
-    users = User.query.order_by(User.username).all()
+def board():
+    users = User.query.all()
     items = [AdminUserItem(u.username, u.email, u.role_id, u.confirmed, u.id)
              for u in users]
     # Convert table object to html string
     table = AdminUserTable(items).__html__()
     # Add class "list" to tbody element. Needed for "List.js"
     table = table.replace('tbody', 'tbody class="list"', 1)
-    return render_template('admin/admin.html.j2',
-                           table=table,
-                           title='Administration tools')
+    return render_template('admin/board.html.j2', table=table,
+                           title='Admin board')
 
 
-@admin.route('/overview/admin_user_page/<int:user_id>',
-             methods=['GET', 'POST'])
+@admin.route('/user/<int:user_id>')
 @login_required
 @admin_required
-def admin_user_page(user_id):
-    selected_user = User.query.get_or_404(user_id)
-    title = 'Administration of user {} with ID: {}'.format(
-        selected_user.username,
-        selected_user.id
-    )
-    registration_date = selected_user.registration_date.strftime(
-        '%A, %e %B %H:%M'
-    )
-    return render_template('admin/admin_user_page.html.j2',
-                           registration_date=registration_date,
-                           selected_user=selected_user,
-                           title=title)
+def user(user_id):
+    user = User.query.get_or_404(user_id)
+    return render_template('admin/user.html.j2', title='Administrate user',
+                           user=user)
 
 
-@admin.route('/overview/admin_user_page/delete/<int:user_id>',
-             methods=['GET', 'POST'])
+@admin.route('/user/<int:user_id>/delete')
 @login_required
 @admin_required
-def admin_delete_user(user_id):
-    delete_thread = threading.Thread(target=delete_user_,
-                                     args=(current_app._get_current_object(),
-                                           user_id))
-    delete_thread.start()
-    flash('User {} has been deleted!'.format(user_id))
-    return redirect(url_for('admin.for_admins_only'))
+def delete_user(user_id):
+    user = User.query.get_or_404(user_id)
+    thread = Thread(target=delete_user_,
+                    args=(current_app._get_current_object(), user.id))
+    thread.start()
+    flash('User has been deleted!')
+    return redirect(url_for('admin.board'))
 
 
-@admin.route('/overview/admin_user_page/edit_profile_admin/<int:user_id>',
-             methods=['GET', 'POST'])
+@admin.route('/user/<int:user_id>/edit', methods=['GET', 'POST'])
 @login_required
 @admin_required
-def edit_profile_admin(user_id):
+def edit_user(user_id):
     user = User.query.get_or_404(user_id)
     form = EditProfileAdminForm(user=user)
     if form.validate_on_submit():
@@ -73,16 +60,10 @@ def edit_profile_admin(user_id):
         db.session.add(user)
         db.session.commit()
         flash('The profile has been updated.')
-        return redirect(url_for('admin.edit_profile_admin', user_id=user.id))
+        return redirect(url_for('admin.edit_user', user_id=user.id))
     form.email.data = user.email
     form.username.data = user.username
     form.confirmed.data = user.confirmed
     form.role.data = user.role_id
-    title = 'Edit profile of user {} with ID {}'.format(
-        user.username,
-        user.id
-    )
-    return render_template('admin/edit_profile_admin.html.j2',
-                           form=form,
-                           title=title,
-                           user=user)
+    return render_template('admin/edit_user.html.j2', form=form,
+                           title='Edit user', user=user)