From 1ccfd260e983e2d0052cee899c6c4e37a1ce63b5 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 5 Jan 2022 08:35:13 +0100
Subject: [PATCH] firmware: show "misconfigured" first before defaulting to
 "orphaned"

The reason for this is the plugin conflict dialog pops up but it is
unclear what it wants.  Once reset the orphaned status will be dispayed.
---
 .../mvc/app/views/OPNsense/Core/firmware.volt      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt b/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt
index 7ef30298a..4d7aad469 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt
@@ -1,5 +1,5 @@
 {#
- # Copyright (c) 2015-2021 Franco Fichtner <franco@opnsense.org>
+ # Copyright (c) 2015-2022 Franco Fichtner <franco@opnsense.org>
  # Copyright (c) 2015-2018 Deciso B.V.
  # All rights reserved.
  #
@@ -403,18 +403,18 @@
                     misconfigured_plugins = 1;
                 } else if (row['installed'] == "0" && row['configured'] == "1") {
                     status_text = ' ({{ lang._('missing') }})';
-                    bold_on = '<span class="text-danger plugin_missing"><b>';
+                    bold_on = '<span class="text-danger"><b>';
                     bold_off = '</b></span>';
                     missing_plugins = 1;
                 } else if (row['installed'] == "1") {
-                    status_text = ' ({{ lang._('installed') }})';
+                    if (row['provided'] == "0") {
+                        status_text = ' ({{ lang._('orphaned') }})';
+                    } else {
+                        status_text = ' ({{ lang._('installed') }})';
+                    }
                     bold_on = '<b>';
                     bold_off = '</b>';
                 }
-                if (row['provided'] == "0" && row['installed'] == "1") {
-                    // this state overwrites installed on purpose
-                    status_text = ' ({{ lang._('orphaned') }})';
-                }
                 $('#pluginlist > tbody').append(
                     '<tr class="plugin_entry">' + '<td>' + bold_on + row['name'] + status_text + bold_off + '</td>' +
                     '<td>' + bold_on + row['version'] + bold_off + '</td>' +