resolves #339

client/imports/views/layouts/top_navbar/connections/connections.html

@@ -322,12 +322,15 @@
     <div class="form-group"><label class="col-lg-2 control-label">Connection Timeout</label>
         <div data-placement="top"
              data-toggle="tooltip" class="col-lg-10">
-            <input id="inputConnectionTimeoutOverride"
-                   data-required="true"
-                   min="1"
-                   type="number"
-                   placeholder="Connection Timeout"
-                   class="form-control">
+            <div class="input-group m-b">
+                <input id="inputConnectionTimeoutOverride"
+                       data-required="true"
+                       min="1"
+                       type="number"
+                       placeholder="Connection Timeout"
+                       class="form-control">
+                <span class="input-group-addon"> Seconds</span>
+            </div>
             <span class="help-block m-b-none">Enter to override <b>default</b> connection timeout <b>from settings</b></span>
         </div>
     </div>
@@ -335,12 +338,15 @@
     <div class="form-group"><label class="col-lg-2 control-label">Socket Timeout</label>
         <div data-placement="top"
              data-toggle="tooltip" class="col-lg-10">
-            <input id="inputSocketTimeoutOverride"
-                   data-required="true"
-                   min="1"
-                   type="number"
-                   placeholder="Socket Timeout"
-                   class="form-control">
+            <div class="input-group m-b">
+                <input id="inputSocketTimeoutOverride"
+                       data-required="true"
+                       min="1"
+                       type="number"
+                       placeholder="Socket Timeout"
+                       class="form-control">
+                <span class="input-group-addon"> Seconds</span>
+            </div>
             <span class="help-block m-b-none">Enter to override <b>default</b> socket timeout <b>from settings</b></span>
         </div>
     </div>

server/imports/mongodb/helper.js

@@ -80,10 +80,10 @@ Helper.prototype = {
         if (connection.options) {
             if (connection.options.readPreference) connectionUrl += addOptionToUrl(connectionUrl, 'readPreference', connection.options.readPreference);
 
-            if (connection.options.connectionTimeout) connectionUrl += addOptionToUrl(connectionUrl, 'connectTimeoutMS', connection.options.connectionTimeout);
+            if (connection.options.connectionTimeout) connectionUrl += addOptionToUrl(connectionUrl, 'connectTimeoutMS', getRoundedMilisecondsFromSeconds(connection.options.connectionTimeout));
             else connectionUrl += addOptionToUrl(connectionUrl, 'connectTimeoutMS', getRoundedMilisecondsFromSeconds(settings.connectionTimeoutInSeconds));
 
-            if (connection.options.socketTimeout) connectionUrl += addOptionToUrl(connectionUrl, 'socketTimeoutMS', connection.options.socketTimeout);
+            if (connection.options.socketTimeout) connectionUrl += addOptionToUrl(connectionUrl, 'socketTimeoutMS', getRoundedMilisecondsFromSeconds(connection.options.socketTimeout));
             else connectionUrl += addOptionToUrl(connectionUrl, 'socketTimeoutMS', getRoundedMilisecondsFromSeconds(settings.socketTimeoutInSeconds));
 
             if (connection.options.replicaSetName) connectionUrl += addOptionToUrl(connectionUrl, 'replicaSet', connection.options.replicaSetName);