home/pinpoint
2
0
Fork 0
mirror of https://github.com/wahyd4/pinpoint.git synced 2026-08-09 04:46:06 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix bug.

Browse Source 
https://github.com/naver/pinpoint/issues/2860
This commit is contained in:
denz
2017-04-27 13:38:26 +09:00
committed by HyoJong
parent 279768233c
commit 63adf40d88
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/src/main/webapp/features/configuration/application/alarm-rule.directive.js
+16 -2
View File
@@ -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 ) ) {
web/src/main/webapp/features/configuration/application/alarmRule.html
+5 -5
View File
@@ -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>