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

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

Browse Source 
Conflicts resolved:
	pandora_console/operation/tree2.php
This commit is contained in:
Alejandro Gallardo Escobar 2014-12-18 11:54:11 +01:00
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

12
pandora_console/operation/tree2.php
View File

@ -123,15 +123,15 @@ echo '</form>';
// --------------------- form filter ----------------------------------- // --------------------- form filter -----------------------------------
ui_require_javascript_file("TreeController", "include/javascript/tree/"); 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 id='tree-controller-recipient'>";
echo "</div>"; echo "</div>";
echo "<div id='tree-controller-detail-recipient'>"; echo "<div id='tree-controller-detail-recipient'>";
echo "</div>"; echo "</div>";
?> ?>
<script type="text/javascript"> <script type="text/javascript">
$(".loading_tree").hide();
var treeController = TreeController.getController(); var treeController = TreeController.getController();
processTreeSearch(); processTreeSearch();
@ -159,7 +159,7 @@ echo "</div>";
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: "<?php echo $config['homeurl']; ?>/ajax.php", url: "<?php echo $config['homeurl']; ?>ajax.php",
data: parameters, data: parameters,
success: function(data) { success: function(data) {
if (data.success) { if (data.success) {
@ -170,8 +170,8 @@ echo "</div>";
detailRecipient: $("div#tree-controller-detail-recipient"), detailRecipient: $("div#tree-controller-detail-recipient"),
page: page, page: page,
tree: data.tree, tree: data.tree,
baseURL: "<?php echo $config['homeurl']; ?>/", baseURL: "<?php echo $config['homeurl']; ?>",
ajaxURL: "<?php echo $config['homeurl']; ?>/ajax.php", ajaxURL: "<?php echo $config['homeurl']; ?>ajax.php",
filter: { filter: {
search: parameters['filter']['search'], search: parameters['filter']['search'],
status: parameters['filter']['status'] status: parameters['filter']['status']