mirror of
				https://github.com/inventree/InvenTree.git
				synced 2025-11-03 22:55:43 +00:00 
			
		
		
		
	Implement option to display labels "inline" in the browser
This commit is contained in:
		@@ -979,7 +979,10 @@ class InvenTreeUserSetting(BaseInvenTreeSetting):
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    @classmethod
 | 
					    @classmethod
 | 
				
			||||||
    def get_filters(cls, key, **kwargs):
 | 
					    def get_filters(cls, key, **kwargs):
 | 
				
			||||||
        return {'key__iexact': key, 'user__id': kwargs['user'].id}
 | 
					        return {
 | 
				
			||||||
 | 
					            'key__iexact': key,
 | 
				
			||||||
 | 
					            'user__id': kwargs['user'].id
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class PriceBreak(models.Model):
 | 
					class PriceBreak(models.Model):
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -109,10 +109,12 @@ class LabelPrintMixin:
 | 
				
			|||||||
            else:
 | 
					            else:
 | 
				
			||||||
                pdf = outputs[0].get_document().write_pdf()
 | 
					                pdf = outputs[0].get_document().write_pdf()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            inline = common.models.InvenTreeUserSetting.get_setting('LABEL_INLINE', user=request.user)
 | 
				
			||||||
            return InvenTree.helpers.DownloadFile(
 | 
					            return InvenTree.helpers.DownloadFile(
 | 
				
			||||||
                pdf,
 | 
					                pdf,
 | 
				
			||||||
                label_name,
 | 
					                label_name,
 | 
				
			||||||
                content_type='application/pdf'
 | 
					                content_type='application/pdf',
 | 
				
			||||||
 | 
					                inline=inline
 | 
				
			||||||
            )
 | 
					            )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -204,6 +204,7 @@ def settings_value(key, *args, **kwargs):
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    if 'user' in kwargs:
 | 
					    if 'user' in kwargs:
 | 
				
			||||||
        return InvenTreeUserSetting.get_setting(key, user=kwargs['user'])
 | 
					        return InvenTreeUserSetting.get_setting(key, user=kwargs['user'])
 | 
				
			||||||
 | 
					        
 | 
				
			||||||
    return InvenTreeSetting.get_setting(key)
 | 
					    return InvenTreeSetting.get_setting(key)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,7 +6,7 @@
 | 
				
			|||||||
{% block label %}user-reports{% endblock %}
 | 
					{% block label %}user-reports{% endblock %}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
{% block heading %}
 | 
					{% block heading %}
 | 
				
			||||||
{% trans "Label Settings" %}
 | 
					{% trans "Report Settings" %}
 | 
				
			||||||
{% endblock %}
 | 
					{% endblock %}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
{% block content %}
 | 
					{% block content %}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user