Skip to content

Commit

Permalink
Fixing #5377 - Issues searching from tree edit
Browse files Browse the repository at this point in the history
When attempting to edit a tree, the search filter for Graphs remains disabled
  • Loading branch information
TheWitness committed Jun 16, 2023
1 parent d572546 commit 99336d2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
Expand Up @@ -39,6 +39,7 @@ Cacti CHANGELOG
-issue#5366: RRDcheck does not log using proper case
-issue#5372: PHP configuration file may not have expected settings
-issue#5376: Auth attempts to check for a user lockout when there is no user
-issue#5377: When attempting to edit a tree, the search filter for Graphs remains disabled
-feature#5375: Add template for Fortinet firewall and Aruba Instant cluster
-feature: Upgrade billboard.js to version 3.7.4
-feature: Upgrade d3.js to version 7.8.2
Expand Down
6 changes: 3 additions & 3 deletions tree.php
Expand Up @@ -930,7 +930,7 @@ function tree_edit($partial = false) {
<?php print __('Search'); ?>
</td>
<td>
<input type='text' class='ui-state-default ui-corner-all' id='grfilter' name='grfilter' size='25' value='<?php print html_escape_request_var('grfilter');?>'>
<input type='text' class='ui-state-default ui-corner-all' id='gfilter' name='gfilter' size='25' value='<?php print html_escape_request_var('gfilter');?>'>
</td>
</tr>
</table>
Expand Down Expand Up @@ -1000,7 +1000,7 @@ function loadTreeEdit(url) {
}

function getGraphData() {
$.get('tree.php?action=graphs&filter='+$('#grfilter').val()
$.get('tree.php?action=graphs&filter='+$('#gfilter').val()
+ '&site_id=' + (selectedItem.site_id ? selectedItem.site_id:'')
+ '&host_id=' + (selectedItem.host_id ? selectedItem.host_id:''))
.done(function(data) {
Expand Down Expand Up @@ -1321,7 +1321,7 @@ function drawTree() {
}

function enableKeyups() {
$('#grfilter').keyup(function(data) {
$('#gfilter').keyup(function(data) {
graphMeTimer && clearTimeout(graphMeTimer);
graphMeTimer = setTimeout(getGraphData, 300);
});
Expand Down

0 comments on commit 99336d2

Please sign in to comment.