Merge branch 'dev'

Opmantek · Oct 20, 2017 · 1fed2d2 · 1fed2d2
2 parents bfb7791 + fd40be1
commit 1fed2d2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/code_igniter/application/controllers/include_collection.php b/code_igniter/application/controllers/include_collection.php
@@ -52,6 +52,10 @@
     }
 }
 
+if ($this->response->meta->collection == 'configuration') {
+    $this->response->meta->total = $this->response->meta->filtered;
+}
+
 output($this->response);
 
 $log = new stdClass();

diff --git a/other/openaudit_mysql.sql b/other/openaudit_mysql.sql
@@ -527,7 +527,7 @@ INSERT INTO `configuration` VALUES (53,'database_show_row_limit','1000','number'
 INSERT INTO `configuration` VALUES (54,'collector_check_minutes','15','number','y','system','2000-01-01 00:00:00','The default check interval for collectors.');
 INSERT INTO `configuration` VALUES (55,'page_size','1000','number','y','system','2000-01-01 00:00:00','The default limit of rows to retrieve.');
 INSERT INTO `configuration` VALUES (56,'discovery_linux_use_sudo','y','bool','y','system','2000-01-01 00:00:00','When running discovery commands on a Linux target, should we use sudo.');
-INSERT INTO `configuration` VALUES (57,'delete_noncurrent_netstat','y','bool','y','system','2000-01-01 00:00:00','Should we store non-current netstat data and generate change logs.')
+INSERT INTO `configuration` VALUES (57,'delete_noncurrent_netstat','y','bool','y','system','2000-01-01 00:00:00','Should we store non-current netstat data and generate change logs.');
 INSERT INTO `configuration` VALUES (58,'delete_noncurrent_variable','y','bool','y','system','2000-01-01 00:00:00','Should we store non-current environment variable data and generate change logs.');
 /*!40000 ALTER TABLE `configuration` ENABLE KEYS */;
 UNLOCK TABLES;