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

Merge branch 'feature/NewTreeView' of https://github.com/pandorafms/pandorafms into feature/NewTreeView 

Conflicts resolved:
	pandora_console/operation/tree2.php
This commit is contained in:
Alejandro Gallardo Escobar 2014-12-18 11:54:11 +01:00
parent 677c8cfa0d 56119d0b28
commit 4c933c3434
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pandora_console/operation/tree2.php
View File

@ -123,32 +123,32 @@ echo '</form>';
// --------------------- form filter -----------------------------------
ui_require_javascript_file("TreeController", "include/javascript/tree/");
html_print_image('images/spinner.gif', false, array('class' => "loading_tree"));
html_print_image('images/spinner.gif', false,
array('class' => "loading_tree",
'style' => 'display: none;'));
echo "<div id='tree-controller-recipient'>";
echo "</div>";
echo "<div id='tree-controller-detail-recipient'>";
echo "</div>";
?>
<script type="text/javascript">
$(".loading_tree").hide();
var treeController = TreeController.getController();
processTreeSearch();
$("form#tree_search").submit(function(e) {
e.preventDefault();
processTreeSearch();
});
function processTreeSearch () {
// Clear the tree
if (typeof treeController.recipient != 'undefined' && treeController.recipient.length > 0)
treeController.recipient.empty();
$(".loading_tree").show();
var parameters = {};
parameters['page'] = "include/ajax/tree.ajax";
parameters['getChildren'] = 1;
@ -159,7 +159,7 @@ echo "</div>";
$.ajax({
type: "POST",
url: "<?php echo $config['homeurl']; ?>/ajax.php",
url: "<?php echo $config['homeurl']; ?>ajax.php",
data: parameters,
success: function(data) {
if (data.success) {
@ -170,8 +170,8 @@ echo "</div>";
detailRecipient: $("div#tree-controller-detail-recipient"),
page: page,
tree: data.tree,
baseURL: "<?php echo $config['homeurl']; ?>/",
ajaxURL: "<?php echo $config['homeurl']; ?>/ajax.php",
baseURL: "<?php echo $config['homeurl']; ?>",
ajaxURL: "<?php echo $config['homeurl']; ?>ajax.php",
filter: {
search: parameters['filter']['search'],
status: parameters['filter']['status']