tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +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 
[Tree view] Substitute items by groups

See merge request artica/pandorafms!1372
This commit is contained in:
vgilc 2018-03-15 12:26:49 +01:00
commit 5fc4e30c6d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@ var TreeController = {
recipient: '', recipient: '',
tree: [], tree: [],
emptyMessage: "No data found.", emptyMessage: "No data found.",
foundMessage: "Found items", foundMessage: "Found groups",
errorMessage: "Error", errorMessage: "Error",
baseURL: "", baseURL: "",
ajaxURL: "ajax.php", ajaxURL: "ajax.php",

2
pandora_console/operation/tree.php
View File

@ -283,7 +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'); ?>", foundMessage: "<?php echo __('Found groups'); ?>",
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); ?>",