Repository: ambari Updated Branches: refs/heads/trunk 78bc075ff -> 51475f2f9
AMBARI-11050. Widgets: unable to create widget, save fails (silently). (jaimin) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/51475f2f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/51475f2f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/51475f2f Branch: refs/heads/trunk Commit: 51475f2f9e8d972f0639311fd2f19b6ce55b507e Parents: 78bc075 Author: Jaimin Jetly <[email protected]> Authored: Mon May 11 13:13:09 2015 -0700 Committer: Jaimin Jetly <[email protected]> Committed: Mon May 11 13:13:15 2015 -0700 ---------------------------------------------------------------------- .../resources/common-services/YARN/2.1.0.2.0/YARN_widgets.json | 4 ++-- ambari-web/app/controllers/main/service/info/summary.js | 2 -- .../controllers/main/service/widgets/create/wizard_controller.js | 2 -- ambari-web/app/mixins/common/widgets/widget_mixin.js | 4 +--- 4 files changed, 3 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/51475f2f/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/YARN_widgets.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/YARN_widgets.json b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/YARN_widgets.json index 767c678..dca4205 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/YARN_widgets.json +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/YARN_widgets.json @@ -232,7 +232,7 @@ } }, { - "widget_name": "Cluster(NodeManager) Memory", + "widget_name": "Cluster Memory", "description": "Memory utilization on NodeManager hosts", "widget_type": "GRAPH", "is_visible": true, @@ -258,7 +258,7 @@ ], "values": [ { - "name": "Memory utilization on NameNode host", + "name": "Memory utilization on NodeManager hosts", "value": "${(mem_total._sum - mem_free._sum - mem_cached._sum)/mem_total._sum}" } ], http://git-wip-us.apache.org/repos/asf/ambari/blob/51475f2f/ambari-web/app/controllers/main/service/info/summary.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/info/summary.js b/ambari-web/app/controllers/main/service/info/summary.js index 26a8a4a..9455f36 100644 --- a/ambari-web/app/controllers/main/service/info/summary.js +++ b/ambari-web/app/controllers/main/service/info/summary.js @@ -373,7 +373,6 @@ App.MainServiceInfoSummaryController = Em.Controller.extend(App.WidgetSectionMix return Em.Object.create({ id: widgetId, widgetName: widgetName, - displayName: widget.WidgetInfo.display_name, description: widget.WidgetInfo.description, widgetType: widgetType, iconPath: "/img/widget-" + widgetType.toLowerCase() + ".png", @@ -423,7 +422,6 @@ App.MainServiceInfoSummaryController = Em.Controller.extend(App.WidgetSectionMix return Em.Object.create({ id: widget.WidgetInfo.id, widgetName: widgetName, - displayName: widget.WidgetInfo.display_name, description: widget.WidgetInfo.description, widgetType: widgetType, iconPath: "/img/widget-" + widgetType.toLowerCase() + ".png", http://git-wip-us.apache.org/repos/asf/ambari/blob/51475f2f/ambari-web/app/controllers/main/service/widgets/create/wizard_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/widgets/create/wizard_controller.js b/ambari-web/app/controllers/main/service/widgets/create/wizard_controller.js index 9e1744f..46bf60f 100644 --- a/ambari-web/app/controllers/main/service/widgets/create/wizard_controller.js +++ b/ambari-web/app/controllers/main/service/widgets/create/wizard_controller.js @@ -274,8 +274,6 @@ App.WidgetWizardController = App.WizardController.extend({ * @returns {$.ajax} */ postWidgetDefinition: function (data) { - //TODO remove setting diplay_name once API supports it - data.WidgetInfo.display_name = data.WidgetInfo.widget_name; return App.ajax.send({ name: 'widgets.wizard.add', sender: this, http://git-wip-us.apache.org/repos/asf/ambari/blob/51475f2f/ambari-web/app/mixins/common/widgets/widget_mixin.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mixins/common/widgets/widget_mixin.js b/ambari-web/app/mixins/common/widgets/widget_mixin.js index 6a15e57..f307335 100644 --- a/ambari-web/app/mixins/common/widgets/widget_mixin.js +++ b/ambari-web/app/mixins/common/widgets/widget_mixin.js @@ -470,7 +470,7 @@ App.WidgetMixin = Ember.Mixin.create({ /** * collect all needed data to create new widget - * @returns {{WidgetInfo: {widget_name: *, display_name: *, widget_type: *, description: *, scope: *, metrics: *, values: *, properties: *}}} + * @returns {{WidgetInfo: {widget_name: *, widget_type: *, description: *, scope: *, metrics: *, values: *, properties: *}}} */ collectWidgetData: function () { return { @@ -504,8 +504,6 @@ App.WidgetMixin = Ember.Mixin.create({ var data = this.collectWidgetData(); if (isClone) { data.WidgetInfo.widget_name += this.get('CLONE_SUFFIX'); - //TODO remove setting display_name once API supports it - data.WidgetInfo.display_name = data.WidgetInfo.widget_name; data.WidgetInfo.scope = 'USER'; } var successCallback = isEditClonedWidget ? 'editNewClonedWidget' : 'postWidgetDefinitionSuccessCallback';
