Merge branch 'bugfix/task-command' into 'dev'

command_server on new custom task

See merge request crafty-controller/crafty-4!592

CHANGELOG.md

@@ -6,6 +6,7 @@ TBD
 - Fix upload root files being hidden ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/590))
 - Send empty json for no banned/cached players ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/589))
 - Bump Tornado from 6.0 to 6.3.2 in response to CVE-2023-28370 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/591))
+- Fix bug where commands would show "command_server" when initially created ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/592))
 ### Tweaks
 TBD
 ### Lang

app/frontend/static/assets/css/crafty.css

@@ -181,4 +181,12 @@ div>.input-group>.form-control {
     height: calc(1.5em + 0.75rem + 2px);
 }
 
+.no-scroll {
+    -ms-overflow-style: none;  /* IE and Edge */
+    scrollbar-width: none;  /* Firefox */
+}
+
+.no-scroll::-webkit-scrollbar {
+    display: none;
+  }
 /**************************************************************/

app/frontend/templates/panel/server_schedule_edit.html

@@ -273,7 +273,7 @@
       if ($("#difficulty").val() == "reaction"){
         formDataObject.interval_type = "reaction";
       }
-      if ($("action").val() != "command"){
+      if ($("#action").val() != "command"){
         formDataObject.command = formDataObject.action + "_server";
       }
       if (formDataObject.cron_string != ""){

app/frontend/templates/panel/server_schedules.html

@@ -83,7 +83,7 @@
                           <p>{{schedule.action}}</p>
                         </td>
                         <td id="{{schedule.command}}" class="action" style="overflow: scroll; max-width: 30px;">
-                          <p style="overflow: scroll;">{{schedule.command}}</p>
+                          <p style="overflow: scroll;" class="no-scroll">{{schedule.command}}</p>
                         </td>
                         <td id="{{schedule.interval}}" class="action">
                           {% if schedule.interval_type != '' and schedule.interval_type != 'reaction' %}