You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by pp...@apache.org on 2017/04/04 06:30:04 UTC
ambari git commit: AMBARI-20656.Coordinator and bundle should retain
job.properties in submission modal window(M Madhan Mohan Reddy via
padmapriyanitt)
Repository: ambari
Updated Branches:
refs/heads/trunk 8f8fc11d3 -> 900070d8e
AMBARI-20656.Coordinator and bundle should retain job.properties in submission modal window(M Madhan Mohan Reddy via padmapriyanitt)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/900070d8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/900070d8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/900070d8
Branch: refs/heads/trunk
Commit: 900070d8e4ed7bfae200831bd5d4adb58efcc715
Parents: 8f8fc11
Author: padmapriyanitt <pa...@gmail.com>
Authored: Tue Apr 4 12:00:04 2017 +0530
Committer: padmapriyanitt <pa...@gmail.com>
Committed: Tue Apr 4 12:00:04 2017 +0530
----------------------------------------------------------------------
.../src/main/resources/ui/app/components/bundle-config.js | 1 +
.../wfmanager/src/main/resources/ui/app/components/coord-config.js | 1 +
.../main/resources/ui/app/templates/components/bundle-config.hbs | 2 +-
.../main/resources/ui/app/templates/components/coord-config.hbs | 2 +-
4 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/900070d8/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js b/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js
index 7c63b47..99f4fa7 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js
@@ -46,6 +46,7 @@ export default Ember.Component.extend(Ember.Evented, Validations, {
propertyExtractor : Ember.inject.service('property-extractor'),
fileBrowser : Ember.inject.service('file-browser'),
workspaceManager : Ember.inject.service('workspace-manager'),
+ jobConfigProperties: Ember.A([]),
initialize : function(){
var self = this;
this.set('errors', Ember.A([]));
http://git-wip-us.apache.org/repos/asf/ambari/blob/900070d8/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 e8f8cc1..fba4db5 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
@@ -50,6 +50,7 @@ export default Ember.Component.extend(Validations, Ember.Evented, {
propertyExtractor : Ember.inject.service('property-extractor'),
workspaceManager : Ember.inject.service('workspace-manager'),
showErrorMessage: Ember.computed.alias('saveAttempted'),
+ jobConfigProperties: Ember.A([]),
datasetsForInputs : Ember.computed('coordinator.datasets.[]','coordinator.dataOutputs.[]',function(){
var datasetsForInputs = Ember.copy(this.get('coordinator.datasets'));
this.get('coordinator.dataOutputs').forEach((dataOutput)=>{
http://git-wip-us.apache.org/repos/asf/ambari/blob/900070d8/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/bundle-config.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/bundle-config.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/bundle-config.hbs
index 39ab06d..b674990 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/bundle-config.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/bundle-config.hbs
@@ -124,7 +124,7 @@
{{hdfs-browser closeFileBrowser="closeFileBrowser" selectFileCallback=selectFileCallback filePath=filePath}}
{{/if}}
{{#if showingJobConfig}}
- {{job-config type='bundle' closeJobConfigs="closeBundleSubmitConfig" jobFilePath=bundleFilePath openFileBrowser="openFileBrowser" closeFileBrowser="closeFileBrowser" jobConfigs=bundleConfigs containsParameteriedPaths=containsParameteriedPaths}}
+ {{job-config type='bundle' closeJobConfigs="closeBundleSubmitConfig" jobFilePath=bundleFilePath openFileBrowser="openFileBrowser" closeFileBrowser="closeFileBrowser" jobConfigs=bundleConfigs containsParameteriedPaths=containsParameteriedPaths jobConfigProperties=jobConfigProperties}}
{{/if}}
{{#if showingResetConfirmation}}
{{#confirmation-dialog title="Confirm Bundle Reset"
http://git-wip-us.apache.org/repos/asf/ambari/blob/900070d8/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 0e35d0e..3b1b6a9 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
@@ -339,7 +339,7 @@
parameterizedWorkflowPath=parameterizedWorkflowPath
extractProperties="extractProperties" containsParameteriedPaths=containsParameteriedPaths
jobFilePath=coordinatorFilePath openFileBrowser="openFileBrowser"
- closeFileBrowser="closeFileBrowser" jobConfigs=coordinatorConfigs isDryrun=dryrun}}
+ closeFileBrowser="closeFileBrowser" jobConfigs=coordinatorConfigs isDryrun=dryrun jobConfigProperties=jobConfigProperties}}
{{/if}}
{{#if showingResetConfirmation}}
{{#confirmation-dialog title="Confirm Coordinator Reset"