Merge branch 'feature/forge-install' of gitlab.com:crafty-controller/crafty-4 into feature/forge-install

app/classes/shared/server.py

@@ -427,6 +427,9 @@ class ServerInstance:
                             ).format(self.name, ex)
                         },
                     )
+                if forge_install:
+                    # Reset import status if failed while forge installing
+                    self.stats_helper.finish_import()
                 return False
 
         else:
@@ -465,6 +468,9 @@ class ServerInstance:
                             ).format(self.name, ex)
                         },
                     )
+                if forge_install:
+                    # Reset import status if failed while forge installing
+                    self.stats_helper.finish_import()
                 return False
 
         out_buf = ServerOutBuf(self.helper, self.process, self.server_id)

app/frontend/templates/panel/dashboard.html

@@ -168,7 +168,12 @@
 
                   <td draggable="false" id="controls{{server['server_data']['server_id']}}" class="actions_serverlist">
                     {% if server['user_command_permission'] %}
-                    {% if server['stats']['updating']%}
+                    {% if server['stats']['importing'] and server['stats']['running'] %}
+                    <!-- WHAT HAPPENED HERE -->
+                    <a data-id="{{server['server_data']['server_id']}}" class=""><i
+                        class="fa fa-spinner fa-spin"></i>&nbsp;{{ translate('serverTerm', 'installing',
+                      data['lang']) }}</i></a>
+                    {% elif server['stats']['updating']%}
                     <!-- WHAT HAPPENED HERE -->
                     <a data-id="{{server['server_data']['server_id']}}" class=""><i
                         class="fa fa-spinner fa-spin"></i>&nbsp;{{ translate('serverTerm', 'updating',

app/frontend/templates/panel/server_term.html

@@ -62,7 +62,21 @@
               </span>
             </div>
             {% if data['permissions']['Commands'] in data['user_permissions'] %}
-            {% if data['server_stats']['updating']%}
+            {% if data['importing'] and data['server_stats']['running']%}
+            <div id="update_control_buttons"
+              class="mt-4 flex-wrap d-flex justify-content-between justify-content-md-center align-items-center px-5 px-md-0"
+              style="visibility: visible">
+              <button onclick="" id="start-btn" style="max-width: 7rem;"
+                class="btn btn-warning m-1 flex-grow-1 disabled"><i
+                  class="fa fa-spinner fa-spin"></i>&nbsp;{{translate('serverTerm', 'installing', data['lang']) }}</button>
+              <button onclick="" id="restart-btn" style="max-width: 7rem;"
+                class="btn btn-outline-primary m-1 flex-grow-1 disabled">{% raw translate('serverTerm', 'restart',
+                data['lang']) %}</button>
+              <button onclick="" id="stop-btn" style="max-width: 7rem;"
+                class="btn btn-danger m-1 flex-grow-1 disabled">{{ translate('serverTerm', 'stop', data['lang'])
+                }}</button>
+            </div>
+            {% elif data['server_stats']['updating']%}
             <div id="update_control_buttons"
               class="mt-4 flex-wrap d-flex justify-content-between justify-content-md-center align-items-center px-5 px-md-0"
               style="visibility: visible">

app/translations/en_EN.json

@@ -97,7 +97,8 @@
         "status": "Status",
         "stop": "Stop",
         "version": "Version",
-        "welcome": "Welcome to Crafty Controller"
+        "welcome": "Welcome to Crafty Controller",
+        "installing": "Installing..."
     },
     "datatables": {
         "i18n": {
@@ -481,7 +482,8 @@
         "starting": "Delayed-Start",
         "stop": "Stop",
         "stopScroll": "Stop Auto Scrolling",
-        "updating": "Updating..."
+        "updating": "Updating...",
+        "installing": "Installing..."
     },
     "serverMetrics": {
         "resetZoom": "Reset Zoom",