Merge pull request #1752 from bunkerity/1.5

fix: update instance type references in HTML templates
bunkerity · Nov 26, 2024 · c3a41a7 · c3a41a7
2 parents a155146 + f7d0cda
commit c3a41a7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/ui/templates/instances.html b/src/ui/templates/instances.html
@@ -23,7 +23,7 @@ <h5 class="break-words font-bold dark:text-white/90 transition duration-300 ease
                         <!-- end state and title-->
                         <!-- detail list -->
                         <div role="grid" class="card-detail-container">
-                            {% set instance_details = [{"name" : "TYPE", "value" : instance['_type']},{"name" : "HOSTNAME", "value" : instance['hostname']}] %}
+                            {% set instance_details = [{"name" : "TYPE", "value" : instance['instance_type']},{"name" : "HOSTNAME", "value" : instance['hostname']}] %}
                             <!-- detail -->
                             {% for detail in instance_details %}
                                 <div role="row" class="card-detail-item">
@@ -36,7 +36,7 @@ <h5 class="break-words font-bold dark:text-white/90 transition duration-300 ease
                         <!-- end detail list-->
                         <!-- button list-->
                         <div class="relative w-full flex justify-center sm:justify-end">
-                            {% if instance._type == "local" and instance.health %}
+                            {% if instance.instance_type == "local" and instance.health %}
                                 <button type="submit"
                                         name="operation"
                                         value="restart"
@@ -46,7 +46,7 @@ <h5 class="break-words font-bold dark:text-white/90 transition duration-300 ease
                                         value="stop"
                                         class="delete-btn mx-1 text-xs">Stop</button>
                             {% endif %}
-                            {% if not instance._type == "local" and instance.health %}
+                            {% if not instance.instance_type == "local" and instance.health %}
                                 <button type="submit"
                                         name="operation"
                                         value="reload"
@@ -56,8 +56,8 @@ <h5 class="break-words font-bold dark:text-white/90 transition duration-300 ease
                                         value="stop"
                                         class="delete-btn mx-1 text-xs">Stop</button>
                             {% endif %}
-                            {% if instance._type == "local" and not instance.health or not
-                                instance._type == "local" and not instance.health %}
+                            {% if instance.instance_type == "local" and not instance.health or not
+                                instance.instance_type == "local" and not instance.health %}
                                 <button type="submit"
                                         name="operation"
                                         value="start"

diff --git a/src/ui/templates/logs.html b/src/ui/templates/logs.html
@@ -32,7 +32,7 @@ <h5 class="my-1 transition duration-300 ease-in-out text-sm sm:text-md font-bold
                 <!-- dropdown-->
                 <div data-{{ attribute_name }}-setting-select-dropdown="instances" class="mt-1 hidden z-100 absolute flex-col w-full translate-y-16 max-h-[350px] overflow-hidden overflow-y-auto">
                     {% for instance in instances %}
-                        <button data-{{ attribute_name }}-setting-select-dropdown-btn="instances" value="{{ instance.name }}" data-_type="{{ instance._type }}" class="{% if loop.first %}dark:bg-primary bg-primary text-gray-300 border-t rounded-t {% else %} bg-white dark:bg-slate-700 {% endif %} {% if loop.last %}rounded-b{% endif %} border-b border-l border-r border-gray-300 dark:hover:brightness-90 hover:brightness-90 my-0 relative py-2 px-3 text-left align-middle transition-all rounded-none cursor-pointer leading-normal text-sm ease-in tracking-tight-rem dark:border-slate-600 dark:text-gray-300">
+                        <button data-{{ attribute_name }}-setting-select-dropdown-btn="instances" value="{{ instance.name }}" data-_type="{{ instance.instance_type }}" class="{% if loop.first %}dark:bg-primary bg-primary text-gray-300 border-t rounded-t {% else %} bg-white dark:bg-slate-700 {% endif %} {% if loop.last %}rounded-b{% endif %} border-b border-l border-r border-gray-300 dark:hover:brightness-90 hover:brightness-90 my-0 relative py-2 px-3 text-left align-middle transition-all rounded-none cursor-pointer leading-normal text-sm ease-in tracking-tight-rem dark:border-slate-600 dark:text-gray-300">
                             {{ instance.name }}
                         </button>
                     {% endfor %}