From 43949c653df5519113887076c5a6938204ff2dc7 Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Thu, 20 Sep 2012 09:34:48 +0000
Subject: [PATCH] Use the label for the call flow status on the list and edit
 page.

---
 app/call_flows/call_flow_edit.php | 32 +++++++++++++++++++++++++------
 app/call_flows/call_flows.php     |  4 ++--
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/app/call_flows/call_flow_edit.php b/app/call_flows/call_flow_edit.php
index 12ac4f0c91..268d3a06b4 100644
--- a/app/call_flows/call_flow_edit.php
+++ b/app/call_flows/call_flow_edit.php
@@ -480,17 +480,37 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<select class='formfld' name='call_flow_status'>\n";
 	echo "	<option value=''></option>\n";
-	if ($call_flow_status == "true") { 
-		echo "	<option value='true' selected='selected'>on</option>\n";
+	if ($call_flow_status == "true") {
+		if (strlen($call_flow_label) > 0) {
+			echo "	<option value='true' selected='selected'>$call_flow_label</option>\n";
+		}
+		else {
+			echo "	<option value='true' selected='selected'>true</option>\n";
+		}
 	}
 	else {
-		echo "	<option value='true'>on</option>\n";
+		if (strlen($call_flow_label) > 0) {
+			echo "	<option value='true'>$call_flow_label</option>\n";
+		}
+		else {
+			echo "	<option value='true'>true</option>\n";
+		}
 	}
-	if ($call_flow_status == "false") { 
-		echo "	<option value='false' selected='selected'>off</option>\n";
+	if ($call_flow_status == "false") {
+		if (strlen($call_flow_anti_label) > 0) {
+			echo "	<option value='false' selected='selected'>$call_flow_anti_label</option>\n";
+		}
+		else {
+			echo "	<option value='false' selected='selected'>false</option>\n";
+		}
 	}
 	else {
-		echo "	<option value='false'>off</option>\n";
+		if (strlen($call_flow_anti_label) > 0) {
+			echo "	<option value='false'>$call_flow_anti_label</option>\n";
+		}
+		else {
+			echo "	<option value='false'>false</option>\n";
+		}
 	}
 	echo "	</select>\n";
 	echo "<br />\n";
diff --git a/app/call_flows/call_flows.php b/app/call_flows/call_flows.php
index 481fb1b403..e234033404 100644
--- a/app/call_flows/call_flows.php
+++ b/app/call_flows/call_flows.php
@@ -123,10 +123,10 @@ require_once "includes/paging.php";
 			echo "<tr >\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>";
 			if ($row['call_flow_status'] != "false") {
-				echo "On";
+				echo $row['call_flow_label'];
 			}
 			else {
-				echo "Off";
+				echo $row['call_flow_anti_label'];
 			}
 			echo 		"&nbsp;\n";
 			echo "	</td>\n";