You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2014/10/04 05:17:31 UTC
[48/50] [abbrv] git commit: AMBARI-7634. Fix Slider Config names for
ganglia hosts and clusters - yarn RM URL (srimanth)
AMBARI-7634. Fix Slider Config names for ganglia hosts and clusters - yarn RM URL (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4b0ff930
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4b0ff930
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4b0ff930
Branch: refs/heads/branch-alerts-dev
Commit: 4b0ff93019793425f8c6a4ede38f63a9f2da4256
Parents: 5e0010e
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Fri Oct 3 14:07:44 2014 -0700
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Fri Oct 3 14:07:50 2014 -0700
----------------------------------------------------------------------
.../resources/ui/app/controllers/slider_app_controller.js | 7 +++++++
contrib/views/slider/src/main/resources/ui/app/routes/main.js | 3 ++-
2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b0ff930/contrib/views/slider/src/main/resources/ui/app/controllers/slider_app_controller.js
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/resources/ui/app/controllers/slider_app_controller.js b/contrib/views/slider/src/main/resources/ui/app/controllers/slider_app_controller.js
index c4aa6fc..2754891 100644
--- a/contrib/views/slider/src/main/resources/ui/app/controllers/slider_app_controller.js
+++ b/contrib/views/slider/src/main/resources/ui/app/controllers/slider_app_controller.js
@@ -76,6 +76,13 @@ App.SliderAppController = Ember.ObjectController.extend(App.AjaxErrorHandler, {
customConfirm: 'confirmDestroy'
});
}
+ if ('FAILED' === status) {
+ advanced.pushObject({
+ title: 'Destroy',
+ action: 'destroy',
+ customConfirm: 'confirmDestroy'
+ });
+ }
if (advanced.length) {
actions.pushObject({
title: 'Advanced',
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b0ff930/contrib/views/slider/src/main/resources/ui/app/routes/main.js
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/resources/ui/app/routes/main.js b/contrib/views/slider/src/main/resources/ui/app/routes/main.js
index 4fa08b0..e5d6efa 100644
--- a/contrib/views/slider/src/main/resources/ui/app/routes/main.js
+++ b/contrib/views/slider/src/main/resources/ui/app/routes/main.js
@@ -53,7 +53,8 @@ App.SliderAppsRoute = Ember.Route.extend({
// Load sliderConfigs to storage
App.SliderApp.store.pushMany('sliderConfig', Em.A([
Em.Object.create({id: 1, required: false, viewConfigName: 'ganglia.server.hostname', displayName: 'gangliaServer'}),
- Em.Object.create({id: 2, required: false, viewConfigName: 'ganglia.additional.clusters', displayName: 'gangliaClusters'})
+ Em.Object.create({id: 2, required: false, viewConfigName: 'ganglia.additional.clusters', displayName: 'gangliaClusters'}),
+ Em.Object.create({id: 3, required: false, viewConfigName: 'yarn.rm.webapp.url', displayName: 'yarnRmWebappUrl'})
]));
},