diff --git a/client/src/view-helper.js b/client/src/view-helper.js index 9973740906..8a87e9eb75 100644 --- a/client/src/view-helper.js +++ b/client/src/view-helper.js @@ -186,7 +186,7 @@ Espo.define('view-helper', [], function () { var scope = options.hash.scope || null; var label = options.hash.label || name; - var html = options.hash.label.html || self.language.translate(label, 'labels', scope); + var html = options.hash.html || options.hash.text || self.language.translate(label, 'labels', scope); return new Handlebars.SafeString(''); }); diff --git a/client/src/views/preferences/record/edit.js b/client/src/views/preferences/record/edit.js index b3ae7734cb..4fe1f75ade 100644 --- a/client/src/views/preferences/record/edit.js +++ b/client/src/views/preferences/record/edit.js @@ -41,11 +41,6 @@ Espo.define('views/preferences/record/edit', 'views/record/edit', function (Dep) { name: 'cancel', label: 'Cancel', - }, - { - name: 'reset', - label: 'Reset', - style: 'danger' } ], @@ -87,6 +82,14 @@ Espo.define('views/preferences/record/edit', 'views/record/edit', function (Dep) setup: function () { Dep.prototype.setup.call(this); + this.buttonList.push( + { + name: 'reset', + html: this.getLanguage().translate('Reset to Default', 'labels', 'Admin'), + style: 'danger' + } + ); + if (this.model.get('isPortalUser')) { this.layoutName = 'detailPortal'; }