NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent traceback after delete user

Browse Source 
flash message in case last admin role is removed #1938
This commit is contained in:
Ozzie Isaacs 2021-04-12 19:04:27 +02:00
parent d0a895628e
commit d32b2ca524
3 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cps/admin.py
View File

@ -249,7 +249,7 @@ def list_users():
order = request.args.get("order", "").lower() order = request.args.get("order", "").lower()
state = None state = None
if sort == "state": if sort == "state":
state = json.loads(request.args.get("state")) state = json.loads(request.args.get("state", "[]"))
if sort != "state" and order: if sort != "state" and order:
order = text(sort + " " + order) order = text(sort + " " + order)
@ -356,7 +356,7 @@ def edit_list_user(param):
user.email = check_email(vals['value']) user.email = check_email(vals['value'])
elif param == 'kindle_mail': elif param == 'kindle_mail':
user.kindle_mail = valid_email(vals['value']) if vals['value'] else "" user.kindle_mail = valid_email(vals['value']) if vals['value'] else ""
elif param == 'role': elif param.endswith('role'):
if user.name == "Guest" and int(vals['field_index']) in \ if user.name == "Guest" and int(vals['field_index']) in \
[constants.ROLE_ADMIN, constants.ROLE_PASSWD, constants.ROLE_EDIT_SHELFS]: [constants.ROLE_ADMIN, constants.ROLE_PASSWD, constants.ROLE_EDIT_SHELFS]:
raise Exception(_("Guest can't have this role")) raise Exception(_("Guest can't have this role"))
@ -367,7 +367,9 @@ def edit_list_user(param):
if not ub.session.query(ub.User).\ if not ub.session.query(ub.User).\
filter(ub.User.role.op('&')(constants.ROLE_ADMIN) == constants.ROLE_ADMIN, filter(ub.User.role.op('&')(constants.ROLE_ADMIN) == constants.ROLE_ADMIN,
ub.User.id != user.id).count(): ub.User.id != user.id).count():
return _(u"No admin user remaining, can't remove admin role", nick=user.name), 400 return Response(json.dumps({'type': "danger",
'message':_(u"No admin user remaining, can't remove admin role",
nick=user.name)}), mimetype='application/json')
user.role &= ~int(vals['field_index']) user.role &= ~int(vals['field_index'])
elif param == 'sidebar_view': elif param == 'sidebar_view':
if user.name == "Guest" and int(vals['field_index']) == constants.SIDEBAR_READ_AND_UNREAD: if user.name == "Guest" and int(vals['field_index']) == constants.SIDEBAR_READ_AND_UNREAD:

35
cps/static/js/table.js
View File

@ -612,25 +612,30 @@ function checkboxFormatter(value, row, index){
function checkboxChange(checkbox, userId, field, field_index) { function checkboxChange(checkbox, userId, field, field_index) {
$.ajax({ $.ajax({
method:"post", method: "post",
url: window.location.pathname + "/../../ajax/editlistusers/" + field, url: window.location.pathname + "/../../ajax/editlistusers/" + field,
data: {"pk":userId, "field_index":field_index, "value": checkbox.checked} data: {"pk": userId, "field_index": field_index, "value": checkbox.checked},
/*<div className="editable-buttons"> success: function (data) {
<button type="button" className="btn btn-default btn-sm editable-cancel"><i if (!jQuery.isEmptyObject(data)) {
className="glyphicon glyphicon-remove"></i></button> $("#flash_success").remove();
</div>*/ $("#flash_danger").remove();
/*<div className="editable-error-block help-block" style="">Text to show</div>*/ $( ".navbar" ).after( '<div class="row-fluid text-center" style="margin-top: -20px;">' +
}); '<div id="flash_'+data.type+'" class="alert alert-'+data.type+'">'+data.message+'</div>' +
$.ajax({ '</div>');
method:"get", }
url: window.location.pathname + "/../../ajax/listusers", $.ajax({
async: true, method: "get",
timeout: 900, url: window.location.pathname + "/../../ajax/listusers",
success:function(data) { async: true,
$("#user-table").bootstrapTable("load", data); timeout: 900,
success: function (data) {
$("#user-table").bootstrapTable("load", data);
}
});
} }
}); });
} }
function deactivateHeaderButtons(e) { function deactivateHeaderButtons(e) {
$("#user_delete_selection").addClass("disabled"); $("#user_delete_selection").addClass("disabled");
$("#user_delete_selection").attr("aria-disabled", true); $("#user_delete_selection").attr("aria-disabled", true);

2
cps/web.py
View File

@ -761,7 +761,7 @@ def list_books():
state = None state = None
if sort == "state": if sort == "state":
state = json.loads(request.args.get("state")) state = json.loads(request.args.get("state", "[]"))
if sort != "state" and order: if sort != "state" and order:
order = [text(sort + " " + order)] order = [text(sort + " " + order)]