From 562d525b78e7a1b7bce08f4d9ef1eeef75918d21 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Tue, 8 Jan 2019 21:27:15 +0000
Subject: [PATCH] #420 allow sidebar default to be overridden

---
 share/views/sidebar/report/ipinventory.tt     | 2 +-
 share/views/sidebar/report/moduleinventory.tt | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/share/views/sidebar/report/ipinventory.tt b/share/views/sidebar/report/ipinventory.tt
index c5c01e25..b8ddb524 100644
--- a/share/views/sidebar/report/ipinventory.tt
+++ b/share/views/sidebar/report/ipinventory.tt
@@ -46,7 +46,7 @@
                     rel="tooltip" data-placement="left" data-offset="5" data-title="Applies to IPv4 Only">
                   <label class="add-on">
                   <input type="checkbox" id="never"
-                    name="never"[% ' checked="checked"' IF params.never %]/>
+                    name="never"[% ' checked="checked"' IF (params.never OR vars.sidebar_defaults.report_ipinventory.never) %]/>
                   </label>
                   <label class="nd_checkboxlabel" for="never">
                     <span class="nd_searchcheckbox uneditable-input">List IP's Never Seen</span>
diff --git a/share/views/sidebar/report/moduleinventory.tt b/share/views/sidebar/report/moduleinventory.tt
index 475ee388..57e20798 100644
--- a/share/views/sidebar/report/moduleinventory.tt
+++ b/share/views/sidebar/report/moduleinventory.tt
@@ -58,7 +58,7 @@
             <div class="clearfix input-prepend">
               <label class="add-on">
                 <input type="checkbox" id="fruonly"
-                  name="fruonly"[% ' checked="checked"' IF vars.sidebar_defaults.report_moduleinventory.fruonly %]/>
+                  name="fruonly"[% ' checked="checked"' IF (params.fruonly OR vars.sidebar_defaults.report_moduleinventory.fruonly) %]/>
               </label>
               <label class="nd_checkboxlabel" for="fruonly">
                 <span class="nd_searchcheckbox uneditable-input">FRU Only</span>
@@ -67,7 +67,7 @@
             <div class="clearfix input-prepend">
               <label class="add-on">
                 <input type="checkbox" id="matchall"
-                  name="matchall"[% ' checked="checked"' IF vars.sidebar_defaults.report_moduleinventory.matchall %]/>
+                  name="matchall"[% ' checked="checked"' IF (params.matchall OR vars.sidebar_defaults.report_moduleinventory.matchall) %]/>
               </label>
               <label class="nd_checkboxlabel" for="matchall">
                 <span class="nd_searchcheckbox uneditable-input">Match All Options</span>