Fixing #5459 - API Duplicate Graph Template too agressive

There is no option to not duplicate Graph Template Data Query association when duplicating a Graph Template
Cacti · Aug 20, 2023 · bf1cf1e · bf1cf1e
1 parent a97ec10
commit bf1cf1e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -73,6 +73,7 @@ Cacti CHANGELOG
 -issue#5454: Cacti Orphan Graphs Selector missing column 'orphan' in SQL selector
 -issue#5457: Enable 'Re-Index All Device Schedule' causes a lot of reindex processes  
 -issue#5458: Unable to delete a Data Query when there are no Graphs using it
+-issue#5459: There is no option to not duplicate Graph Template Data Query association when duplicating a Graph Template
 -feature#5375: Add template for Fortinet firewall and Aruba Instant cluster
 -feature#5393: Add template for SNMP printer
 -feature#5418: Display device class before package import

diff --git a/lib/api_graph.php b/lib/api_graph.php
@@ -342,7 +342,7 @@ function api_get_graphs_from_datasource($local_data_id) {
 		AND data_template_rrd.local_data_id = ?', array($local_data_id)), 'id', 'name');
 }
 
-function api_duplicate_graph($_local_graph_id, $_graph_template_id, $graph_title) {
+function api_duplicate_graph($_local_graph_id, $_graph_template_id, $graph_title, $map_to_data_query = true) {
 	global $struct_graph, $struct_graph_item;
 
 	if (!empty($_local_graph_id)) {
@@ -487,7 +487,7 @@ function api_duplicate_graph($_local_graph_id, $_graph_template_id, $graph_title
 
 	if (!empty($_local_graph_id)) {
 		update_graph_title_cache($local_graph_id);
-	} else {
+	} elseif ($map_to_data_query) {
 		// Graph Template, Check for Data Query Associated Graph Template
 		$data_query_graphs = db_fetch_assoc_prepared('SELECT *
 			FROM snmp_query_graph