tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changed the filter var (before as global var) for the enterprise dashboard.

This commit is contained in:
mdtrooper 2016-05-04 11:06:57 +02:00
parent 2cc5f96915
commit 9945502466
3 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/class/Map.class.php
View File

@ -112,7 +112,7 @@ abstract class Map {
$nodes_name = "nodes_" . $this->id;
$edges_name = "edges_" . $this->id;
$filter_name = "filter_" . $this->id; $filter_name = "filter";
$filter_name = "filter_" . $this->id;
?>
<script type="text/javascript">

28
pandora_console/include/javascript/map/MapController.js
View File

@ -253,6 +253,12 @@ MapController.prototype.get_subtype_map = function() {
return window["subtype_" + self._id];
}
MapController.prototype.get_filter_map = function() {
var self = this;
return window["filter_" + self._id];
}
/**
* Function ini_selection_rectangle
* Return void
@ -1765,11 +1771,13 @@ MapController.prototype.move_node = function(node) {
* This function checks if the node is draggable
*/
MapController.prototype.is_draggable = function(node) {
var self = this;
var return_var = false;
switch (node.type) {
case ITEM_TYPE_MODULE_NETWORKMAP:
if (filter['show_modules']) {
if (self.get_filter_map()['show_modules']) {
return_var = true;
}
else {
@ -1777,7 +1785,7 @@ MapController.prototype.is_draggable = function(node) {
}
break;
case ITEM_TYPE_MODULEGROUP_NETWORKMAP:
if (filter['show_modules']) {
if (self.get_filter_map()['show_modules']) {
if (filter['show_module_group']) {
return_var = true;
}
@ -1824,6 +1832,8 @@ MapController.prototype.is_relationshipy = function(node) {
* This function checks if the node is selecty
*/
MapController.prototype.is_selecty = function(node) {
var self = this;
var return_var = false;
switch (node.type) {
@ -1834,7 +1844,7 @@ MapController.prototype.is_selecty = function(node) {
return_var = true;
break;
case ITEM_TYPE_MODULE_NETWORKMAP:
if (filter['show_modules']) {
if (self.get_filter_map()['show_modules']) {
return_var = true;
}
else {
@ -1842,8 +1852,8 @@ MapController.prototype.is_selecty = function(node) {
}
break;
case ITEM_TYPE_MODULEGROUP_NETWORKMAP:
if (filter['show_modules']) {
if (filter['show_module_group']) {
if (self.get_filter_map()['show_modules']) {
if (self.get_filter_map()['show_module_group']) {
return_var = true;
}
else {
@ -1865,6 +1875,8 @@ MapController.prototype.is_selecty = function(node) {
* This function checks if the node is delety
*/
MapController.prototype.is_delety = function(node) {
var self = this;
var return_var = false;
switch (node.type) {
@ -1875,7 +1887,7 @@ MapController.prototype.is_delety = function(node) {
return_var = true;
break;
case ITEM_TYPE_MODULE_NETWORKMAP:
if (filter['show_modules']) {
if (self.get_filter_map()['show_modules']) {
return_var = true;
}
else {
@ -1883,8 +1895,8 @@ MapController.prototype.is_delety = function(node) {
}
break;
case ITEM_TYPE_MODULEGROUP_NETWORKMAP:
if (filter['show_modules']) {
if (filter['show_module_group']) {
if (self.get_filter_map()['show_modules']) {
if (self.get_filter_map()['show_module_group']) {
return_var = true;
}
else {

12
pandora_console/include/javascript/map/NetworkmapController.js
View File

@ -95,8 +95,8 @@ NetworkmapController.prototype.init_map = function() {
}
}
if (filter['show_modules']) {
if (filter['show_module_group']) {
if (self.get_filter_map()['show_modules']) {
if (self.get_filter_map()['show_module_group']) {
var arrow_GMA = self.get_arrow_GMA(edge['to'], edge['from']);
if (arrow_GMA !== null) {
if (!self.exists_arrow(clean_arrows, arrow_GMA)) {
@ -182,12 +182,14 @@ NetworkmapController.prototype.fake_arrow_AM = function(arrow_AM) {
* This function return if a node is an agent
*/
NetworkmapController.prototype.filter_only_agents = function(node) {
var self = this;
switch (node.type) {
case ITEM_TYPE_EDGE_NETWORKMAP:
return false;
break;
case ITEM_TYPE_MODULE_NETWORKMAP:
if (filter['show_modules']) {
if (self.get_filter_map()['show_modules']) {
return true;
}
else {
@ -195,8 +197,8 @@ NetworkmapController.prototype.filter_only_agents = function(node) {
}
break;
case ITEM_TYPE_MODULEGROUP_NETWORKMAP:
if (filter['show_modules']) {
if (filter['show_module_group']) {
if (self.get_filter_map()['show_modules']) {
if (self.get_filter_map()['show_module_group']) {
return true;
}
else {