Revert "AMBARI-19367.Not able to save FS action node after populating job xml value. (Venkata Sairam via gauravn7)"
This reverts commit 176c3b0f1abf4368ba9d35cb83ab09160b642944. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2a2252cc Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2a2252cc Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2a2252cc Branch: refs/heads/branch-dev-patch-upgrade Commit: 2a2252cc94231e25e76b4362aff165f0f62ac829 Parents: 176c3b0 Author: Gaurav Nagar <[email protected]> Authored: Thu Jan 5 14:56:41 2017 +0530 Committer: Gaurav Nagar <[email protected]> Committed: Thu Jan 5 14:56:41 2017 +0530 ---------------------------------------------------------------------- AMBARI-19367_branch-2.5.patch | 55 -------------------- contrib/views/wfmanager/.gitignore | 20 ------- .../resources/ui/app/components/fs-action.js | 3 -- 3 files changed, 78 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2a2252cc/AMBARI-19367_branch-2.5.patch ---------------------------------------------------------------------- diff --git a/AMBARI-19367_branch-2.5.patch b/AMBARI-19367_branch-2.5.patch deleted file mode 100644 index f8c5cb1..0000000 --- a/AMBARI-19367_branch-2.5.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 286890d1e4db29ebe1c43dd26034ca242de4cdef Mon Sep 17 00:00:00 2001 -From: Venkata Sairam <[email protected]> -Date: Thu, 5 Jan 2017 12:30:04 +0530 -Subject: [PATCH] AMBARI-19367.Not able to save FS action node after populating - job xml value(venkatasairam.lanka) - ---- - contrib/views/wfmanager/.gitignore | 20 ++++++++++++++++++++ - .../main/resources/ui/app/components/fs-action.js | 3 +++ - 2 files changed, 23 insertions(+) - create mode 100644 contrib/views/wfmanager/.gitignore - -diff --git a/contrib/views/wfmanager/.gitignore b/contrib/views/wfmanager/.gitignore -new file mode 100644 -index 0000000..ae354e7 ---- /dev/null -+++ b/contrib/views/wfmanager/.gitignore -@@ -0,0 +1,20 @@ -+# Numerous always-ignore extensions -+*.swp -+*.bak -+*.log -+*.patch -+ -+# OS or Editor folders -+.DS_Store -+ -+# Installation and build tools -+src/main/resources/ui/node/ -+src/main/resources/ui/node_modules/ -+src/main/resources/ui/bower_components/ -+_generators/ -+ -+# Output directory -+src/main/resources/ui/dist/ -+ -+# Brunch folder for temporary files. -+src/main/resources/ui/tmp/ -diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/components/fs-action.js b/contrib/views/wfmanager/src/main/resources/ui/app/components/fs-action.js -index 6233b62..40ac43d 100644 ---- a/contrib/views/wfmanager/src/main/resources/ui/app/components/fs-action.js -+++ b/contrib/views/wfmanager/src/main/resources/ui/app/components/fs-action.js -@@ -38,6 +38,9 @@ export default Ember.Component.extend(Validations, { - this.set("actionModel.configuration", {}); - this.set("actionModel.configuration.property", Ember.A([])); - } -+ if(this.get('actionModel.jobXml') === undefined){ -+ this.set("actionModel.jobXml", Ember.A([])); -+ } - var field = 'validations.attrs.actionModel.fsOps.isInvalid'; - this.set(field, false); - this.sendAction('register', 'fsAction', this); --- -2.7.4 (Apple Git-66) - http://git-wip-us.apache.org/repos/asf/ambari/blob/2a2252cc/contrib/views/wfmanager/.gitignore ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/.gitignore b/contrib/views/wfmanager/.gitignore deleted file mode 100644 index ae354e7..0000000 --- a/contrib/views/wfmanager/.gitignore +++ /dev/null @@ -1,20 +0,0 @@ -# Numerous always-ignore extensions -*.swp -*.bak -*.log -*.patch - -# OS or Editor folders -.DS_Store - -# Installation and build tools -src/main/resources/ui/node/ -src/main/resources/ui/node_modules/ -src/main/resources/ui/bower_components/ -_generators/ - -# Output directory -src/main/resources/ui/dist/ - -# Brunch folder for temporary files. -src/main/resources/ui/tmp/ http://git-wip-us.apache.org/repos/asf/ambari/blob/2a2252cc/contrib/views/wfmanager/src/main/resources/ui/app/components/fs-action.js ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/components/fs-action.js b/contrib/views/wfmanager/src/main/resources/ui/app/components/fs-action.js index 40ac43d..6233b62 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/components/fs-action.js +++ b/contrib/views/wfmanager/src/main/resources/ui/app/components/fs-action.js @@ -38,9 +38,6 @@ export default Ember.Component.extend(Validations, { this.set("actionModel.configuration", {}); this.set("actionModel.configuration.property", Ember.A([])); } - if(this.get('actionModel.jobXml') === undefined){ - this.set("actionModel.jobXml", Ember.A([])); - } var field = 'validations.attrs.actionModel.fsOps.isInvalid'; this.set(field, false); this.sendAction('register', 'fsAction', this);
