From 174ac642359692ed8215269bd9cc2fae8020cb23 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Sat, 7 Aug 2021 21:45:18 +1000
Subject: [PATCH 1/3] Allow downloaded files to be inline or attachments

---
 InvenTree/InvenTree/helpers.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/InvenTree/InvenTree/helpers.py b/InvenTree/InvenTree/helpers.py
index 628fd2e646..319b88cb09 100644
--- a/InvenTree/InvenTree/helpers.py
+++ b/InvenTree/InvenTree/helpers.py
@@ -344,13 +344,15 @@ def GetExportFormats():
     ]
 
 
-def DownloadFile(data, filename, content_type='application/text'):
-    """ Create a dynamic file for the user to download.
+def DownloadFile(data, filename, content_type='application/text', inline=False):
+    """
+    Create a dynamic file for the user to download.
 
     Args:
         data: Raw file data (string or bytes)
         filename: Filename for the file download
         content_type: Content type for the download
+        inline: Download "inline" or as attachment? (Default = attachment)
 
     Return:
         A StreamingHttpResponse object wrapping the supplied data
@@ -365,7 +367,10 @@ def DownloadFile(data, filename, content_type='application/text'):
 
     response = StreamingHttpResponse(wrapper, content_type=content_type)
     response['Content-Length'] = len(data)
-    response['Content-Disposition'] = 'attachment; filename={f}'.format(f=filename)
+
+    disposition = "inline" if inline else "attachment"
+
+    response['Content-Disposition'] = f'{disposition}; filename={filename}'
 
     return response
 

From d77b99c0ca2adcf7d4e73e681d818ded3fe78084 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Sat, 7 Aug 2021 21:57:41 +1000
Subject: [PATCH 2/3] Add user settings for report and labels

---
 InvenTree/common/models.py                    | 14 +++++++++++
 .../templates/InvenTree/settings/navbar.html  | 12 ++++++++++
 .../InvenTree/settings/settings.html          |  2 ++
 .../InvenTree/settings/user_labels.html       | 23 +++++++++++++++++++
 .../InvenTree/settings/user_reports.html      | 23 +++++++++++++++++++
 5 files changed, 74 insertions(+)
 create mode 100644 InvenTree/templates/InvenTree/settings/user_labels.html
 create mode 100644 InvenTree/templates/InvenTree/settings/user_reports.html

diff --git a/InvenTree/common/models.py b/InvenTree/common/models.py
index 839780d5b4..e2486c41df 100644
--- a/InvenTree/common/models.py
+++ b/InvenTree/common/models.py
@@ -926,6 +926,20 @@ class InvenTreeUserSetting(BaseInvenTreeSetting):
             'validator': bool,
         },
 
+        "LABEL_INLINE": {
+            'name': _('Inline label display'),
+            'description': _('Display PDF labels in the browser, instead of downloading as a file'),
+            'default': True,
+            'validator': bool,
+        },
+
+        "REPORT_INLINE": {
+            'name': _('Inline report display'),
+            'description': _('Display PDF reports in the browser, instead of downloading as a file'),
+            'default': False,
+            'validator': bool,
+        },
+
         'SEARCH_PREVIEW_RESULTS': {
             'name': _('Search Preview Results'),
             'description': _('Number of results to show in search preview window'),
diff --git a/InvenTree/templates/InvenTree/settings/navbar.html b/InvenTree/templates/InvenTree/settings/navbar.html
index 83bbc10fe9..e7ea17f91f 100644
--- a/InvenTree/templates/InvenTree/settings/navbar.html
+++ b/InvenTree/templates/InvenTree/settings/navbar.html
@@ -30,6 +30,18 @@
         </a>
     </li>
 
+    <li class='list-group-item' title='{% trans "Labels" %}'>
+        <a href='#' class='nav-toggle' id='select-user-labels'>
+            <span class='fas fa-tag'></span> {% trans "Labels" %}
+        </a>
+    </li>
+
+    <li class='list-group-item' title='{% trans "Reports" %}'>
+        <a href='#' class='nav-toggle' id='select-user-reports'>
+            <span class='fas fa-file-pdf'></span> {% trans "Reports" %}
+        </a>
+    </li>
+
     <!--
         <li class='list-group-item' title='{% trans "Settings" %}'>
             <a href='#' class='nav-toggle' id='select-user-settings'>
diff --git a/InvenTree/templates/InvenTree/settings/settings.html b/InvenTree/templates/InvenTree/settings/settings.html
index 40125019ff..c28ef016e6 100644
--- a/InvenTree/templates/InvenTree/settings/settings.html
+++ b/InvenTree/templates/InvenTree/settings/settings.html
@@ -18,6 +18,8 @@
 {% include "InvenTree/settings/user_settings.html" %}
 {% include "InvenTree/settings/user_homepage.html" %}
 {% include "InvenTree/settings/user_search.html" %}
+{% include "InvenTree/settings/user_labels.html" %}
+{% include "InvenTree/settings/user_reports.html" %}
 
 {% if user.is_staff %}
 
diff --git a/InvenTree/templates/InvenTree/settings/user_labels.html b/InvenTree/templates/InvenTree/settings/user_labels.html
new file mode 100644
index 0000000000..bd3d041544
--- /dev/null
+++ b/InvenTree/templates/InvenTree/settings/user_labels.html
@@ -0,0 +1,23 @@
+{% extends "panel.html" %}
+
+{% load i18n %}
+{% load inventree_extras %}
+
+{% block label %}user-labels{% endblock %}
+
+{% block heading %}
+{% trans "Label Settings" %}
+{% endblock %}
+
+{% block content %}
+
+<div class='row'>
+    <table class='table table-striped table-condensed'>
+        {% include "InvenTree/settings/header.html" %}
+        <tbody>
+            {% include "InvenTree/settings/setting.html" with key="LABEL_INLINE" icon='fa-tag' user_setting=True %}
+        </tbody>
+    </table>
+</div>
+
+{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/templates/InvenTree/settings/user_reports.html b/InvenTree/templates/InvenTree/settings/user_reports.html
new file mode 100644
index 0000000000..57ce8cddb8
--- /dev/null
+++ b/InvenTree/templates/InvenTree/settings/user_reports.html
@@ -0,0 +1,23 @@
+{% extends "panel.html" %}
+
+{% load i18n %}
+{% load inventree_extras %}
+
+{% block label %}user-reports{% endblock %}
+
+{% block heading %}
+{% trans "Label Settings" %}
+{% endblock %}
+
+{% block content %}
+
+<div class='row'>
+    <table class='table table-striped table-condensed'>
+        {% include "InvenTree/settings/header.html" %}
+        <tbody>
+            {% include "InvenTree/settings/setting.html" with key="REPORT_INLINE" icon='fa-file-pdf' user_setting=True %}
+        </tbody>
+    </table>
+</div>
+
+{% endblock %}
\ No newline at end of file

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 3/3] 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 %}