Repository: ambari Updated Branches: refs/heads/branch-2.5 fa6bbfff6 -> 0b8f8c890
AMBARI-19607. User is not able to set the start and end date for a 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/0b8f8c89 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0b8f8c89 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0b8f8c89 Branch: refs/heads/branch-2.5 Commit: 0b8f8c89067503ed0e96754d6e178ef5c9bc06d2 Parents: fa6bbff Author: Gaurav Nagar <[email protected]> Authored: Thu Jan 19 11:03:42 2017 +0530 Committer: Gaurav Nagar <[email protected]> Committed: Thu Jan 19 11:04:27 2017 +0530 ---------------------------------------------------------------------- .../src/main/resources/ui/app/components/coord-config.js | 4 ++++ .../src/main/resources/ui/app/components/date-with-expr.js | 1 + .../main/resources/ui/app/templates/components/coord-config.hbs | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0b8f8c89/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 26b94cf..bba7793 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 @@ -109,6 +109,7 @@ export default Ember.Component.extend(Validations, Ember.Evented, { this.set('coordinator.name', Ember.copy(this.get('tabInfo.name'))); } this.schedulePersistWorkInProgress(); + this.set('childComponents', new Map()); }.on('init'), conditionalDataInExists :false, elementsInserted : function(){ @@ -606,6 +607,9 @@ export default Ember.Component.extend(Validations, Ember.Evented, { }, closeSave(){ this.set("showingSaveWorkflow", false); + }, + toggleIO(){ + this.$('#collapse').collapse('toggle'); } } }); http://git-wip-us.apache.org/repos/asf/ambari/blob/0b8f8c89/contrib/views/wfmanager/src/main/resources/ui/app/components/date-with-expr.js ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/components/date-with-expr.js b/contrib/views/wfmanager/src/main/resources/ui/app/components/date-with-expr.js index 541104d..5c906e1 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/components/date-with-expr.js +++ b/contrib/views/wfmanager/src/main/resources/ui/app/components/date-with-expr.js @@ -52,6 +52,7 @@ export default Ember.Component.extend(Validations, { typeObserver : function(){ if(this.get('dateField.type') === 'date'){ this.$('input[name="'+this.get('inputName')+'"]').datetimepicker({ + format: 'MM/DD/YYYY hh:mm A', useCurrent: false, showClose : true }); http://git-wip-us.apache.org/repos/asf/ambari/blob/0b8f8c89/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/coord-config.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/coord-config.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/coord-config.hbs index dc69382..296463d 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/coord-config.hbs +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/coord-config.hbs @@ -155,7 +155,7 @@ </div> </div> <div class="panel panel-default"> - <div class="panel-heading clearfix" data-toggle="collapse" data-target="#collapse"> + <div class="panel-heading clearfix" {{action 'toggleIO'}}> <h4 class="panel-title pull-left paddingtop7">Input / Output Configuration</h4> <i class="indicator glyphicon glyphicon-chevron-down pull-right paddingtop7"></i> </div>
