Graph links do not contain proper URL path causing links to fail

Closes #2693
Cacti · May 20, 2019 · 687884d · 687884d
1 parent af945e0
commit 687884d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -7,7 +7,7 @@ Cacti CHANGELOG
 -issue#2591: Drill down to some pages may be incorrect due to logic issues
 -issue#2592: Display graphs from this aggregate can not work
 -issue#2593: Can not migrate aggregate to use a template
--issue#2598: Create aggregate without aggregate graph tempate, rrdtools error 
+-issue#2598: Create aggregate without aggregate graph tempate, rrdtools error
 -issue#2599: SQL error when create aggregate graph
 -issue#2604: SQL error when add a dataquery
 -issue#2605: When checking for tables to upgrade, undefined variable $config error occurs
@@ -35,7 +35,8 @@ Cacti CHANGELOG
 -issue#2679: Force Complexity Upon Old Passwords issue
 -issue#2680: PHP 7.2 supporting to remove deprecated $php_errormsg
 -issue#2689: Increase boost maximum memory limits
--feature#2538: New global setting to change datasource behaviour when deleting graph 
+-issue#2693: Graph links do not contain proper URL path causing links to fail
+-feature#2538: New global setting to change datasource behaviour when deleting graph
 -feature#2539: New global setting to add permanent unlock of graphs
 -feature#2540: New user setting to forget graph tree history on tab close
 -feature#2646: Allow application of automation rules on CLI

diff --git a/graph.php b/graph.php
@@ -224,7 +224,7 @@ function initializeGraph() {
 			rra_id=$(this).attr('rra_id');
 			graph_start=$(this).attr('graph_start');
 			graph_end=$(this).attr('graph_end');
-			$.get('graph.php?action=zoom&header=false&local_graph_id='+graph_id+'&rra_id='+rra_id+'&graph_start='+graph_start+'&graph_end='+graph_end)
+			$.get(urlPath+'graph.php?action=zoom&header=false&local_graph_id='+graph_id+'&rra_id='+rra_id+'&graph_start='+graph_start+'&graph_end='+graph_end)
 				.done(function(data) {
 					$('#main').html(data);
 					$('#breadcrumbs').append('<li><a id="nav_util" href="#"><?php print __('Utility View');?></a></li>');
@@ -389,7 +389,7 @@ function refreshGraph() {
 	}
 
 	function graphProperties() {
-		$.get('graph.php?action=properties&header=false&local_graph_id='+graph_id+'&rra_id=<?php print get_request_var('rra_id');?>&view_type=<?php print get_request_var('view_type');?>&graph_start='+$('#graph_start').val()+'&graph_end='+$('#graph_end').val())
+		$.get(urlPath+'graph.php?action=properties&header=false&local_graph_id='+graph_id+'&rra_id=<?php print get_request_var('rra_id');?>&view_type=<?php print get_request_var('view_type');?>&graph_start='+$('#graph_start').val()+'&graph_end='+$('#graph_end').val())
 			.done(function(data) {
 				$('#data').html(data);
 			})