Repository: ambari Updated Branches: refs/heads/trunk 8f6964032 -> 237802151
AMBARI-10925 Create/Clone widget: widget created has malformed value array. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/23780215 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/23780215 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/23780215 Branch: refs/heads/trunk Commit: 237802151037edbe0a2cb4529d27b30451e80e1e Parents: 8f69640 Author: Andrii Tkach <[email protected]> Authored: Tue May 5 13:13:30 2015 +0300 Committer: Andrii Tkach <[email protected]> Committed: Tue May 5 13:55:45 2015 +0300 ---------------------------------------------------------------------- .../controllers/main/service/widgets/create/step2_controller.js | 1 + .../controllers/main/service/widgets/create/step3_controller.js | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/23780215/ambari-web/app/controllers/main/service/widgets/create/step2_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/widgets/create/step2_controller.js b/ambari-web/app/controllers/main/service/widgets/create/step2_controller.js index 0830f1e..d6b6cd9 100644 --- a/ambari-web/app/controllers/main/service/widgets/create/step2_controller.js +++ b/ambari-web/app/controllers/main/service/widgets/create/step2_controller.js @@ -267,6 +267,7 @@ App.WidgetWizardStep2Controller = Em.Controller.extend({ expressionData = this.parseExpression(this.get('expressions')[0]); expressionData.values = [ { + name: "", value: expressionData.value } ]; http://git-wip-us.apache.org/repos/asf/ambari/blob/23780215/ambari-web/app/controllers/main/service/widgets/create/step3_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/widgets/create/step3_controller.js b/ambari-web/app/controllers/main/service/widgets/create/step3_controller.js index 4aff9cf..39f3433 100644 --- a/ambari-web/app/controllers/main/service/widgets/create/step3_controller.js +++ b/ambari-web/app/controllers/main/service/widgets/create/step3_controller.js @@ -129,7 +129,10 @@ App.WidgetWizardStep3Controller = Em.Controller.extend({ "host_component_criteria": metric.hostComponentCriteria } }), - values: this.get('widgetValues'), + values: this.get('widgetValues').map(function (value) { + delete value.computedValue; + return value; + }), properties: this.get('widgetProperties') } };
