Ver código fonte

AMBARI-11050. Widgets: unable to create widget, save fails (silently). (jaimin)

Jaimin Jetly 10 anos atrás
pai
commit
51475f2f9e

+ 2 - 2
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}"
             }
           ],

+ 0 - 2
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",

+ 0 - 2
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,

+ 1 - 3
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';