You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2018/03/14 11:00:27 UTC
[ambari] branch trunk updated: AMBARI-23038 Alert filter with
services having space is not working
This is an automated email from the ASF dual-hosted git repository.
atkach pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 820e327 AMBARI-23038 Alert filter with services having space is not working
820e327 is described below
commit 820e327c818dafc8194e378b58823cd35bf68262
Author: Andrii Tkach <at...@apache.org>
AuthorDate: Mon Mar 12 14:15:04 2018 +0200
AMBARI-23038 Alert filter with services having space is not working
---
ambari-web/app/views/main/alert_definitions_view.js | 5 ++---
ambari-web/app/views/main/alerts/alert_search_box.js | 4 ++--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ambari-web/app/views/main/alert_definitions_view.js b/ambari-web/app/views/main/alert_definitions_view.js
index 3502ad1..aaf604b 100644
--- a/ambari-web/app/views/main/alert_definitions_view.js
+++ b/ambari-web/app/views/main/alert_definitions_view.js
@@ -17,8 +17,7 @@
*/
var App = require('app');
-var filters = require('views/common/filter_view'),
- sort = require('views/common/sort_view');
+var sort = require('views/common/sort_view');
App.MainAlertDefinitionsView = App.TableView.extend({
@@ -91,7 +90,7 @@ App.MainAlertDefinitionsView = App.TableView.extend({
*/
totalCount: Em.computed.alias('content.length'),
- colPropAssoc: ['', 'label', 'summary', 'serviceName', 'type', 'lastTriggered', 'enabled', 'groups'],
+ colPropAssoc: ['', 'label', 'summary', 'serviceDisplayName', 'type', 'lastTriggered', 'enabled', 'groups'],
sortView: sort.wrapperView,
diff --git a/ambari-web/app/views/main/alerts/alert_search_box.js b/ambari-web/app/views/main/alerts/alert_search_box.js
index 07fa336..a0f5d8b 100644
--- a/ambari-web/app/views/main/alerts/alert_search_box.js
+++ b/ambari-web/app/views/main/alerts/alert_search_box.js
@@ -40,7 +40,7 @@ App.MainAlertDefinitionSearchBoxView = App.SearchBoxView.extend({
},
{
label: Em.I18n.t('common.service'),
- key: 'serviceName',
+ key: 'serviceDisplayName',
type: 'select',
column: 3
},
@@ -99,7 +99,7 @@ App.MainAlertDefinitionSearchBoxView = App.SearchBoxView.extend({
case 'label':
this.getLabelAvailableValues(facetValue, callback);
break;
- case 'serviceName':
+ case 'serviceDisplayName':
this.getServiceAvailableValues(facetValue, callback);
break;
case 'lastTriggered':
--
To stop receiving notification emails like this one, please contact
atkach@apache.org.