ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ppr...@apache.org
Subject ambari git commit: AMBARI-20656.Coordinator and bundle should retain job.properties in submission modal window(M Madhan Mohan Reddy via padmapriyanitt)
Date Tue, 04 Apr 2017 06:31:05 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 65bd5ad6f -> 17be05922


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/17be0592
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/17be0592
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/17be0592

Branch: refs/heads/branch-2.5
Commit: 17be05922846528742f1478618c7b4d056c64c90
Parents: 65bd5ad
Author: padmapriyanitt <padmapriyanitt@gmail.com>
Authored: Tue Apr 4 12:00:04 2017 +0530
Committer: padmapriyanitt <padmapriyanitt@gmail.com>
Committed: Tue Apr 4 12:01:03 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/17be0592/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/17be0592/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/17be0592/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/17be0592/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"


Mime
View raw message