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

Fixes

This commit is contained in:
Alejandro Gallardo Escobar 2014-12-17 19:45:09 +01:00
parent 530454ea72
commit 9b8f53691a
4 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@ TreeController = {
errorMessage: "Error",
baseURL: "",
ajaxURL: "ajax.php",
ajaxPage: "include/ajax/tree.ajax.php",
ajaxPage: "include/ajax/tree.ajax",
detailRecipient: '',
reload: function () {
// Bad recipient
@ -60,7 +60,7 @@ TreeController = {
elements.forEach(function(element, index) {
lastNode = index == elements.length - 1 ? true : false;
firstNode = rootGroup && index == 0 ? true : false;
element.jqObject = _processNode($group, detailRecipient, element, lastNode, firstNode);
element.jqObject = _processNode($group, detailContainer, element, lastNode, firstNode);
}, $group);
return $group;
@ -119,7 +119,7 @@ TreeController = {
$node.addClass("leaf-closed");
// Add children
var $children = _processGroup($node, this.detailContainer, element.children, this.baseURL);
var $children = _processGroup($node, detailContainer, element.children, this.baseURL);
$node.data('children', $children);
$leafIcon.click(function () {
@ -142,7 +142,9 @@ TreeController = {
else if (typeof element.searchChildren != 'undefined' && element.searchChildren) {
$node.addClass("leaf-closed");
$leafIcon.click(function () {
$leafIcon.click(function (e) {
e.preventDefault();
if (! $node.hasClass("children-loaded")) {
$node
.removeClass("leaf-closed")
@ -150,23 +152,24 @@ TreeController = {
.addClass("leaf-loading");
$.ajax({
url: this.ajaxURL,
url: controller.ajaxURL,
type: 'POST',
dataType: 'json',
data: {
page: this.ajaxPage,
page: controller.ajaxPage,
getChildren: 1,
id: element.id,
type: element.type
},
complete: function(xhr, textStatus) {
$node.removeClass("leaf-loading");
$node.addClass("children-loaded")
},
success: function(data, textStatus, xhr) {
if (data.success) {
$node.addClass("leaf-open");
var $children = _processGroup($node, this.detailContainer, data.elements, this.baseURL);
var $children = _processGroup($node, detailContainer, data.tree, controller.baseURL);
$children.slideDown();
$node.data('children', $children);
@ -298,7 +301,7 @@ TreeNodeDetailController = {
errorMessage: "Error",
baseURL: "",
ajaxURL: "ajax.php",
ajaxPage: "include/ajax/tree.ajax.php",
ajaxPage: "include/ajax/tree.ajax",
container: '',
reload: function () {
// Label

4
pandora_console/include/styles/pandora.css
View File

@ -2895,6 +2895,10 @@ table#policy_modules td * {
background-image: url(../../images/tree/first_leaf.png);
}
.tree-node.leaf-error>.leaf-icon {
background-image: url(../../images/tree/last_leaf.png);
}
.tree-node>.leaf-icon {
background-position: 0px 0px;
background-repeat: no-repeat;

5
pandora_console/operation/tree.php
View File

@ -1056,8 +1056,7 @@ echo "<div id='tree-controller-detail-recipient'></div>";
recipient: $("div#tree-controller-recipient"),
detailRecipient: $("div#tree-controller-detail-recipient"),
tree: tree,
baseURL: "<?php echo $config['homeurl'].'/'; ?>",
ajaxURL: "<?php echo $config['homeurl']; ?>/ajax.php",
ajaxPage: "<?php echo $config['homeurl']; ?>/include/ajax/tree.ajax.php"
baseURL: "<?php echo $config['homeurl']; ?>/",
ajaxURL: "<?php echo $config['homeurl']; ?>/ajax.php"
});
</script>

6
pandora_console/operation/tree2.php
View File

@ -139,7 +139,7 @@ echo "</div>";
$.ajax({
type: "POST",
url: "<?php echo ui_get_full_url("ajax.php", false, false, false); ?>",
url: "<?php echo $config['homeurl']; ?>/ajax.php",
data: parameters,
success: function(data) {
if (data.success) {
@ -148,7 +148,9 @@ echo "</div>";
treeController.init({
recipient: $("div#tree-controller-recipient"),
page: page,
tree: data.tree
tree: data.tree,
baseURL: "<?php echo $config['homeurl']; ?>/",
ajaxURL: "<?php echo $config['homeurl']; ?>/ajax.php"
});
}
},