Merge pull request #23 from versx/default-server-selected

If only one server, select it
versx · Mar 7, 2021 · 6fa4ede · 6fa4ede
2 parents 6fe54a9 + 3a49e45
commit 6fa4ede
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/routes/ui.js b/src/routes/ui.js
@@ -414,6 +414,9 @@ const validateRoles = (req, res) => {
             if (requiredRoles.length > 0) {
                 server.show = guilds.includes(server.id) && utils.hasRole(userRoles, requiredRoles[0].roles);
                 if (server.show) {
+                    if (servers.length === 1) {
+                        server.selected = true;
+                    }
                     valid = true;
                 }
             } else {

diff --git a/src/views/navbar.mustache b/src/views/navbar.mustache
@@ -33,7 +33,7 @@
         <ul class="navbar-nav ml-auto">
             <li class="nav-item">
                 <select class="form-control .server_selector" id="server_selector" name="server_selector" onchange="onServerChanged()">
-                    <option value="" selected disabled hidden>{{Choose a Server}}</option>
+                    <option value="" {{#nothing_selected}}selected{{/nothing_selected}} disabled hidden>{{Choose a Server}}</option>
                     <!--<option value="all">{{All}}</option>-->
                     {{#servers}}
                         <option value="{{id}}" {{#selected}}selected{{/selected}} {{^show}}hidden{{/show}}>{{name}}</option>