AMBARI-3803 For config-groups, rename +Exception action to +Override. (ababiichuk)
diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js
index 55b3467..26d3b71 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -911,7 +911,7 @@
result.message = Em.I18n.t('services.service.config.failSaveConfig');
} else {
if (!result.flag) {
- result.message = Em.I18n.t('services.service.config.failSaveConfigHostExceptions');
+ result.message = Em.I18n.t('services.service.config.failSaveConfigHostOverrides');
}
}
console.log("The result from applyCreatdConfToService is: " + result);
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 12907ae..34d5cf6 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -130,7 +130,7 @@
'common.edit': 'Edit',
'common.delete': 'Delete',
'common.empty': 'Empty',
- 'common.exception':'Exception',
+ 'common.override':'Override',
'common.undo':'Undo',
'common.details':'Details',
'common.stats':'Stats',
@@ -1107,7 +1107,7 @@
'services.service.config.msgHDFSMapRServiceStop':'Could not save configuration changes. Please stop both HDFS and MapReduce first. You will be able to save configuration changes after all HDFS and MapReduce components are stopped.',
'services.service.config.failCreateConfig' : 'Failure in creating service configuration',
'services.service.config.failSaveConfig':'Failure in saving service configuration',
- 'services.service.config.failSaveConfigHostExceptions':'Failure in saving service configuration host exceptions',
+ 'services.service.config.failSaveConfigHostOverrides':'Failure in saving service configuration overrides',
'services.service.config.addPropertyWindow.errorMessage':'This is required',
'services.service.config.addPropertyWindow.error.derivedKey':'This property is already defined',
'services.service.config.stopService.runningHostComponents':'{0} components on {1} hosts are still running',
@@ -1272,8 +1272,8 @@
'hosts.host.add':'Add New Hosts',
'hosts.table.noHosts':'No hosts to display',
- 'hosts.selectHostsDialog.title': 'Select Exception Hosts',
- 'hosts.selectHostsDialog.message': 'Select hosts where the exception has to be applied',
+ 'hosts.selectHostsDialog.title': 'Select Hosts to override',
+ 'hosts.selectHostsDialog.message': 'Select hosts where the override config group has to be applied',
'hosts.selectHostsDialog.filter.placeHolder': 'Filter...',
'hosts.selectHostsDialog.selectedHostsLink': '{0} out of {1} hosts selected',
diff --git a/ambari-web/app/models/service_config.js b/ambari-web/app/models/service_config.js
index a4094d8..977bae2 100644
--- a/ambari-web/app/models/service_config.js
+++ b/ambari-web/app/models/service_config.js
@@ -700,13 +700,13 @@
if (!isOriginalSCP) {
if (!isError && parentSCP != null) {
if (value === parentSCP.get('value')) {
- this.set('errorMessage', 'Host exceptions must have different value');
+ this.set('errorMessage', 'Configuration overrides must have different value');
isError = true;
} else {
var overrides = parentSCP.get('overrides');
overrides.forEach(function (override) {
if (self != override && value === override.get('value')) {
- self.set('errorMessage', 'Multiple host exceptions cannot have same value');
+ self.set('errorMessage', 'Multiple configuration overrides cannot have same value');
isError = true;
}
});
diff --git a/ambari-web/app/templates/common/configs/service_config.hbs b/ambari-web/app/templates/common/configs/service_config.hbs
index 88392b0..fd4414f 100644
--- a/ambari-web/app/templates/common/configs/service_config.hbs
+++ b/ambari-web/app/templates/common/configs/service_config.hbs
@@ -114,7 +114,7 @@
{{#if view.canEdit}}
{{#if isPropertyOverridable}}
{{#if App.supports.hostOverrides}}
- <a class="action" {{action "createOverrideProperty" this target="view" }} ><i class="icon-plus-sign"></i>{{t common.exception}}</a>
+ <a class="action" {{action "createOverrideProperty" this target="view" }} ><i class="icon-plus-sign"></i>{{t common.override}}</a>
{{/if}}
{{/if}}
{{#unless cantBeUndone}}
