mirror of
				https://github.com/inventree/InvenTree.git
				synced 2025-11-04 07:05:41 +00:00 
			
		
		
		
	Merge pull request #2719 from matmair/fix-date-formats
Fix render_date tag
This commit is contained in:
		@@ -5,7 +5,7 @@ This module provides template tags for extra functionality,
 | 
				
			|||||||
over and above the built-in Django tags.
 | 
					over and above the built-in Django tags.
 | 
				
			||||||
"""
 | 
					"""
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from datetime import date
 | 
					from datetime import date, datetime
 | 
				
			||||||
import os
 | 
					import os
 | 
				
			||||||
import sys
 | 
					import sys
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -87,7 +87,9 @@ def render_date(context, date_object):
 | 
				
			|||||||
        # Update the context cache
 | 
					        # Update the context cache
 | 
				
			||||||
        context['user_date_format'] = user_date_format
 | 
					        context['user_date_format'] = user_date_format
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if isinstance(date_object, (datetime, date)):
 | 
				
			||||||
        return date_object.strftime(user_date_format)
 | 
					        return date_object.strftime(user_date_format)
 | 
				
			||||||
 | 
					    return date_object
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@register.simple_tag()
 | 
					@register.simple_tag()
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user