From 76dd84e307c813f4fea82fff09aaf5d378682771 Mon Sep 17 00:00:00 2001
From: Nick Harper <nharper@fb.com>
Date: Mon, 23 Jan 2012 13:10:52 -0800
Subject: [PATCH] Replace HeraldActionConfig::getActionMap() in
 HeraldTranscriptController

Summary:
D1449 removed HeraldActionConfig::getActionMap(), but it was still used in
HeraldTranscriptController. This fixes the controller to use the method that
replaced getActionMap.

Test Plan: loaded a herald transcript

Reviewers: epriestley, xela

Reviewed By: epriestley

CC: aran

Differential Revision: https://secure.phabricator.com/D1466
---
 .../controller/transcript/HeraldTranscriptController.php    | 6 +++---
 src/applications/herald/controller/transcript/__init__.php  | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/applications/herald/controller/transcript/HeraldTranscriptController.php b/src/applications/herald/controller/transcript/HeraldTranscriptController.php
index 4840352817..a507e89103 100644
--- a/src/applications/herald/controller/transcript/HeraldTranscriptController.php
+++ b/src/applications/herald/controller/transcript/HeraldTranscriptController.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -293,7 +293,8 @@ class HeraldTranscriptController extends HeraldController {
   private function buildApplyTranscriptPanel($xscript) {
     $handles = $this->handles;
 
-    $action_names = HeraldActionConfig::getActionMap();
+    $action_names = HeraldActionConfig::getActionMessageMapForRuleType(
+      HeraldRuleTypeConfig::RULE_TYPE_GLOBAL);
 
     $rows = array();
     foreach ($xscript->getApplyTranscripts() as $apply_xscript) {
@@ -357,7 +358,6 @@ class HeraldTranscriptController extends HeraldController {
 
     $field_names = HeraldFieldConfig::getFieldMap();
     $condition_names = HeraldConditionConfig::getConditionMap();
-    $action_names = HeraldActionConfig::getActionMap();
 
     $handles = $this->handles;
 
diff --git a/src/applications/herald/controller/transcript/__init__.php b/src/applications/herald/controller/transcript/__init__.php
index 3208b3b1e0..9c9a56c3d5 100644
--- a/src/applications/herald/controller/transcript/__init__.php
+++ b/src/applications/herald/controller/transcript/__init__.php
@@ -9,6 +9,7 @@
 phutil_require_module('phabricator', 'applications/herald/config/action');
 phutil_require_module('phabricator', 'applications/herald/config/condition');
 phutil_require_module('phabricator', 'applications/herald/config/field');
+phutil_require_module('phabricator', 'applications/herald/config/ruletype');
 phutil_require_module('phabricator', 'applications/herald/controller/base');
 phutil_require_module('phabricator', 'applications/herald/storage/transcript/base');
 phutil_require_module('phabricator', 'applications/phid/handle/data');