You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2014/07/10 03:43:09 UTC
git commit: AMBARI-6448. User added properties are not shown in Add
Service wizard and removed later by the wizard. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk 05517dae3 -> 8af1ee1f2
AMBARI-6448. User added properties are not shown in Add Service wizard and removed later by the wizard. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8af1ee1f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8af1ee1f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8af1ee1f
Branch: refs/heads/trunk
Commit: 8af1ee1f28bf99091cbe03480fb347f2caafe43b
Parents: 05517da
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Wed Jul 9 18:42:44 2014 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Wed Jul 9 18:42:44 2014 -0700
----------------------------------------------------------------------
ambari-web/app/controllers/wizard/step7_controller.js | 2 +-
ambari-web/app/utils/config.js | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8af1ee1f/ambari-web/app/controllers/wizard/step7_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js
index 4baa5fe..616f771 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -775,7 +775,7 @@ App.WizardStep7Controller = Em.Controller.extend({
*/
getConfigTagsSuccess: function (data) {
var installedServiceSites = [];
- App.StackService.find().filterProperty('isSelected').filter(function (service) {
+ App.StackService.find().filterProperty('isInstalled').forEach(function (service) {
installedServiceSites = installedServiceSites.concat(service.get('configTypes'));
}, this);
installedServiceSites = installedServiceSites.uniq();
http://git-wip-us.apache.org/repos/asf/ambari/blob/8af1ee1f/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 1c4137d..8ed1262 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -1012,9 +1012,9 @@ App.config = Em.Object.create({
getServiceNameByConfigType: function (type) {
var preDefinedServiceConfigs = this.get('preDefinedServiceConfigs');
var service = preDefinedServiceConfigs.find(function (serviceConfig) {
- return (serviceConfig.sites.contains(type));
+ return (serviceConfig.get('configTypes').contains(type));
}, this);
- return service && service.serviceName;
+ return service && service.get('serviceName');
},
/**