From 18512a80c1acb613fc19720b71222cf5b9f14354 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Fri, 4 Feb 2022 11:47:13 -0700
Subject: [PATCH] Join the call flow extension and feature codes in one list.
 (#6287)

* Join the call flow extension and feature codes in one list.

* Remove call_flow_feature_destinations permission.

This permission was added recently and changes to code no longer use it.
---
 app/call_flows/app_config.php | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/call_flows/app_config.php b/app/call_flows/app_config.php
index b38a83149f..e344a2370c 100644
--- a/app/call_flows/app_config.php
+++ b/app/call_flows/app_config.php
@@ -32,7 +32,7 @@
 	//destination details
 		$y=0;
 		$apps[$x]['destinations'][$y]['type'] = "sql";
-		$apps[$x]['destinations'][$y]['label'] = "call_flow_extension";
+		$apps[$x]['destinations'][$y]['label'] = "call_flows";
 		$apps[$x]['destinations'][$y]['name'] = "call_flows";
 		$apps[$x]['destinations'][$y]['sql'] = "select call_flow_name as name, call_flow_uuid as uuid, call_flow_extension as destination, call_flow_context as context from v_call_flows ";
 		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '\${domain_uuid}' and call_flow_enabled = 'true' ";
@@ -47,8 +47,8 @@
 		$apps[$x]['destinations'][$y]['select_label'] = "\${destination} \${name}";
 		$y++;
 		$apps[$x]['destinations'][$y]['type'] = "sql";
-		$apps[$x]['destinations'][$y]['label'] = "call_flow_feature";
-		$apps[$x]['destinations'][$y]['name'] = "call_flow_feature";
+		$apps[$x]['destinations'][$y]['label'] = "call_flows";
+		$apps[$x]['destinations'][$y]['name'] = "call_flows";
 		$apps[$x]['destinations'][$y]['sql'] = "select call_flow_name as name, call_flow_uuid as uuid, call_flow_extension as extension, call_flow_feature_code as destination, call_flow_context as context from v_call_flows ";
 		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '\${domain_uuid}' and call_flow_enabled = 'true' ";
 		$apps[$x]['destinations'][$y]['order_by'] = "call_flow_extension asc";
@@ -90,10 +90,6 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "call_flow_feature_destinations";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		$apps[$x]['permissions'][$y]['groups'][] = "admin";
-		$y++;
 
 	//cache details
 		$apps[$x]['cache']['key'] = "dialplan.\${call_flow_context}";