luisgulo/calibre-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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()
state = None
if sort == "state":
state = json.loads(request.args.get("state"))
state = json.loads(request.args.get("state", "[]"))
if sort != "state" and order:
order = text(sort + " " + order)
@ -356,7 +356,7 @@ def edit_list_user(param):
user.email = check_email(vals['value'])
elif param == 'kindle_mail':
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 \
[constants.ROLE_ADMIN, constants.ROLE_PASSWD, constants.ROLE_EDIT_SHELFS]:
raise Exception(_("Guest can't have this role"))
@ -367,7 +367,9 @@ def edit_list_user(param):
if not ub.session.query(ub.User).\
filter(ub.User.role.op('&')(constants.ROLE_ADMIN) == constants.ROLE_ADMIN,
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'])
elif param == 'sidebar_view':
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) {
$.ajax({
method:"post",
method: "post",
url: window.location.pathname + "/../../ajax/editlistusers/" + field,
data: {"pk":userId, "field_index":field_index, "value": checkbox.checked}
/*<div className="editable-buttons">
<button type="button" className="btn btn-default btn-sm editable-cancel"><i
className="glyphicon glyphicon-remove"></i></button>
</div>*/
/*<div className="editable-error-block help-block" style="">Text to show</div>*/
});
$.ajax({
method:"get",
url: window.location.pathname + "/../../ajax/listusers",
async: true,
timeout: 900,
success:function(data) {
$("#user-table").bootstrapTable("load", data);
data: {"pk": userId, "field_index": field_index, "value": checkbox.checked},
success: function (data) {
if (!jQuery.isEmptyObject(data)) {
$("#flash_success").remove();
$("#flash_danger").remove();
$( ".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>' +
'</div>');
}
$.ajax({
method: "get",
url: window.location.pathname + "/../../ajax/listusers",
async: true,
timeout: 900,
success: function (data) {
$("#user-table").bootstrapTable("load", data);
}
});
}
});
}
function deactivateHeaderButtons(e) {
$("#user_delete_selection").addClass("disabled");
$("#user_delete_selection").attr("aria-disabled", true);

2
cps/web.py
View file

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