From ca9536f687c53c949b742f65938a2781d8e0da86 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Sat, 7 Aug 2021 22:09:15 +1000
Subject: [PATCH] Implement option to display labels "inline" in the browser

---
 InvenTree/common/models.py                               | 5 ++++-
 InvenTree/label/api.py                                   | 4 +++-
 InvenTree/part/templatetags/inventree_extras.py          | 1 +
 InvenTree/templates/InvenTree/settings/user_reports.html | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/InvenTree/common/models.py b/InvenTree/common/models.py
index e2486c41df..3924a516f3 100644
--- a/InvenTree/common/models.py
+++ b/InvenTree/common/models.py
@@ -979,7 +979,10 @@ class InvenTreeUserSetting(BaseInvenTreeSetting):
 
     @classmethod
     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):
diff --git a/InvenTree/label/api.py b/InvenTree/label/api.py
index b2d17efdfe..c8b265fd93 100644
--- a/InvenTree/label/api.py
+++ b/InvenTree/label/api.py
@@ -109,10 +109,12 @@ class LabelPrintMixin:
             else:
                 pdf = outputs[0].get_document().write_pdf()
 
+            inline = common.models.InvenTreeUserSetting.get_setting('LABEL_INLINE', user=request.user)
             return InvenTree.helpers.DownloadFile(
                 pdf,
                 label_name,
-                content_type='application/pdf'
+                content_type='application/pdf',
+                inline=inline
             )
 
 
diff --git a/InvenTree/part/templatetags/inventree_extras.py b/InvenTree/part/templatetags/inventree_extras.py
index dce3d248e5..b12a59f136 100644
--- a/InvenTree/part/templatetags/inventree_extras.py
+++ b/InvenTree/part/templatetags/inventree_extras.py
@@ -204,6 +204,7 @@ def settings_value(key, *args, **kwargs):
 
     if 'user' in kwargs:
         return InvenTreeUserSetting.get_setting(key, user=kwargs['user'])
+        
     return InvenTreeSetting.get_setting(key)
 
 
diff --git a/InvenTree/templates/InvenTree/settings/user_reports.html b/InvenTree/templates/InvenTree/settings/user_reports.html
index 57ce8cddb8..8e93d41457 100644
--- a/InvenTree/templates/InvenTree/settings/user_reports.html
+++ b/InvenTree/templates/InvenTree/settings/user_reports.html
@@ -6,7 +6,7 @@
 {% block label %}user-reports{% endblock %}
 
 {% block heading %}
-{% trans "Label Settings" %}
+{% trans "Report Settings" %}
 {% endblock %}
 
 {% block content %}