Merge branch 'QA_5_2'

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

4 files changed, 12 insertions, 12 deletions

diff --git a/templates/columns_definitions/column_definitions_form.twig b/templates/columns_definitions/column_definitions_form.twig
index 2033d349ed..7ee9752bb9 100644
--- a/templates/columns_definitions/column_definitions_form.twig
+++ b/templates/columns_definitions/column_definitions_form.twig
@@ -109,7 +109,7 @@
                 </td>
                 <td width="25">&nbsp;</td>
                 <td>
-                  <select class="form-control" name="tbl_storage_engine" aria-label="{% trans 'Storage engine' %}">
+                  <select class="form-select" name="tbl_storage_engine" aria-label="{% trans 'Storage engine' %}">
                     {% for engine in storage_engines %}
                       <option value="{{ engine.name }}"{% if engine.comment is not empty %} title="{{ engine.comment }}"{% endif %}
                         {{- engine.name|lower == tbl_storage_engine|lower or (tbl_storage_engine is empty and engine.is_default) ? ' selected' }}>
diff --git a/templates/database/operations/index.twig b/templates/database/operations/index.twig
index 795aa3cb91..80f234382b 100644
--- a/templates/database/operations/index.twig
+++ b/templates/database/operations/index.twig
@@ -196,7 +196,7 @@
         <div class="mb-3 row g-3">
           <div class="col-auto">
             <label class="visually-hidden" for="select_db_collation">{% trans 'Collation' %}</label>
-            <select class="form-control" lang="en" dir="ltr" name="db_collation" id="select_db_collation">
+            <select class="form-select" lang="en" dir="ltr" name="db_collation" id="select_db_collation">
               <option value=""></option>
               {% for charset in charsets %}
                 <optgroup label="{{ charset.getName() }}" title="{{ charset.getDescription() }}">
diff --git a/templates/sql/query.twig b/templates/sql/query.twig
index 158c1a6518..219ab0f479 100644
--- a/templates/sql/query.twig
+++ b/templates/sql/query.twig
@@ -60,7 +60,7 @@
               <div class="col-xl-2 col-lg-3">
                 <div class="mb-3">
                   <label class="visually-hidden" for="fieldsSelect">{% trans 'Columns' %}</label>
-                  <select class="form-control resize-vertical" id="fieldsSelect" name="dummy" size="{{ textarea_rows }}" multiple>
+                  <select class="form-select resize-vertical" id="fieldsSelect" name="dummy" size="{{ textarea_rows }}" multiple>
                     {% for field in columns_list %}
                       <option value="{{ backquote(field['Field']) }}"
                         {{- field['Field'] is not null and field['Comment'] is not null and field['Field']|length > 0 ? ' title="' ~ field['Comment'] ~ '"' }}>
@@ -160,7 +160,7 @@
             <label class="form-label" for="id_bookmark">{% trans 'Bookmark:' %}</label>
           </div>
           <div class="col-6">
-            <select class="form-control" name="id_bookmark" id="id_bookmark">
+            <select class="form-select" name="id_bookmark" id="id_bookmark">
               <option value="">&nbsp;</option>
               {% for bookmark in bookmarks %}
                 <option value="{{ bookmark.id }}" data-varcount="{{ bookmark.variable_count }}">
diff --git a/templates/table/operations/index.twig b/templates/table/operations/index.twig
index 03d89bcbc6..9779efa286 100644
--- a/templates/table/operations/index.twig
+++ b/templates/table/operations/index.twig
@@ -11,7 +11,7 @@
         <div class="row g-3">
           <div class="col-auto">
             <label class="visually-hidden" for="tableOrderFieldSelect">{% trans 'Column' %}</label>
-            <select id="tableOrderFieldSelect" class="form-control" name="order_field" aria-describedby="tableOrderFieldSelectHelp">
+            <select id="tableOrderFieldSelect" class="form-select" name="order_field" aria-describedby="tableOrderFieldSelectHelp">
               {% for column in columns %}
                 <option value="{{ column.Field }}">{{ column.Field }}</option>
               {% endfor %}
@@ -53,7 +53,7 @@
         <div class="col-auto">
           <div class="input-group">
             {% if database_list is not empty %}
-              <select id="moveTableDatabaseInput" class="form-control" name="target_db" aria-label="{% trans 'Database' %}">
+              <select id="moveTableDatabaseInput" class="form-select" name="target_db" aria-label="{% trans 'Database' %}">
                 {% for each_db in database_list %}
                   <option value="{{ each_db.name }}"{{ each_db.is_selected ? ' selected' }}>{{ each_db.name }}</option>
                 {% endfor %}
@@ -135,7 +135,7 @@
           </label>
         </div>
         <div class="col-6">
-          <select class="form-control" name="new_tbl_storage_engine" id="newTableStorageEngineSelect">
+          <select class="form-select" name="new_tbl_storage_engine" id="newTableStorageEngineSelect">
             {% for engine in storage_engines %}
               <option value="{{ engine.name }}"{% if engine.comment is not empty %} title="{{ engine.comment }}"{% endif %}
                 {{- engine.name|lower == storage_engine|lower or (storage_engine is empty and engine.is_default) ? ' selected' }}>
@@ -151,7 +151,7 @@
           <label for="collationSelect">{% trans 'Collation' %}</label>
         </div>
         <div class="col-6">
-          <select class="form-control" id="collationSelect" lang="en" dir="ltr" name="tbl_collation">
+          <select class="form-select" id="collationSelect" lang="en" dir="ltr" name="tbl_collation">
             <option value=""></option>
             {% for charset in charsets %}
               <optgroup label="{{ charset.getName() }}" title="{{ charset.getDescription() }}">
@@ -177,7 +177,7 @@
             <label for="new_pack_keys">PACK_KEYS</label>
           </div>
           <div class="col-6">
-            <select class="form-control" name="new_pack_keys" id="new_pack_keys">
+            <select class="form-select" name="new_pack_keys" id="new_pack_keys">
               <option value="DEFAULT"{{ pack_keys == 'DEFAULT' ? ' selected' }}>DEFAULT</option>
               <option value="0"{{ pack_keys == '0' ? ' selected' }}>0</option>
               <option value="1"{{ pack_keys == '1' ? ' selected' }}>1</option>
@@ -227,7 +227,7 @@
             <label for="new_row_format">ROW_FORMAT</label>
           </div>
           <div class="col-12">
-            <select class="form-control" id="new_row_format" name="new_row_format">
+            <select class="form-select" id="new_row_format" name="new_row_format">
               {% for row_format in row_formats %}
                 <option value="{{ row_format }}"{{ row_format == row_format_current|upper ? ' selected' }}>{{ row_format }}</option>
               {% endfor %}
@@ -254,7 +254,7 @@
         <div class="col-auto">
           <div class="input-group">
             {% if database_list is not empty %}
-              <select class="form-control" name="target_db" aria-label="{% trans 'Database' %}">
+              <select class="form-select" name="target_db" aria-label="{% trans 'Database' %}">
                 {% for each_db in database_list %}
                   <option value="{{ each_db.name }}"{{ each_db.is_selected ? ' selected' }}>{{ each_db.name }}</option>
                 {% endfor %}
@@ -478,7 +478,7 @@
       <div class="card-body">
         <div class="mb-3">
           <label for="partition_name">{% trans 'Partition' %}</label>
-          <select class="form-control resize-vertical" id="partition_name" name="partition_name[]" multiple required>
+          <select class="form-select resize-vertical" id="partition_name" name="partition_name[]" multiple required>
             {% for partition in partitions %}
               <option value="{{ partition }}"{{ loop.first ? ' selected' }}>{{ partition }}</option>
             {% endfor %}