From 5443beef65a593d57401e35b6fcac8d9ad079645 Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Mon, 20 Sep 2021 17:15:31 +1000
Subject: [PATCH 1/3] Improve 'health status' warnings

- Don't show error message if only non-critical warnings present
---
 InvenTree/InvenTree/context.py  |  7 ++++++-
 InvenTree/templates/navbar.html | 10 +---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/InvenTree/InvenTree/context.py b/InvenTree/InvenTree/context.py
index 3e1f98ffc2..bd68a0182f 100644
--- a/InvenTree/InvenTree/context.py
+++ b/InvenTree/InvenTree/context.py
@@ -36,9 +36,14 @@ def health_status(request):
         'email_configured': InvenTree.status.is_email_configured(),
     }
 
+    # The following keys are required to denote system health
+    health_keys = [
+        'django_q_running',
+    ]
+
     all_healthy = True
 
-    for k in status.keys():
+    for k in health_keys:
         if status[k] is not True:
             all_healthy = False
 
diff --git a/InvenTree/templates/navbar.html b/InvenTree/templates/navbar.html
index b109bd9daf..6946b69bce 100644
--- a/InvenTree/templates/navbar.html
+++ b/InvenTree/templates/navbar.html
@@ -71,11 +71,7 @@
             <a class='dropdown-toggle' data-toggle='dropdown' href="#">
               {% if user.is_staff %}
               {% if not system_healthy %}
-                {% if not django_q_running %}
                 <span class='fas fa-exclamation-triangle icon-red'></span>
-                {% else %}
-                <span class='fas fa-exclamation-triangle icon-orange'></span>
-                {% endif %}
               {% elif not up_to_date %}
               <span class='fas fa-info-circle icon-green'></span>
               {% endif %}
@@ -96,11 +92,7 @@
                   {% if system_healthy or not user.is_staff %}
                   <span class='fas fa-server'></span>
                   {% else %}
-                    {% if not django_q_running %}
-                    <span class='fas fa-server icon-red'></span>
-                    {% else %}
-                    <span class='fas fa-server icon-orange'></span>
-                    {% endif %}
+                  <span class='fas fa-server icon-red'></span>
                   {% endif %}
                   </span> {% trans "System Information" %}
                 </a></li>

From c1a827819c3a10d18383d25041c8eefc74bc65eb Mon Sep 17 00:00:00 2001
From: rocheparadox <rocheinside@gmail.com>
Date: Mon, 20 Sep 2021 17:00:45 +0530
Subject: [PATCH 2/3] css for part to occupy full height - fix for bug
 Inventree#1848

---
 InvenTree/InvenTree/static/css/inventree.css | 4 ++++
 InvenTree/templates/js/translated/part.js    | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css
index 9ed478ea90..585c0b3825 100644
--- a/InvenTree/InvenTree/static/css/inventree.css
+++ b/InvenTree/InvenTree/static/css/inventree.css
@@ -1061,3 +1061,7 @@ input[type='number']{
 .search-menu .ui-menu-item {
     margin-top: 0.5rem;
 }
+
+.product-card-panel{
+    height: 100%;
+}
diff --git a/InvenTree/templates/js/translated/part.js b/InvenTree/templates/js/translated/part.js
index 8cae5d249b..9abbd2a0b9 100644
--- a/InvenTree/templates/js/translated/part.js
+++ b/InvenTree/templates/js/translated/part.js
@@ -768,7 +768,7 @@ function partGridTile(part) {
     var html = `
     
     <div class='col-sm-3 card'>
-        <div class='panel panel-default panel-inventree'>
+        <div class='panel panel-default panel-inventree product-card-panel'>
             <div class='panel-heading'>
                 <a href='/part/${part.pk}/'>
                     <b>${part.full_name}</b>
@@ -1007,7 +1007,7 @@ function loadPartTable(table, url, options={}) {
                 
                 // Force a new row every 4 columns, to prevent visual issues
                 if ((index > 0) && (index % 4 == 0) && (index < data.length)) {
-                    html += `</div><div class='row'>`;
+                    html += `</div><div class='row full-height'>`;
                 }
 
                 html += partGridTile(row);

From 1d85ccd543f917bd21ce106e0e00dee8082a1090 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 Sep 2021 17:46:34 +0000
Subject: [PATCH 3/3] Build(deps): Bump django from 3.2.4 to 3.2.5

Bumps [django](https://github.com/django/django) from 3.2.4 to 3.2.5.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.4...3.2.5)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index d7c5a01ee4..68eb6797e5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 # Django framework
-Django==3.2.4                   # Django package
+Django==3.2.5                   # Django package
 gunicorn>=20.1.0                # Gunicorn web server
 
 pillow==8.3.2                   # Image manipulation