diff --git a/progit/templates/login/admin_groups.html b/progit/templates/login/admin_groups.html index cd6a31d..4892ef7 100644 --- a/progit/templates/login/admin_groups.html +++ b/progit/templates/login/admin_groups.html @@ -4,6 +4,11 @@ {% block title %}Groups{% endblock %} {%block tag %}admin{% endblock %} +{% block header %} + +{% endblock %} + {% block content %}

Progit Groups

@@ -16,6 +21,7 @@ +
{% if groups %} {% else %}

No group found

{% endif %} +
{% endblock %} diff --git a/progit/ui/login.py b/progit/ui/login.py index 2579bd0..ea3282f 100644 --- a/progit/ui/login.py +++ b/progit/ui/login.py @@ -281,6 +281,7 @@ def admin_groups(): 'login/admin_groups.html', groups=groups, form=form, + conf_form=forms.ConfirmationForm(), ) @@ -363,6 +364,30 @@ def admin_group_user_delete(user, group): return flask.redirect(flask.url_for('.admin_group', group=group)) + +@APP.route('/admin/group//delete', methods=['POST']) +@admin_required +def admin_group_delete(group): + """ Delete a certain group + """ + # Add new user to the group if asked + form = forms.ConfirmationForm() + if form.validate_on_submit(): + group_obj = progit.lib.get_group(SESSION, group) + + if not group_obj: + flask.flash('No group `%s` found' % groupname, 'error') + return flask.redirect(flask.url_for('.admin_groups')) + + SESSION.delete(group_obj) + + SESSION.commit() + flask.flash( + 'Group `%s` has been deleted' % (group)) + + return flask.redirect(flask.url_for('.admin_groups')) + + # # Methods specific to local login. #