From e0494a8f0bf12dc8258bc15663cbf179e75740bd Mon Sep 17 00:00:00 2001
From: Joseph Schorr <josephschorr@users.noreply.github.com>
Date: Wed, 2 Nov 2016 16:35:54 -0400
Subject: [PATCH] Fix build notification ref filtering setup in UI

Fixes #2067

This change fixes the code that sends the filtering config to the server on notification creation, as well as fixing the display of the filtering in the repository events table
---
 static/directives/create-external-notification.html | 2 +-
 static/directives/repository-events-table.html      | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/static/directives/create-external-notification.html b/static/directives/create-external-notification.html
index 7bc684365..775838d61 100644
--- a/static/directives/create-external-notification.html
+++ b/static/directives/create-external-notification.html
@@ -41,7 +41,7 @@
                   <!-- Regular expression -->
                   <div ng-switch-when="regex">
                     <div class="regex-editor" placeholder="{{field.placeholder || '' }}"
-                         binding="currentConfig[field.name]" optional="field.optional"></div>
+                         binding="currentEventConfig[field.name]" optional="field.optional"></div>
                   </div>
 
                   <!-- Value description -->
diff --git a/static/directives/repository-events-table.html b/static/directives/repository-events-table.html
index 67257080b..e8e0c963a 100644
--- a/static/directives/repository-events-table.html
+++ b/static/directives/repository-events-table.html
@@ -46,12 +46,18 @@
                   </span>
 
                   <ul class="notification-event-fields" ng-if="getEventInfo(notification).fields.length">
-                    <li ng-repeat="field in getEventInfo(notification).fields">
+                    <li ng-repeat="field in getEventInfo(notification).fields" ng-if="notification.event_config[field.name]">
                       {{ field.title }}:
                       <span ng-switch on="field.type">
                         <span ng-switch-when="enum">
                          {{ findEnumValue(field.values, notification.event_config[field.name]).title }}
                         </span>
+                        <code ng-switch-when="regex">
+                          {{ notification.event_config[field.name] }}
+                        </code>
+                        <span ng-switch-default>
+                        {{ notification.event_config[field.name] }}
+                        </span>
                       </span>
                     </li>
                   </ul>