diff --git a/pagure/templates/login/admin_groups.html b/pagure/templates/login/admin_groups.html deleted file mode 100644 index 970a482..0000000 --- a/pagure/templates/login/admin_groups.html +++ /dev/null @@ -1,51 +0,0 @@ -{% extends "master.html" %} -{% from "_formhelper.html" import render_field %} - -{% block title %}Groups{% endblock %} -{%block tag %}admin{% endblock %} - -{% block header %} - -{% endblock %} - -{% block content %} -

Pagure Groups

- -
-

Create a new group

-
- - {{ form.group_type()|safe }} - {{ form.csrf_token }} - -
-
- -
-{% if groups %} - -{% else %} -

No group found

-{% endif %} -
- -{% endblock %} diff --git a/pagure/templates/login/admin_users.html b/pagure/templates/login/admin_users.html deleted file mode 100644 index 6bf23a8..0000000 --- a/pagure/templates/login/admin_users.html +++ /dev/null @@ -1,54 +0,0 @@ -{% extends "master.html" %} -{% from "_formhelper.html" import render_field_in_row %} - -{% block title %}Users group {{ group.group_name }}{% endblock %} -{%block tag %}admin{% endblock %} - -{% block header %} - -{% endblock %} - -{% block content %} -

- Pagure Groups > - {{ group.group_name }} -

- -
-

Add an user to this group

-
- - {{ form.csrf_token }} - -
-
- -
-{% if group.users %} - -{% else %} -

No users found in this group

-{% endif %} -
- -{% endblock %} diff --git a/pagure/ui/admin.py b/pagure/ui/admin.py index 9b9a710..b824e80 100644 --- a/pagure/ui/admin.py +++ b/pagure/ui/admin.py @@ -85,149 +85,3 @@ def admin_generate_hook_token(): pagure.lib.generate_hook_token(SESSION) flask.flash('Hook token all re-generated') return flask.redirect(flask.url_for('admin_index')) - - - -@APP.route('/admin/groups', methods=['GET', 'POST']) -@admin_required -def admin_groups(): - """ List of the groups present in the system - """ - # Add new group if asked - group_types = [ - grp.group_type - for grp in pagure.lib.get_group_types(SESSION) - ] - # Make sure the admin type is always the last one - group_types.remove('admin') - group_types.append('admin') - form = pagure.forms.NewGroupForm(group_types=group_types) - user = pagure.lib.search_user(SESSION, username=flask.g.fas_user.username) - if not user: - return flask.abort(403) - - if form.validate_on_submit(): - grp = pagure.lib.model.PagureGroup() - form.populate_obj(obj=grp) - grp.user_id = user.id - SESSION.add(grp) - try: - SESSION.flush() - flask.flash('Group `%s` created.' % grp.group_name) - except SQLAlchemyError as err: - SESSION.rollback() - flask.flash('Could not create group.') - APP.logger.debug('Could not create group.') - APP.logger.exception(err) - - SESSION.commit() - - groups = pagure.lib.search_groups(SESSION) - - return flask.render_template( - 'login/admin_groups.html', - groups=groups, - form=form, - conf_form=pagure.forms.ConfirmationForm(), - ) - - -@APP.route('/admin/group/', methods=['GET', 'POST']) -@admin_required -def admin_group(group): - """ List of the users in a certain group - """ - group_obj = pagure.lib.search_groups(SESSION, group_name=group) - - if not group_obj: - flask.flash('No group `%s` found' % group, 'error') - return flask.redirect(flask.url_for('.admin_groups')) - - # Add new user to the group if asked - form = pagure.forms.AddUserForm() - if form.validate_on_submit(): - user = pagure.lib.search_user(SESSION, username=form.user.data) - if not user: - flask.flash('No user `%s` found' % form.user.data, 'error') - return flask.redirect(flask.url_for('.admin_group', group=group)) - - grp = pagure.lib.model.PagureUserGroup( - group_id=group_obj.id, - user_id=user.id - ) - SESSION.add(grp) - try: - SESSION.flush() - except SQLAlchemyError as err: - SESSION.rollback() - flask.flash( - 'Could not add user `%s` to group `%s`.' % ( - user.user, group_obj.group_name), - 'error') - APP.logger.debug( - 'Could not add user `%s` to group `%s`.' % ( - user.user, group_obj.group_name)) - APP.logger.exception(err) - - flask.flash('User `%s` added.' % user.user) - SESSION.commit() - - return flask.render_template( - 'login/admin_users.html', - form=form, - conf_form=pagure.forms.ConfirmationForm(), - group=group_obj, - ) - - -@APP.route('/admin/group///delete', methods=['POST']) -@admin_required -def admin_group_user_delete(user, group): - """ Delete an user from a certain group - """ - # Add new user to the group if asked - form = pagure.forms.ConfirmationForm() - if form.validate_on_submit(): - group_obj = pagure.lib.search_groups(SESSION, group_name=group) - - if not group_obj: - flask.flash('No group `%s` found' % group, 'error') - return flask.redirect(flask.url_for('.admin_groups')) - - user = pagure.lib.search_user(SESSION, username=user) - if not user: - flask.flash('No user `%s` found' % user, 'error') - return flask.redirect(flask.url_for('.admin_groups')) - - user_grp = pagure.lib.get_user_group( - SESSION, user.id, group_obj.id) - SESSION.delete(user_grp) - - SESSION.commit() - flask.flash( - 'User `%s` removed from the group `%s`' % (user.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 = pagure.forms.ConfirmationForm() - if form.validate_on_submit(): - group_obj = pagure.lib.search_groups(SESSION, group_name=group) - - if not group_obj: - flask.flash('No group `%s` found' % group, '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'))