Removed a config I wanted to add, but didn't make sense.

bmcgonag · Mar 29, 2020 · 1f56dae · 1f56dae
1 parent f94495c
commit 1f56dae
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 45 deletions.
diff --git a/client/Admin/adminAllowOtherUsers.html b/client/Admin/adminAllowOtherUsers.html
@@ -52,23 +52,6 @@
                                     </div>
                                 </div>
                             {{/if}}
-                            {{#if $eq allowOwnNetwork false}}
-                                <div class="row">
-                                    <div class="col s12 m8 l8">
-                                        Disallow Inter-client Communication
-                                    </div>
-                                    <div class="col s12 m4 l4">
-                                        <div class="switch">
-                                            <label>
-                                                No
-                                                <input type="checkbox" class="disallowCom" id="disallowCom" checked="{{#if $eq configInfo.disallowCom true}}checked{{/if}}" />
-                                                <span class="lever"></span>
-                                                Yes
-                                            </label>
-                                        </div>
-                                    </div>
-                                </div>
-                            {{/if}}
                         {{/if}}
                     </div>
                 </div>

diff --git a/client/Admin/adminAllowOtherUsers.js b/client/Admin/adminAllowOtherUsers.js
@@ -46,12 +46,4 @@ Template.adminAllowOtherUsers.events({
         console.log("allow own: " + allowOwnNetwork);
         Session.set("allowOwnNetwork", allowOwnNetwork);
     },
-    'click #disallowCom' (event) {
-        Session.set("confirmationDialogTitle", "NOTICE");
-        Session.set("confirmationDialogContent", "Changing the Disallow Inter-Communication value after clients have been created with a specific value set, will not update the functionality of existing clients!");
-        Session.set("eventConfirmCallBackFunction", "");
-        Session.set("eventConfirmNecessaryId", "disallowCom");
-
-        $("#genModal").modal('open');
-    }
 });
diff --git a/client/Admin/adminConfig.js b/client/Admin/adminConfig.js
@@ -44,7 +44,6 @@ Template.adminConfig.events({
         let maxNoNets = $("#maxNetworks").val();
         let logMore = $("#logMore").prop('checked');
         let logLevel = $("#logLevel").val();
-        let disallowCom = $("#disallowCom").prop('checked');
 
         if (allowOwnNetwork == null || allowOthers == false) {
             allowOwnNetwork = false;
@@ -66,11 +65,7 @@ Template.adminConfig.events({
             logLevel = "";
         }
 
-        if (disallowCom == null || disallowCom == "") {
-            disallowCom = false;
-        }
-
-        Meteor.call("new.config", host, user, pass, server, portNo, allowOthers, maxNoInts, allowOwnNetwork, maxNoNets, logMore, logLevel, disallowCom, function(err, result) {
+        Meteor.call("new.config", host, user, pass, server, portNo, allowOthers, maxNoInts, allowOwnNetwork, maxNoNets, logMore, logLevel, function(err, result) {
             if (err) {
                 console.log("Error adding email configuration: " + err);
                 showSnackbar("Error Adding Email Configuration!", "red");
@@ -94,7 +89,6 @@ Template.adminConfig.events({
         let maxNoNets = $("#maxNetworks").val();
         let logMore = $("#logMore").prop('checked');
         let logLevel = $("#logLevel").val();
-        let disallowCom = $("#disallowCom").prop('checked');
 
         if (allowOwnNetwork == null || allowOthers == false) {
             allowOwnNetwork = false;
@@ -116,11 +110,7 @@ Template.adminConfig.events({
             logLevel = "";
         }
 
-        if (disallowCom == null || disallowCom == "") {
-            disallowCom = false;
-        }
-
-        Meteor.call("edit.config", host, user, pass, server, portNo, allowOthers, maxNoInts, allowOwnNetwork, maxNoNets, logMore, logLevel, disallowCom, function(err, result) {
+        Meteor.call("edit.config", host, user, pass, server, portNo, allowOthers, maxNoInts, allowOwnNetwork, maxNoNets, logMore, logLevel, function(err, result) {
             if (err) {
                 console.log("Error editing email configuration: " + err);
                 showSnackbar("Error Editing Email Configuration!", "red");

diff --git a/imports/api/configuration.js b/imports/api/configuration.js
@@ -12,7 +12,7 @@ Configuration.allow({
 });
 
 Meteor.methods({
-    'new.config' (emailHost, emailUser, emailPassword, emailSmtpServer, emailSmtpPort, allowOthers, maxNumberInterfaces, allowOwnNetwork, maxNumberNetworks, logMore, logLevel, disallowCom) {
+    'new.config' (emailHost, emailUser, emailPassword, emailSmtpServer, emailSmtpPort, allowOthers, maxNumberInterfaces, allowOwnNetwork, maxNumberNetworks, logMore, logLevel) {
         check(emailHost, String);
         check(emailUser, String);
         check(emailPassword, String);
@@ -24,7 +24,6 @@ Meteor.methods({
         check(maxNumberNetworks, Number);
         check(logMore, Boolean);
         check(logLevel, String);
-        check(disallowCom, Boolean);
 
         return Configuration.insert({
             emailHost: emailHost,
@@ -38,11 +37,10 @@ Meteor.methods({
             maxNumberNetworks: maxNumberNetworks,
             logMore: logMore,
             logLevel: logLevel,
-            disallowCom: disallowCom,
             addedOn: new Date(),
         });
     },
-    'edit.config' (emailHost, emailUser, emailPassword, emailSmtpServer, emailSmtpPort, allowOthers, maxNumberInterfaces, allowOwnNetwork, maxNumberNetworks, logMore, logLevel, disallowCom) {
+    'edit.config' (emailHost, emailUser, emailPassword, emailSmtpServer, emailSmtpPort, allowOthers, maxNumberInterfaces, allowOwnNetwork, maxNumberNetworks, logMore, logLevel) {
         check(emailHost, String);
         check(emailUser, String);
         check(emailPassword, String);
@@ -54,8 +52,6 @@ Meteor.methods({
         check(maxNumberNetworks, Number);
         check(logMore, Boolean);
         check(logLevel, String);
-        check(disallowCom, Boolean);
-
 
         if (!this.userId) {
             throw new Meteor.Error('User is not allowed to setup admin values, make sure you are logged in.');
@@ -78,7 +74,6 @@ Meteor.methods({
                 maxNumberNetworks: maxNumberNetworks,
                 logMore: logMore,
                 logLevel: logLevel,
-                disallowCom: disallowCom,
                 addedOn: new Date(),
                 addedBy: Meteor.user().emails[0].address,
             }

diff --git a/server/main.js b/server/main.js
@@ -11,7 +11,7 @@ Meteor.startup(() => {
     let Configs = Configuration.findOne({});
 
     if (typeof Configs == 'undefined') {
-      Meteor.call('new.config', "", "", "", "", "", false, 0, false, 0, false, "", false, function(err, result) {
+      Meteor.call('new.config', "", "", "", "", "", false, 0, false, 0, false, "", function(err, result) {
         if (err) {
           console.log("Error setting initial configuration: " + err);
         } else {