mirror of
				https://github.com/janeczku/calibre-web
				synced 2025-11-04 01:03:02 +00:00 
			
		
		
		
	Fix for #935
This commit is contained in:
		
							
								
								
									
										14
									
								
								cps/web.py
									
									
									
									
									
								
							
							
						
						
									
										14
									
								
								cps/web.py
									
									
									
									
									
								
							@@ -3246,10 +3246,16 @@ def edit_user(user_id):
 | 
			
		||||
    if request.method == "POST":
 | 
			
		||||
        to_save = request.form.to_dict()
 | 
			
		||||
        if "delete" in to_save:
 | 
			
		||||
            ub.session.query(ub.User).filter(ub.User.id == content.id).delete()
 | 
			
		||||
            ub.session.commit()
 | 
			
		||||
            flash(_(u"User '%(nick)s' deleted", nick=content.nickname), category="success")
 | 
			
		||||
            return redirect(url_for('admin'))
 | 
			
		||||
            if ub.session.query(ub.User).filter(and_(ub.User.role.op('&')
 | 
			
		||||
                                                             (ub.ROLE_ADMIN)== ub.ROLE_ADMIN,
 | 
			
		||||
                                                         ub.User.id != content.id)).count():
 | 
			
		||||
                ub.session.query(ub.User).filter(ub.User.id == content.id).delete()
 | 
			
		||||
                ub.session.commit()
 | 
			
		||||
                flash(_(u"User '%(nick)s' deleted", nick=content.nickname), category="success")
 | 
			
		||||
                return redirect(url_for('admin'))
 | 
			
		||||
            else:
 | 
			
		||||
                flash(_(u"No admin user remaining, can't delete user", nick=content.nickname), category="error")
 | 
			
		||||
                return redirect(url_for('admin'))
 | 
			
		||||
        else:
 | 
			
		||||
            if "password" in to_save and to_save["password"]:
 | 
			
		||||
                content.password = generate_password_hash(to_save["password"])
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user