tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 16:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-1695-carrefour-pandora-fms-console-metaconsole-tree-view-conteo-de-los-elementos' into 'develop'

Browse Source 
[Console Tree view] Added counter

See merge request artica/pandorafms!1321
This commit is contained in:
vgilc 2018-02-28 10:35:35 +01:00
commit 99d5da9dd3
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/include/javascript/tree/TreeController.js
View File

@ -20,6 +20,7 @@ var TreeController = {
recipient: '', recipient: '',
tree: [], tree: [],
emptyMessage: "No data found.", emptyMessage: "No data found.",
foundMessage: "Found items",
errorMessage: "Error", errorMessage: "Error",
baseURL: "", baseURL: "",
ajaxURL: "ajax.php", ajaxURL: "ajax.php",
@ -683,6 +684,12 @@ var TreeController = {
} }
controller.recipient.empty(); controller.recipient.empty();
controller.recipient.html(
"<div> " +
controller.foundMessage + ": " + controller.tree.length +
"</div>" +
"<br/>"
);
var $children = _processGroup(this.recipient, this.tree, true); var $children = _processGroup(this.recipient, this.tree, true);
$children.show(); $children.show();
@ -712,6 +719,9 @@ var TreeController = {
if (typeof data.emptyMessage !== 'undefined' && data.emptyMessage.length > 0) { if (typeof data.emptyMessage !== 'undefined' && data.emptyMessage.length > 0) {
this.emptyMessage = data.emptyMessage; this.emptyMessage = data.emptyMessage;
} }
if (typeof data.foundMessage !== 'undefined' && data.foundMessage.length > 0) {
this.foundMessage = data.foundMessage;
}
if (typeof data.errorMessage !== 'undefined' && data.errorMessage.length > 0) { if (typeof data.errorMessage !== 'undefined' && data.errorMessage.length > 0) {
this.errorMessage = data.errorMessage; this.errorMessage = data.errorMessage;
} }

1
pandora_console/operation/tree.php
View File

@ -283,6 +283,7 @@ enterprise_hook('close_meta_frame');
detailRecipient: $.fixedBottomBox({ width: 400, height: window.innerHeight * 0.9 }), detailRecipient: $.fixedBottomBox({ width: 400, height: window.innerHeight * 0.9 }),
page: parameters['page'], page: parameters['page'],
emptyMessage: "<?php echo __('No data found'); ?>", emptyMessage: "<?php echo __('No data found'); ?>",
foundMessage: "<?php echo __('Found items'); ?>",
tree: data.tree, tree: data.tree,
baseURL: "<?php echo ui_get_full_url(false, false, false, is_metaconsole()); ?>", baseURL: "<?php echo ui_get_full_url(false, false, false, is_metaconsole()); ?>",
ajaxURL: "<?php echo ui_get_full_url('ajax.php', false, false, false); ?>", ajaxURL: "<?php echo ui_get_full_url('ajax.php', false, false, false); ?>",