From 63adf40d88f59db554948ff7fe4d04a56362ad13 Mon Sep 17 00:00:00 2001
From: denz <hyojong.song2015@navercorp.com>
Date: Thu, 27 Apr 2017 13:33:59 +0900
Subject: [PATCH] fix bug.  https://github.com/naver/pinpoint/issues/2860

---
 .../application/alarm-rule.directive.js        | 18 ++++++++++++++++--
 .../configuration/application/alarmRule.html   | 10 +++++-----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/web/src/main/webapp/features/configuration/application/alarm-rule.directive.js b/web/src/main/webapp/features/configuration/application/alarm-rule.directive.js
index ff2aba236..4ca277d64 100644
--- a/web/src/main/webapp/features/configuration/application/alarm-rule.directive.js
+++ b/web/src/main/webapp/features/configuration/application/alarm-rule.directive.js
@@ -214,6 +214,20 @@
 						scope.ruleList = oRuleList;
 					}, showAlert );
 				};
+				scope.onCaptureUpdateClick = function($event) {
+					if ( $event.target.tagName.toUpperCase() === "SPAN" ) {
+						var $target = $($event.target);
+						if ( $target.hasClass( "update-confirm") ) {
+							scope.onApplyUpdateAlarm();
+						} else if ( $target.hasClass( "update-cancel") ) {
+							scope.onCancelUpdateAlarm();
+						} else if ( $target.hasClass( "add-confirm") ) {
+							scope.onApplyAddAlarm();
+						} else if ( $target.hasClass( "add-cancel" ) ) {
+							scope.onCancelAddAlarm();
+						}
+					}
+				};
 				scope.$on("applicationGroup.sub.load", function( event, appId, invokeCount ) {
 					currentApplicationId = appId;
 					cancelPreviousWork();
@@ -245,7 +259,7 @@
         };
     }]);
 	var CONSTS = {
-		SELECT_USERGROUP_OR_RULE: "Select user group or rule.",
+		SELECT_USER_GROUP_OR_RULE: "Select user group or rule.",
 		EXIST_A_SAME: "Exist a same rule set in the list",
 		DIV_NORMAL: "div._normal",
 		DIV_REMOVE: "div._remove",
@@ -278,7 +292,7 @@
 				$.each( aEditNodes, function( index, $el ) {
 					$el.addClass("blink-blink");
 				});
-				cbFail({ errorMessage: CONSTS.SELECT_USERGROUP_OR_RULE });
+				cbFail({ errorMessage: CONSTS.SELECT_USER_GROUP_OR_RULE });
 				return;
 			}
 			if ( cbHasAlarm( oNewRule.userGroupId, oNewRule.checkerName ) ) {
diff --git a/web/src/main/webapp/features/configuration/application/alarmRule.html b/web/src/main/webapp/features/configuration/application/alarmRule.html
index 5cf6bec68..223f4bb80 100644
--- a/web/src/main/webapp/features/configuration/application/alarmRule.html
+++ b/web/src/main/webapp/features/configuration/application/alarmRule.html
@@ -15,7 +15,7 @@
 						<th class="col-md-2"></th>
 					</tr>
 				</thead>
-				<tbody>
+				<tbody ng-click="onCaptureUpdateClick($event)">
 					<tr class="_edit1 hide-me" style="background-color:#F3FBFF">
 						<td class="col-md-4">
 							<select class="form-control" name="rule" style="width:95%;height:26px;padding:2px;">
@@ -42,12 +42,12 @@
 						</td>
 						<td class="col-md-2">
 							<div class="_edit" style="line-height:20px;">
-								<span class="glyphicon glyphicon-ok edit-confirm" aria-hidden="true" ng-click="onApplyUpdateAlarm()"></span>
-								<span class="glyphicon glyphicon-remove remove" aria-hidden="true" ng-click="onCancelUpdateAlarm()"></span>
+								<span class="glyphicon glyphicon-ok update-confirm edit-confirm" aria-hidden="true"></span>
+								<span class="glyphicon glyphicon-remove update-cancel remove" aria-hidden="true"></span>
 							</div>
 							<div class="_add hide-me" style="line-height:20px;">
-								<span class="glyphicon glyphicon-ok edit-confirm" aria-hidden="true" ng-click="onApplyAddAlarm()"></span>
-								<span class="glyphicon glyphicon-remove remove" aria-hidden="true" ng-click="onCancelAddAlarm()"></span>
+								<span class="glyphicon glyphicon-ok add-confirm edit-confirm" aria-hidden="true"></span>
+								<span class="glyphicon glyphicon-remove add-cancel remove" aria-hidden="true"></span>
 							</div>
 						</td>
 					</tr>