You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by xi...@apache.org on 2014/11/15 01:34:02 UTC
[2/2] ambari git commit: AMBARI-8338. Alerts UI: Unable to
enable/disable definition from the definition details page.(xiwang)
AMBARI-8338. Alerts UI: Unable to enable/disable definition from the definition details page.(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6f38721c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6f38721c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6f38721c
Branch: refs/heads/trunk
Commit: 6f38721c76aba47728c72e6e49b12ca0d25e6326
Parents: 135b00e
Author: Xi Wang <xi...@apache.org>
Authored: Fri Nov 14 15:02:01 2014 -0800
Committer: Xi Wang <xi...@apache.org>
Committed: Fri Nov 14 16:32:56 2014 -0800
----------------------------------------------------------------------
ambari-web/app/messages.js | 2 ++
.../templates/main/alerts/definition_details.hbs | 9 +++++++--
.../views/main/alerts/definition_details_view.js | 17 ++++++++++++++---
3 files changed, 23 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f38721c/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 43d360c..8424f05 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -844,6 +844,8 @@ Em.I18n.translations = {
'alerts.filters.filteredAlertsInfo': '{0} of {1} alerts showing',
'alerts.thresholds': 'Thresholds',
+ 'alerts.definition.details.enable': 'Enable',
+ 'alerts.definition.details.disable': 'Disable',
'alerts.definition.details.enableDisable': 'Enable / Disable',
'alerts.definition.details.groups': 'Groups',
'alerts.definition.details.instances': 'Instances',
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f38721c/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 981e1a0..95dedc8 100644
--- a/ambari-web/app/templates/main/alerts/definition_details.hbs
+++ b/ambari-web/app/templates/main/alerts/definition_details.hbs
@@ -94,8 +94,13 @@
{{t common.service}}: <span class="label label-info">{{controller.content.service.serviceName}}</span>
</div>
<div>
- <button {{action disableEnableAlertDefinition target="view"}} class="btn btn-primary"><i
- class="icon-power-off"></i> {{t alerts.definition.details.enableDisable}}</button>
+ {{#if controller.content.enabled}}
+ <button {{action toggleState target="view"}} class="btn btn-danger"><i
+ class="icon-power-off"></i> {{t alerts.definition.details.disable}}</button>
+ {{else}}
+ <button {{action toggleState target="view"}} class="btn btn-success"><i
+ class="icon-power-off"></i> {{t alerts.definition.details.enable}}</button>
+ {{/if}}
<button {{action deleteAlertDefinition target="view"}} class="btn btn-primary"><i
class="icon-trash"></i> {{t common.delete}}</button>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f38721c/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 b29773d..a8bc4f4 100644
--- a/ambari-web/app/views/main/alerts/definition_details_view.js
+++ b/ambari-web/app/views/main/alerts/definition_details_view.js
@@ -120,10 +120,21 @@ App.MainAlertDefinitionDetailsView = App.TableView.extend({
/**
* "Disable / Enable" button handler
- * @param event
+ * @returns {$.ajax}
+ * @method toggleState
*/
- disableEnableAlertDefinition: function (event) {
- // todo: provide disabling/enabling of alert definition
+ toggleState: function() {
+ var alertDefinition = this.get('controller.content');
+ return App.ajax.send({
+ name: 'alerts.update_alert_definition',
+ sender: this,
+ data: {
+ id: alertDefinition.get('id'),
+ data: {
+ "AlertDefinition/enabled": !alertDefinition.get('enabled')
+ }
+ }
+ });
},
/**