Repository: ambari Updated Branches: refs/heads/trunk 3a3802ce0 -> e57576bf1
AMBARI-15863. No label for custom property for config group (akovalenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e57576bf Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e57576bf Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e57576bf Branch: refs/heads/trunk Commit: e57576bf1f9ffc246a16181bfd38737dcb2bb1a3 Parents: 3a3802c Author: Aleksandr Kovalenko <[email protected]> Authored: Wed Apr 13 18:01:47 2016 +0300 Committer: Aleksandr Kovalenko <[email protected]> Committed: Wed Apr 13 18:01:59 2016 +0300 ---------------------------------------------------------------------- .../common/configs/service_configs_by_category_view.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e57576bf/ambari-web/app/views/common/configs/service_configs_by_category_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/configs/service_configs_by_category_view.js b/ambari-web/app/views/common/configs/service_configs_by_category_view.js index ecd96b0..171b922 100644 --- a/ambari-web/app/views/common/configs/service_configs_by_category_view.js +++ b/ambari-web/app/views/common/configs/service_configs_by_category_view.js @@ -338,16 +338,17 @@ App.ServiceConfigsByCategoryView = Em.View.extend(App.UserPref, App.ConfigOverri }, createProperty: function (propertyObj) { + var config; var selectedConfigGroup = this.get('controller.selectedConfigGroup'); if (selectedConfigGroup.get('isDefault')) { - var config = App.config.createDefaultConfig(propertyObj.name, propertyObj.filename, false, { + config = App.config.createDefaultConfig(propertyObj.name, propertyObj.filename, false, { value: propertyObj.value, category: propertyObj.categoryName, isNotSaved: true }); } else { - var config = App.config.createCustomGroupConfig({ - name: propertyObj.name, + config = App.config.createCustomGroupConfig({ + propertyName: propertyObj.name, filename: propertyObj.filename, value: propertyObj.value, category: propertyObj.categoryName, @@ -501,9 +502,9 @@ App.ServiceConfigsByCategoryView = Em.View.extend(App.UserPref, App.ConfigOverri App.ModalPopup.show({ classNames: ['sixty-percent-width-modal'], - header: 'Add Property', - primary: 'Add', - secondary: 'Cancel', + header: Em.I18n.t('installer.step7.config.addProperty'), + primary: Em.I18n.t('add'), + secondary: Em.I18n.t('common.cancel'), onPrimary: function () { var propertyObj = { filename: siteFileName,
