Merge remote-tracking branch 'sec_fixes/admin_update' into master
This commit is contained in:
		
						commit
						130701a7bb
					
				| 
						 | 
				
			
			@ -1029,7 +1029,8 @@ def send_logfile(logtype):
 | 
			
		|||
 | 
			
		||||
 | 
			
		||||
@admi.route("/get_update_status", methods=['GET'])
 | 
			
		||||
@login_required_if_no_ano
 | 
			
		||||
@login_required
 | 
			
		||||
@admin_required
 | 
			
		||||
def get_update_status():
 | 
			
		||||
    log.info(u"Update status requested")
 | 
			
		||||
    return updater_thread.get_available_updates(request.method, locale=get_locale())
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -308,6 +308,7 @@ def before_request():
 | 
			
		|||
 | 
			
		||||
@app.route('/import_ldap_users')
 | 
			
		||||
@login_required
 | 
			
		||||
@admin_required
 | 
			
		||||
def import_ldap_users():
 | 
			
		||||
    showtext = {}
 | 
			
		||||
    try:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue
	
	Block a user