浏览代码

AMBARI-17011 Description for some kerberos identities config has period twice. (ababiichuk)

ababiichuk 9 年之前
父节点
当前提交
73baab5e62
共有 3 个文件被更改,包括 16 次插入5 次删除
  1. 1 1
      ambari-web/app/messages.js
  2. 4 2
      ambari-web/app/utils/config.js
  3. 11 2
      ambari-web/test/utils/config_test.js

+ 1 - 1
ambari-web/app/messages.js

@@ -2004,7 +2004,7 @@ Em.I18n.translations = {
   'services.service.config.nothing.to.display': 'No properties to display.',
   'services.service.config.final':'Final',
   'services.service.config.password.additionalDescription': 'For security purposes, password changes will not be shown in configuration version comparisons',
-  'services.service.config.secure.additionalDescription': ' This config can be changed from Kerberos page under Admin tab by privileged users.',
+  'services.service.config.secure.additionalDescription': 'This config can be changed from Kerberos page under Admin tab by privileged users.',
   'services.service.config.saved':'Save Configuration Changes',
   'services.service.config.notSaved':'Unable to Save Configuration Changes',
   'services.service.config.restartService.TooltipMessage':'<b>Restart Service</b><br>Stale configuration used by {0} components on {1} hosts:{2}',

+ 4 - 2
ambari-web/app/utils/config.js

@@ -507,8 +507,10 @@ App.config = Em.Object.create({
    * @returns {*}
    */
   kerberosIdentitiesDescription: function(description) {
-    return description ? (description.endsWith('.') ? description : description + '.') +
-        Em.I18n.t('services.service.config.secure.additionalDescription') : Em.I18n.t('services.service.config.secure.additionalDescription');
+    if (!description) return Em.I18n.t('services.service.config.secure.additionalDescription');
+    description = description.trim();
+    return (description.endsWith('.') ? description + ' ' : description + '. ') +
+      Em.I18n.t('services.service.config.secure.additionalDescription');
   },
 
   /**

+ 11 - 2
ambari-web/test/utils/config_test.js

@@ -959,13 +959,22 @@ describe('App.config', function () {
   });
 
   describe('#kerberosIdentitiesDescription', function () {
+    it('update empty description', function() {
+      expect(App.config.kerberosIdentitiesDescription()).to.eql(Em.I18n.t('services.service.config.secure.additionalDescription'));
+    });
+
     it('update description for identities (without dot)', function() {
-      expect(App.config.kerberosIdentitiesDescription('some text')).to.eql('some text.'
+      expect(App.config.kerberosIdentitiesDescription('some text')).to.eql('some text. '
         + Em.I18n.t('services.service.config.secure.additionalDescription'));
     });
 
     it('update description for identities (with dot)', function() {
-      expect(App.config.kerberosIdentitiesDescription('some text.')).to.eql('some text.'
+      expect(App.config.kerberosIdentitiesDescription('some text.')).to.eql('some text. '
+        + Em.I18n.t('services.service.config.secure.additionalDescription'));
+    });
+
+    it('update description for identities (with dot and spaces at the end)', function() {
+      expect(App.config.kerberosIdentitiesDescription('some text. ')).to.eql('some text. '
         + Em.I18n.t('services.service.config.secure.additionalDescription'));
     });
   });