From be5aae338c4f9e20f5166c10530e9391953f6785 Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Fri, 28 Apr 2017 21:46:47 -0400
Subject: [PATCH] CRM-20478 Case type: timeline displayed activity type and
 status names rather than labels

---
 ang/crmCaseType.js                 | 6 ++++++
 ang/crmCaseType/timelineTable.html | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ang/crmCaseType.js b/ang/crmCaseType.js
index d1765d5c4c..f4e732bd6d 100644
--- a/ang/crmCaseType.js
+++ b/ang/crmCaseType.js
@@ -149,6 +149,11 @@
     $scope.caseType.definition = $scope.caseType.definition || [];
     $scope.caseType.definition.activityTypes = $scope.caseType.definition.activityTypes || [];
     $scope.caseType.definition.activitySets = $scope.caseType.definition.activitySets || [];
+    _.each($scope.caseType.definition.activitySets, function (set) {
+      _.each(set.activityTypes, function (type, name) {
+        type.label = $scope.activityTypes[type.name].label;
+      });
+    });
     $scope.caseType.definition.caseRoles = $scope.caseType.definition.caseRoles || [];
     $scope.caseType.definition.statuses = $scope.caseType.definition.statuses || [];
 
@@ -181,6 +186,7 @@
     function addActivityToSet(activitySet, activityTypeName) {
       activitySet.activityTypes.push({
         name: activityTypeName,
+        label: $scope.activityTypes[activityTypeName].label,
         status: 'Scheduled',
         reference_activity: 'Open Case',
         reference_offset: '1',
diff --git a/ang/crmCaseType/timelineTable.html b/ang/crmCaseType/timelineTable.html
index e447f535db..c8108f9849 100644
--- a/ang/crmCaseType/timelineTable.html
+++ b/ang/crmCaseType/timelineTable.html
@@ -22,14 +22,14 @@ Required vars: activitySet
     </td>
     <td>
       <i class="crm-i {{ activityTypes[activity.name].icon }}"></i>
-      {{ activity.name }}
+      {{ activity.label }}
     </td>
     <td>
       <select
         ui-jq="select2"
         ui-options="{dropdownAutoWidth : true}"
         ng-model="activity.status"
-        ng-options="actStatus.name as actStatus.name for actStatus in activityStatuses|orderBy:'name'"
+        ng-options="actStatus.name as actStatus.label for actStatus in activityStatuses|orderBy:'label'"
         >
         <option value=""></option>
       </select>
@@ -39,7 +39,7 @@ Required vars: activitySet
         ui-jq="select2"
         ui-options="{dropdownAutoWidth : true}"
         ng-model="activity.reference_activity"
-        ng-options="activityType.name as activityType.label for (activityTypeName,activityType) in activityTypes"
+        ng-options="activityType.name as activityType.label for activityType in activitySet.activityTypes"
         ng-hide="activity.name == 'Open Case'"
         ng-required="activity.name != 'Open Case'"
         >
-- 
2.25.1