From 3c4359270ebdcdbdedce639491a362f4f5d7198b Mon Sep 17 00:00:00 2001
From: Joao Pedro De Almeida Pereira <jdealmeidapereira@pivotal.io>
Date: Wed, 14 Mar 2018 17:58:01 -0400
Subject: [PATCH] Fix trim function which was causing some JS errors during
 Server Properties validation. Victoria & Joao

---
 .../static/js/browser/server_groups/servers/model_validation.js | 2 +-
 .../browser/server_groups/servers/model_validation_spec.js      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/pgadmin/static/js/browser/server_groups/servers/model_validation.js b/web/pgadmin/static/js/browser/server_groups/servers/model_validation.js
index 7ab129baf..948af3d48 100644
--- a/web/pgadmin/static/js/browser/server_groups/servers/model_validation.js
+++ b/web/pgadmin/static/js/browser/server_groups/servers/model_validation.js
@@ -99,6 +99,6 @@ export class ModelValidation {
   }
 
   static isEmptyString(string) {
-    return _.isUndefined(string) || _.isNull(string) || string.trim() === '';
+    return _.isUndefined(string) || _.isNull(string) || String(string).trim() === '';
   }
 }
diff --git a/web/regression/javascript/browser/server_groups/servers/model_validation_spec.js b/web/regression/javascript/browser/server_groups/servers/model_validation_spec.js
index a05cd4557..560d8b601 100644
--- a/web/regression/javascript/browser/server_groups/servers/model_validation_spec.js
+++ b/web/regression/javascript/browser/server_groups/servers/model_validation_spec.js
@@ -31,7 +31,7 @@ describe('Server#ModelValidation', () => {
         model.isNew.and.returnValue(true);
         model.allValues['name'] = 'some name';
         model.allValues['username'] = 'some username';
-        model.allValues['port'] = 'some port';
+        model.allValues['port'] = 12345;
       });
 
       describe('No service id', () => {