|
|
|
@ -31,7 +31,7 @@ from datetime import datetime, timedelta
|
|
|
|
|
|
|
|
|
|
from babel import Locale as LC
|
|
|
|
|
from babel.dates import format_datetime
|
|
|
|
|
from flask import Blueprint, flash, redirect, url_for, abort, request, make_response, send_from_directory, g
|
|
|
|
|
from flask import Blueprint, flash, redirect, url_for, abort, request, make_response, send_from_directory, g, Response
|
|
|
|
|
from flask_login import login_required, current_user, logout_user, confirm_login
|
|
|
|
|
from flask_babel import gettext as _
|
|
|
|
|
from sqlalchemy import and_
|
|
|
|
@ -277,12 +277,19 @@ def list_users():
|
|
|
|
|
response.headers["Content-Type"] = "application/json; charset=utf-8"
|
|
|
|
|
return response
|
|
|
|
|
|
|
|
|
|
@admi.route("/ajax/deleteuser")
|
|
|
|
|
@admi.route("/ajax/deleteuser", methods=['POST'])
|
|
|
|
|
@login_required
|
|
|
|
|
@admin_required
|
|
|
|
|
def delete_user():
|
|
|
|
|
# ToDo User delete check also not last one
|
|
|
|
|
return ""
|
|
|
|
|
user_id = request.values.get('userid', -1)
|
|
|
|
|
content = ub.session.query(ub.User).filter(ub.User.id == int(user_id)).one_or_none()
|
|
|
|
|
try:
|
|
|
|
|
message = _delete_user(content)
|
|
|
|
|
return Response(json.dumps({'type': "success", 'message': message}), mimetype='application/json')
|
|
|
|
|
except Exception as ex:
|
|
|
|
|
return Response(json.dumps({'type': "danger", 'message':str(ex)}), mimetype='application/json')
|
|
|
|
|
log.error("User not found")
|
|
|
|
|
return Response(json.dumps({'type': "danger", 'message':_("User not found")}), mimetype='application/json')
|
|
|
|
|
|
|
|
|
|
@admi.route("/ajax/getlocale")
|
|
|
|
|
@login_required
|
|
|
|
@ -1194,22 +1201,29 @@ def _handle_new_user(to_save, content, languages, translations, kobo_support):
|
|
|
|
|
ub.session.rollback()
|
|
|
|
|
flash(_(u"Settings DB is not Writeable"), category="error")
|
|
|
|
|
|
|
|
|
|
def _delete_user(content):
|
|
|
|
|
if ub.session.query(ub.User).filter(ub.User.role.op('&')(constants.ROLE_ADMIN) == constants.ROLE_ADMIN,
|
|
|
|
|
ub.User.id != content.id).count():
|
|
|
|
|
if content.name != "Guest":
|
|
|
|
|
ub.session.query(ub.User).filter(ub.User.id == content.id).delete()
|
|
|
|
|
ub.session_commit()
|
|
|
|
|
log.info(u"User {} deleted".format(content.name))
|
|
|
|
|
return(_(u"User '%(nick)s' deleted", nick=content.name))
|
|
|
|
|
else:
|
|
|
|
|
log.warning(_(u"Can't delete Guest User"))
|
|
|
|
|
raise Exception(_(u"Can't delete Guest User"))
|
|
|
|
|
else:
|
|
|
|
|
log.warning(u"No admin user remaining, can't delete user")
|
|
|
|
|
raise Exception(_(u"No admin user remaining, can't delete user"))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def _handle_edit_user(to_save, content, languages, translations, kobo_support):
|
|
|
|
|
if to_save.get("delete"):
|
|
|
|
|
if ub.session.query(ub.User).filter(ub.User.role.op('&')(constants.ROLE_ADMIN) == constants.ROLE_ADMIN,
|
|
|
|
|
ub.User.id != content.id).count():
|
|
|
|
|
if content.name != "Guest":
|
|
|
|
|
ub.session.query(ub.User).filter(ub.User.id == content.id).delete()
|
|
|
|
|
ub.session_commit()
|
|
|
|
|
flash(_(u"User '%(nick)s' deleted", nick=content.name), category="success")
|
|
|
|
|
return redirect(url_for('admin.admin'))
|
|
|
|
|
else:
|
|
|
|
|
flash(_(u"Can't delete Guest User"), category="error")
|
|
|
|
|
return redirect(url_for('admin.admin'))
|
|
|
|
|
else:
|
|
|
|
|
flash(_(u"No admin user remaining, can't delete user", nick=content.name), category="error")
|
|
|
|
|
return redirect(url_for('admin.admin'))
|
|
|
|
|
try:
|
|
|
|
|
flash(_delete_user(content), category="success")
|
|
|
|
|
except Exception as ex:
|
|
|
|
|
flash(str(ex), category="error")
|
|
|
|
|
return redirect(url_for('admin.admin'))
|
|
|
|
|
else:
|
|
|
|
|
if not ub.session.query(ub.User).filter(ub.User.role.op('&')(constants.ROLE_ADMIN) == constants.ROLE_ADMIN,
|
|
|
|
|
ub.User.id != content.id).count() and 'admin_role' not in to_save:
|
|
|
|
|