AMBARI-14874. Alert Instance filter issues (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8ba3d0be Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8ba3d0be Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8ba3d0be Branch: refs/heads/branch-dev-patch-upgrade Commit: 8ba3d0beb794f979f24174ed5324d99a1c4a8e73 Parents: 6e09820 Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Tue Feb 2 12:09:18 2016 +0200 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Tue Feb 2 12:09:18 2016 +0200 ---------------------------------------------------------------------- ambari-web/app/messages.js | 3 ++- ambari-web/app/templates/main/alerts/definition_details.hbs | 6 ++++++ ambari-web/app/views/main/alerts/definition_details_view.js | 6 ++++++ 3 files changed, 14 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8ba3d0be/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 916ca2a..2de2f2b 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -1010,7 +1010,7 @@ Em.I18n.translations = { 'alerts.definition.details.serviceHost': 'Service / Host', 'alerts.definition.details.24-hour': '24-Hour', 'alerts.definition.details.notification': 'Notification', - 'alerts.definition.details.noAlerts': 'No alert instances to show', + 'alerts.definition.details.noAlerts': 'No alert instances to display', 'alerts.definition.details.configs.thresholdsErrorMsg': 'Critical threshold should be larger than warning threshold', 'alerts.notifications.error.email': 'Must be a valid email address', @@ -2694,6 +2694,7 @@ Em.I18n.translations = { 'tableView.filters.clearAllFilters': 'clear filters', 'tableView.filters.showAll': 'Show All', 'tableView.filters.filteredConfigVersionInfo': '{0} of {1} versions showing', + 'tableView.filters.filteredAlertInstancesInfo': '{0} of {1} instances showing', 'rollingrestart.dialog.title': 'Restart {0}s', 'rollingrestart.dialog.primary': 'Trigger Rolling Restart', http://git-wip-us.apache.org/repos/asf/ambari/blob/8ba3d0be/ambari-web/app/templates/main/alerts/definition_details.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/definition_details.hbs b/ambari-web/app/templates/main/alerts/definition_details.hbs index cd45524..9502378 100644 --- a/ambari-web/app/templates/main/alerts/definition_details.hbs +++ b/ambari-web/app/templates/main/alerts/definition_details.hbs @@ -232,6 +232,12 @@ </table> <div class="page-bar"> + <div class="filtered-info span4"> + {{#if view.showFilteredContent}} + <label>{{view.filteredContentInfo}} - <a {{action clearFilters target="view"}} + href="#">{{t tableView.filters.clearAllFilters}}</a></label> + {{/if}} + </div> <div class="items-on-page"> <label>{{t common.show}}: {{view view.rowsPerPageSelectView selectionBinding="view.displayLength"}}</label> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/8ba3d0be/ambari-web/app/views/main/alerts/definition_details_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/alerts/definition_details_view.js b/ambari-web/app/views/main/alerts/definition_details_view.js index a534b16..7467b0f 100644 --- a/ambari-web/app/views/main/alerts/definition_details_view.js +++ b/ambari-web/app/views/main/alerts/definition_details_view.js @@ -42,6 +42,12 @@ App.MainAlertDefinitionDetailsView = App.TableView.extend({ colPropAssoc: ['serviceName', 'hostName', 'state'], + /** + * return filtered number of all content number information displayed on the page footer bar + * @returns {String} + */ + filteredContentInfo: Em.computed.i18nFormat('tableView.filters.filteredAlertInstancesInfo', 'filteredCount', 'totalCount'), + content: function () { return this.get('controller.alerts'); }.property('controller.alerts.@each'),