From ada764bb7fef85edeb0eb95e36fdba58639a44b8 Mon Sep 17 00:00:00 2001
From: yuri <yurikuzn@users.noreply.github.com>
Date: Wed, 17 Oct 2018 14:50:47 +0300
Subject: [PATCH] text varchar null if empty

---
 client/src/views/fields/base.js    | 2 +-
 client/src/views/fields/text.js    | 6 ++++++
 client/src/views/fields/url.js     | 2 +-
 client/src/views/fields/varchar.js | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/client/src/views/fields/base.js b/client/src/views/fields/base.js
index 377d52ede7..d044eb54a4 100644
--- a/client/src/views/fields/base.js
+++ b/client/src/views/fields/base.js
@@ -593,7 +593,7 @@ Espo.define('views/fields/base', 'view', function (Dep) {
 
         validateRequired: function () {
             if (this.isRequired()) {
-                if (this.model.get(this.name) === '') {
+                if (this.model.get(this.name) === '' || this.model.get(this.name) === null) {
                     var msg = this.translate('fieldIsRequired', 'messages').replace('{field}', this.getLabelText());
                     this.showValidationMessage(msg);
                     return true;
diff --git a/client/src/views/fields/text.js b/client/src/views/fields/text.js
index f54b98bab7..00a2ef43e7 100644
--- a/client/src/views/fields/text.js
+++ b/client/src/views/fields/text.js
@@ -191,6 +191,12 @@ Espo.define('views/fields/text', 'views/fields/base', function (Dep) {
             }
         },
 
+        fetch: function () {
+            var data = {};
+            data[this.name] = this.$element.val() || null;
+            return data;
+        },
+
         fetchSearch: function () {
 
             var type = this.$el.find('[name="'+this.name+'-type"]').val() || 'startsWith';
diff --git a/client/src/views/fields/url.js b/client/src/views/fields/url.js
index 6cd53e0c03..aa6cd85e61 100644
--- a/client/src/views/fields/url.js
+++ b/client/src/views/fields/url.js
@@ -86,7 +86,7 @@ Espo.define('views/fields/url', 'views/fields/varchar', function (Dep) {
         fetch: function () {
             var data = Dep.prototype.fetch.call(this);
 
-            if (this.params.strip) {
+            if (this.params.strip && data[this.name]) {
                 data[this.name] = this.strip(data[this.name]);
             }
             return data;
diff --git a/client/src/views/fields/varchar.js b/client/src/views/fields/varchar.js
index 16d4243700..c9367ecf04 100644
--- a/client/src/views/fields/varchar.js
+++ b/client/src/views/fields/varchar.js
@@ -159,7 +159,7 @@ Espo.define('views/fields/varchar', 'views/fields/base', function (Dep) {
                     value = value.trim();
                 }
             }
-            data[this.name] = value;
+            data[this.name] = value || null;
             return data;
         },