AMBARI-20246.Not able to preview the xml for coordinator. (Padma Priya N via gauravn7)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f79a48b2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f79a48b2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f79a48b2 Branch: refs/heads/branch-feature-AMBARI-12556 Commit: f79a48b2e02e4c5bdfb771bb3fbe32b4fc9e82d5 Parents: 99df82f Author: Gaurav Nagar <grv...@gmail.com> Authored: Wed Mar 1 17:22:16 2017 +0530 Committer: Gaurav Nagar <grv...@gmail.com> Committed: Wed Mar 1 17:22:16 2017 +0530 ---------------------------------------------------------------------- .../src/main/resources/ui/app/components/coord-config.js | 2 +- .../src/main/resources/ui/app/components/sla-info.js | 11 +++++++++++ .../app/domain/coordinator/coordinator-xml-importer.js | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f79a48b2/contrib/views/wfmanager/src/main/resources/ui/app/components/coord-config.js ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/components/coord-config.js b/contrib/views/wfmanager/src/main/resources/ui/app/components/coord-config.js index b5592a6..2d0a23c 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/components/coord-config.js +++ b/contrib/views/wfmanager/src/main/resources/ui/app/components/coord-config.js @@ -220,7 +220,7 @@ export default Ember.Component.extend(Validations, Ember.Evented, { }, timezone : 'UTC', dataInputType : 'simple', - slainfo : SlaInfo.create({}), + slaInfo : SlaInfo.create({}), schemaVersions : { coordinatorVersion : this.get('schemaVersions').getDefaultVersion('coordinator') }, http://git-wip-us.apache.org/repos/asf/ambari/blob/f79a48b2/contrib/views/wfmanager/src/main/resources/ui/app/components/sla-info.js ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/components/sla-info.js b/contrib/views/wfmanager/src/main/resources/ui/app/components/sla-info.js index be5d6f9..b9b594a 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/components/sla-info.js +++ b/contrib/views/wfmanager/src/main/resources/ui/app/components/sla-info.js @@ -19,6 +19,17 @@ import { validator, buildValidations } from 'ember-cp-validations'; import { v1, v4 } from "ember-uuid"; const Validations = buildValidations({ + 'slaInfo.nominalTime.value': { + validators: [ + validator('presence', { + presence : true, + disabled(model, attribute) { + return !model.get('slaEnabled'); + }, + dependentKeys : ['slaEnabled'] + }) + ] + }, 'slaInfo.shouldEnd.time': { validators: [ validator('presence', { http://git-wip-us.apache.org/repos/asf/ambari/blob/f79a48b2/contrib/views/wfmanager/src/main/resources/ui/app/domain/coordinator/coordinator-xml-importer.js ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/domain/coordinator/coordinator-xml-importer.js b/contrib/views/wfmanager/src/main/resources/ui/app/domain/coordinator/coordinator-xml-importer.js index 5101181..12d923c 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/domain/coordinator/coordinator-xml-importer.js +++ b/contrib/views/wfmanager/src/main/resources/ui/app/domain/coordinator/coordinator-xml-importer.js @@ -63,7 +63,7 @@ var CoordinatorXmlImporter= Ember.Object.extend({ }, timezone : 'UTC', dataInputType : 'simple', - slainfo : SlaInfo.create({}), + slaInfo : SlaInfo.create({}), schemaVersions : { coordinatorVersion : this.get('schemaVersions').getDefaultVersion('coordinator') }
