From c26861527b69182d549e16ff7d09bcb98016affe Mon Sep 17 00:00:00 2001 From: Lephe Date: Thu, 26 May 2022 20:16:29 +0100 Subject: [PATCH] admin: remove trophy edition interface (#82) It was decided to keep using the master script to update them. --- app/routes/__init__.py | 2 +- app/routes/admin/trophies.py | 77 ------------------------- app/templates/admin/delete_trophy.html | 28 --------- app/templates/admin/edit_trophy.html | 58 ------------------- app/templates/admin/index.html | 1 - app/templates/admin/trophies.html | 80 -------------------------- 6 files changed, 1 insertion(+), 245 deletions(-) delete mode 100644 app/routes/admin/trophies.py delete mode 100644 app/templates/admin/delete_trophy.html delete mode 100644 app/templates/admin/edit_trophy.html delete mode 100644 app/templates/admin/trophies.html diff --git a/app/routes/__init__.py b/app/routes/__init__.py index b2d87e5..df23730 100644 --- a/app/routes/__init__.py +++ b/app/routes/__init__.py @@ -2,7 +2,7 @@ from app.routes import index, search, users, tools, development from app.routes.account import login, account, notification, polls -from app.routes.admin import index, groups, account, trophies, forums, \ +from app.routes.admin import index, groups, account, forums, \ attachments, config, members, polls, login_as from app.routes.forum import index, topic from app.routes.polls import vote, delete diff --git a/app/routes/admin/trophies.py b/app/routes/admin/trophies.py deleted file mode 100644 index b0ac084..0000000 --- a/app/routes/admin/trophies.py +++ /dev/null @@ -1,77 +0,0 @@ -from flask import request, flash, redirect, url_for -from app.utils.priv_required import priv_required -from app.models.trophy import Trophy, Title -from app.forms.trophy import TrophyForm, DeleteTrophyForm -from app.utils.render import render -from app import app, db - - -@app.route('/admin/trophees', methods=['GET', 'POST']) -@priv_required('misc.admin-panel', 'edit.trophies') -def adm_trophies(): - form = TrophyForm() - if request.method == "POST": - if form.validate_on_submit(): - is_title = form.title.data - if is_title: - trophy = Title(form.name.data, form.desc.data, - form.hidden.data, form.css.data) - else: - trophy = Trophy(form.name.data, form.desc.data, - form.hidden.data) - db.session.add(trophy) - db.session.commit() - flash(f'Nouveau {["trophée", "titre"][is_title]} ajouté', 'ok') - else: - flash('Erreur lors de la création du trophée', 'error') - - trophies = Trophy.query.all() - return render('admin/trophies.html', trophies=trophies, - form=form) - - -@app.route('/admin/trophees//editer', methods=['GET', 'POST']) -@priv_required('misc.admin-panel', 'edit.trophies') -def adm_edit_trophy(trophy_id): - trophy = Trophy.query.filter_by(id=trophy_id).first_or_404() - - form = TrophyForm() - if request.method == "POST": - if form.validate_on_submit(): - is_title = form.title.data != "" - if is_title: - trophy.name = form.name.data - trophy.description = form.desc.data - trophy.title = form.title.data - trophy.hidden = form.hidden.data - trophy.css = form.css.data - else: - trophy.name = form.name.data - trophy.description = form.desc.data - trophy.hidden = form.hidden.data - db.session.merge(trophy) - db.session.commit() - flash(f'{["Trophée", "Titre"][is_title]} modifié', 'ok') - return redirect(url_for('adm_trophies')) - else: - flash('Erreur lors de la création du trophée', 'error') - return render('admin/edit_trophy.html', trophy=trophy, form=form) - - -@app.route('/admin/trophees//supprimer', methods=['GET', 'POST']) -@priv_required('misc.admin-panel', 'edit.trophies') -def adm_delete_trophy(trophy_id): - trophy = Trophy.query.filter_by(id=trophy_id).first_or_404() - - # TODO: Add an overview of what will be deleted. - del_form = DeleteTrophyForm() - if request.method == "POST": - if del_form.validate_on_submit(): - trophy.delete() - db.session.commit() - flash('Trophée supprimé', 'ok') - return redirect(url_for('adm_trophies')) - else: - flash('Erreur lors de la suppression du trophée', 'error') - del_form.delete.data = False # Force to tick to delete the trophy - return render('admin/delete_trophy.html', trophy=trophy, del_form=del_form) diff --git a/app/templates/admin/delete_trophy.html b/app/templates/admin/delete_trophy.html deleted file mode 100644 index 9fdde33..0000000 --- a/app/templates/admin/delete_trophy.html +++ /dev/null @@ -1,28 +0,0 @@ -{% extends "base/base.html" %} - -{% block title %} -Panneau d'administration » Titres et trophées »

Suppression du trophée '{{ trophy.name }}'

-{% endblock %} - -{% block content %} -
-

Confirmer la suppression du trophée

-

Le trophée '{{ trophy.name }}' que vous allez supprimer est lié à :

-
    -
  • {{ trophy.owners | length }} membre{{ trophy.owners|length|pluralize }}
  • -
- -
- {{ del_form.hidden_tag() }} -
- {{ del_form.delete.label }} - {{ del_form.delete(checked=False) }} -
{{ del_form.delete.description }}
- {% for error in del_form.delete.errors %} - {{ error }} - {% endfor %} -
-
{{ del_form.submit(class_="bg-error") }}
-
-
-{% endblock %} diff --git a/app/templates/admin/edit_trophy.html b/app/templates/admin/edit_trophy.html deleted file mode 100644 index ec4f375..0000000 --- a/app/templates/admin/edit_trophy.html +++ /dev/null @@ -1,58 +0,0 @@ -{% extends "base/base.html" %} - -{% block title %} -Panneau d'administration » Titres et trophées »

Édition du trophée '{{ trophy.name }}'

-{% endblock %} - -{% block content %} -
-
- {{ form.hidden_tag() }} -

Éditer le trophée

- -
- - {{ trophy.name }} -
- -
- {{ form.name.label }} - {{ form.name(value=trophy.name) }} - {% for error in form.name.errors %} - {{ error }} - {% endfor %} -
-
- {{ form.desc.label }} - {{ form.desc(value=trophy.description) }} - {% for error in form.desc.errors %} - {{ error }} - {% endfor %} -
-
- {{ form.hidden.label }} - {{ form.hidden(checked=trophy.hidden) }} -
{{ form.hidden.description }}
- {% for error in form.hidden.errors %} - {{ error }} - {% endfor %} -
-
- {{ form.title.label }} - {{ form.title() }} -
{{ form.title.description }}
- {% for error in form.title.errors %} - {{ error }} - {% endfor %} -
-
- {{ form.css.label }} -
{{ form.css.description }}
- {{ form.css(value=trophy.css) }} - {% for error in form.css.errors %} - {{ error }} - {% endfor %} -
-
{{ form.submit(class_="bg-ok") }}
-
-{% endblock %} diff --git a/app/templates/admin/index.html b/app/templates/admin/index.html index 6cc7a28..d0d57cc 100644 --- a/app/templates/admin/index.html +++ b/app/templates/admin/index.html @@ -10,7 +10,6 @@
  • Groupes et privilèges
  • Liste des membres
  • -
  • Titres et trophées
  • Arbre des forums
  • Sondages
  • Pièces-jointes
  • diff --git a/app/templates/admin/trophies.html b/app/templates/admin/trophies.html deleted file mode 100644 index c6f2349..0000000 --- a/app/templates/admin/trophies.html +++ /dev/null @@ -1,80 +0,0 @@ -{% extends "base/base.html" %} - -{% block title %} -Panneau d'administration »

    Titres et trophées

    -{% endblock %} - -{% block content %} -
    -

    Cette page présente une vue d'ensemble des titres et trophées. Les - conditions d'obtention exactes des trophées sont définies dans le code et - non dans la base de données.

    - -

    Titres et trophées

    - - - - - - {% for trophy in trophies %} - - - {% if trophy | is_title %} - - {% else %} - - {% endif %} - - - - - {% endfor %} -
    NomTitreStyleModifierSupprimer
    - {{ trophy.name }}{{ trophy.name }}OuiNon{{ trophy.css }}ModifierSupprimer
    -
    - -
    - - {{ form.hidden_tag() }} -

    Nouveau trophée

    -
    - {{ form.name.label }} - {{ form.name }} - {% for error in form.name.errors %} - {{ error }} - {% endfor %} -
    -
    - {{ form.desc.label }} - {{ form.desc }} - {% for error in form.desc.errors %} - {{ error }} - {% endfor %} -
    -
    - {{ form.hidden.label }} - {{ form.hidden }} -
    {{ form.hidden.description }}
    - {% for error in form.hidden.errors %} - {{ error }} - {% endfor %} -
    -
    - {{ form.title.label }} - {{ form.title }} -
    {{ form.title.description }}
    - {% for error in form.title.errors %} - {{ error }} - {% endfor %} -
    -
    - {{ form.css.label }} -
    {{ form.css.description }}
    - {{ form.css }} - {% for error in form.css.errors %} - {{ error }} - {% endfor %} -
    -
    {{ form.submit(class_="bg-ok") }}
    -
    -{% endblock %}