From b16dec50be99e804f1645515e2597c90128d36e5 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 17 Nov 2016 14:41:11 +0100
Subject: [PATCH] firmware: hint to installed version's changelog

---
 .../controllers/OPNsense/Core/Api/FirmwareController.php  | 3 +++
 src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt    | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php b/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php
index ce1f1f296..252926d47 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php
@@ -473,6 +473,9 @@ class FirmwareController extends ApiControllerBase
 
         $response['changelog'] = $changelogs;
 
+        /* allows us to match the version against the specific changelog */
+        $response['product_version'] = file_get_contents('/usr/local/opnsense/version/opnsense');
+
         return $response;
     }
 
diff --git a/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt b/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt
index 011a59f80..1ebb7ec58 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt
@@ -299,9 +299,15 @@ POSSIBILITY OF SUCH DAMAGE.
                 $("#updatelist").html("<tr><th>{{ lang._('Version') }}</th>" +
                 "<th>{{ lang._('Date') }}</th><th></th></tr>");
 
+                installed_version = data['product_version'].replace(/[_-].*/, '');
+
                 $.each(data['changelog'], function(index, row) {
+                    installed_text = '';
+                    if (installed_version == row['version']) {
+                        installed_text = ' ({{ lang._('installed') }})';
+                    }
                     $('#updatelist').append(
-                        '<tr><td>' + row['version'] + '</td>' +
+                        '<tr><td>' + row['version'] + installed_text + '</td>' +
                         '<td>' + row['date'] + '</td>' +
                         '<td><button class="btn btn-default btn-xs act_changelog" data-version="' + row['version'] + '" ' +
                         'data-toggle="tooltip" title="View ' + row['version'] + '">' +