From d299474b2562051e43fd28de7f8f6b6cd056108e Mon Sep 17 00:00:00 2001
From: Pablo <pablotr9@correo.ugr.es>
Date: Fri, 5 Jul 2019 10:58:52 +0200
Subject: [PATCH] Fix agents/overview configuration->rootcheck->ignored

---
 .../policy-monitoring/pm-ignored.html         | 72 ++-----------------
 1 file changed, 4 insertions(+), 68 deletions(-)

diff --git a/public/templates/management/configuration/policy-monitoring/pm-ignored.html b/public/templates/management/configuration/policy-monitoring/pm-ignored.html
index b29bebdae..505bab033 100644
--- a/public/templates/management/configuration/policy-monitoring/pm-ignored.html
+++ b/public/templates/management/configuration/policy-monitoring/pm-ignored.html
@@ -2,19 +2,11 @@
 <wz-no-config
   flex
   error="'not-present'"
-  ng-if="((agent || {}).os || {}).platform !== 'windows' && configurationSubTab === 'pm-ignored' && currentConfig && currentConfig['syscheck-rootcheck'] && currentConfig['syscheck-rootcheck'].rootcheck && currentConfig['syscheck-rootcheck'].rootcheck.ignore && !currentConfig['syscheck-rootcheck'].rootcheck.ignore.length"></wz-no-config>
+  ng-if="configurationSubTab === 'pm-ignored' && currentConfig && currentConfig['syscheck-rootcheck'] && currentConfig['syscheck-rootcheck'].rootcheck && currentConfig['syscheck-rootcheck'].rootcheck.ignore && !currentConfig['syscheck-rootcheck'].rootcheck.ignore.length"></wz-no-config>
 <!-- End no configuration section -->
 
-
-<wz-no-config
-  flex
-  error="'not-present'"
-  ng-if="((agent || {}).os || {}).platform === 'windows' && configurationSubTab === 'pm-ignored' && currentConfig && currentConfig['syscheck-rootcheck'] && currentConfig['syscheck-rootcheck'].rootcheck && !currentConfig['syscheck-rootcheck'].rootcheck.registry && !currentConfig['syscheck-rootcheck'].rootcheck.registry_ignore"></wz-no-config>
-<!-- End no configuration section -->
-
-
 <!-- Ignored card -->
-<md-card class="wz-md-card" ng-if="((agent || {}).os || {}).platform !== 'windows' && !JSONContent && !XMLContent && configurationSubTab === 'pm-ignored' && currentConfig && currentConfig['syscheck-rootcheck'] && currentConfig['syscheck-rootcheck'].rootcheck && currentConfig['syscheck-rootcheck'].rootcheck.ignore && currentConfig['syscheck-rootcheck'].rootcheck.ignore.length">
+<md-card class="wz-md-card" ng-if="!JSONContent && !XMLContent && configurationSubTab === 'pm-ignored' && currentConfig && currentConfig['syscheck-rootcheck'] && currentConfig['syscheck-rootcheck'].rootcheck && currentConfig['syscheck-rootcheck'].rootcheck.ignore && currentConfig['syscheck-rootcheck'].rootcheck.ignore.length">
     <md-card-content>
         <div layout="row" layout-align="start center">
             <div>
@@ -33,7 +25,7 @@
         <!-- Configuration block -->
         <div class="wz-padding-top-10">
 
-            <table class="table table-striped table-condensed" style="table-layout: fixed !important;">
+            <table class="table table-striped table-condensed" style="table-layout: fixed !important;" ng-if="(currentConfig['syscheck-rootcheck'].rootcheck.ignore || {}).length">
                 <thead class="wz-text-bold">
                     <th class="wz-text-left">Path</th>
                 </thead>
@@ -49,7 +41,7 @@
         <md-divider class="wz-margin-top-10"></md-divider>
 
         <!-- Configuration block -->
-        <div class="wz-padding-top-10" ng-if="currentConfig['syscheck-rootcheck'].rootcheck.ignore_sregex">
+        <div class="wz-padding-top-10" ng-if="(currentConfig['syscheck-rootcheck'].rootcheck.ignore_sregex || {}).length">
 
             <table class="table table-striped table-condensed" style="table-layout: fixed !important;">
                 <thead class="wz-text-bold">
@@ -67,59 +59,3 @@
     </md-card-content>
 </md-card>
 <!-- End ignored card -->
-
-
-<md-card class="wz-md-card" ng-if="((agent || {}).os || {}).platform === 'windows' && configurationSubTab === 'pm-ignored' && !JSONContent && !XMLContent && currentConfig && currentConfig['syscheck-rootcheck'] && currentConfig['syscheck-rootcheck'].rootcheck && (currentConfig['syscheck-rootcheck'].rootcheck.registry || currentConfig['syscheck-rootcheck'].rootcheck.registry_ignore)">
-    <md-card-content>
-        <div layout="row" layout-align="start center">
-            <div>
-                <span class="font-size-16">Ignored</span>
-                <div class="wz-margin-top-10">
-                    <span class="md-subheader small">A list of registry entries that will be ignored</span>
-                </div>
-            </div>
-            <span flex></span>
-            <span ng-class="JSONContent ? 'wz-text-active' : ''" class="wz-text-link small" ng-click="getJSON()">JSON</span>
-            <span class="small">&nbsp;&centerdot;&nbsp;</span>
-            <span ng-class="XMLContent ? 'wz-text-active' : ''" class="wz-text-link small" ng-click="getXML()">XML</span>
-        </div>
-        <md-divider class="wz-margin-top-10"></md-divider>
-
-        <!-- Configuration block -->
-        <div class="wz-padding-top-10">
-
-            <table class="table table-striped table-condensed" style="table-layout: fixed !important;">
-                <thead class="wz-text-bold">
-                    <th class="wz-text-left">Entry</th>
-                    <th class="wz-text-left">Arch</th>
-                </thead>
-                <tbody class="wz-word-wrap">
-                    <tr ng-repeat="registry in currentConfig['syscheck-rootcheck'].rootcheck.registry_ignore">
-                        <td>{{registry.entry}}</td>
-                        <td>{{registry.arch}}</td>
-                    </tr>
-                </tbody>
-            </table>
-
-        </div>
-
-         <!-- Configuration block -->
-         <div class="wz-padding-top-10" ng-if="currentConfig['syscheck-rootcheck'].rootcheck.registry_ignore_sregex">
-
-            <table class="table table-striped table-condensed" style="table-layout: fixed !important;">
-                <thead class="wz-text-bold">
-                    <th class="wz-text-left">Entry</th>
-                    <th class="wz-text-left">Arch</th>
-                </thead>
-                <tbody class="wz-word-wrap">
-                    <tr ng-repeat="registry in currentConfig['syscheck-rootcheck'].rootcheck.registry_ignore_sregex">
-                        <td>{{registry.entry}}</td>
-                        <td>{{registry.arch}}</td>
-                    </tr>
-                </tbody>
-            </table>
-
-        </div>
-        <!-- End configuration block -->
-    </md-card-content>
-</md-card>
\ No newline at end of file