1 files changed, 5 insertions, 9 deletions
diff --git a/web/app/view/dialog/ComputedAttribute.js b/web/app/view/dialog/ComputedAttribute.js
index 22cfb829..adae7f7b 100644
--- a/web/app/view/dialog/ComputedAttribute.js
+++ b/web/app/view/dialog/ComputedAttribute.js
@@ -20,7 +20,9 @@ Ext.define('Traccar.view.dialog.ComputedAttribute', {
     extend: 'Traccar.view.dialog.BaseEdit',
 
     requires: [
-        'Traccar.view.dialog.ComputedAttributeController'
+        'Traccar.view.dialog.ComputedAttributeController',
+        'Traccar.view.UnescapedTextField',
+        'Traccar.view.UnescapedTextAreaField'
     ],
 
     controller: 'computedAttribute',
@@ -28,14 +30,8 @@ Ext.define('Traccar.view.dialog.ComputedAttribute', {
 
     items: {
         xtype: 'form',
-        listeners: {
-            afterrender: function (view) {
-                var field = view.up('panel').lookupReference('expressionField');
-                field.setValue(Ext.String.htmlDecode(field.getValue()));
-            }
-        },
         items: [{
-            xtype: 'textfield',
+            xtype: 'unescapedTextField',
             name: 'description',
             fieldLabel: Strings.sharedDescription
         }, {
@@ -49,7 +45,7 @@ Ext.define('Traccar.view.dialog.ComputedAttribute', {
                 change: 'onAttributeChange'
             }
         }, {
-            xtype: 'textareafield',
+            xtype: 'unescapedTextAreaField',
             reference: 'expressionField',
             name: 'expression',
             fieldLabel: Strings.sharedExpression,