Use waffl to be able to flip overlay on/off
This commit is contained in:
		
							parent
							
								
									a8551e999c
								
							
						
					
					
						commit
						ac8df2da28
					
				
					 1 changed files with 5 additions and 4 deletions
				
			
		
							
								
								
									
										9
									
								
								vendor/registrasion/registrasion/views.py
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										9
									
								
								vendor/registrasion/registrasion/views.py
									
										
									
									
										vendored
									
									
								
							|  | @ -36,6 +36,7 @@ from django.http import Http404, HttpResponse | ||||||
| from django.shortcuts import redirect | from django.shortcuts import redirect | ||||||
| from django.shortcuts import render | from django.shortcuts import render | ||||||
| from django.template import Context, Template, loader | from django.template import Context, Template, loader | ||||||
|  | import waffle | ||||||
| 
 | 
 | ||||||
| from lxml import etree | from lxml import etree | ||||||
| from copy import deepcopy | from copy import deepcopy | ||||||
|  | @ -1116,11 +1117,11 @@ def _get_badge_template_name(): | ||||||
| @login_required | @login_required | ||||||
| def user_badge(request, format="png"): | def user_badge(request, format="png"): | ||||||
|     '''Shows the logged-in user their badge''' |     '''Shows the logged-in user their badge''' | ||||||
|     if waffle.flag_is_active("force_badge_overlay"): |     if waffle.flag_is_active(request, "force_badge_overlay"): | ||||||
|         overlay=True |         overlay=True | ||||||
|     else: |     else: | ||||||
|         overlay=False |         overlay=False | ||||||
|     return render_badge(request.user, format, overlay) |     return render_badge(request.user, format, overlay, request) | ||||||
| 
 | 
 | ||||||
| @user_passes_test(_staff_only) | @user_passes_test(_staff_only) | ||||||
| def badge(request, user_id, format="png"): | def badge(request, user_id, format="png"): | ||||||
|  | @ -1149,8 +1150,8 @@ def _convert_img(img, outformat="png",dpi=200,width=None): | ||||||
|                          stdout=subprocess.PIPE).stdout |                          stdout=subprocess.PIPE).stdout | ||||||
|     return out |     return out | ||||||
| 
 | 
 | ||||||
| def render_badge(user, format="png", overlay=False): | def render_badge(user, format="png", overlay=False, request=None): | ||||||
|     if waffle.flag_is_active("force_badge_overlay"): |     if request and waffle.flag_is_active(request, "force_badge_overlay"): | ||||||
|         overlay=True |         overlay=True | ||||||
|     rendered = render_badge_svg(user, overlay=overlay) |     rendered = render_badge_svg(user, overlay=overlay) | ||||||
|     if format == "png": |     if format == "png": | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 James Polley
						James Polley