Skip to content

Commit e9bc74b

Browse files
MauricioFauthMauricioFauth
committed
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2 parents a56b425 + 4f95a86 commit e9bc74b

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

‎templates/columns_definitions/column_definitions_form.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
</td>
110110
<td width="25">&nbsp;</td>
111111
<td>
112-
<select class="form-control" name="tbl_storage_engine" aria-label="{% trans 'Storage engine' %}">
112+
<select class="form-select" name="tbl_storage_engine" aria-label="{% trans 'Storage engine' %}">
113113
{% for engine in storage_engines %}
114114
<option value="{{ engine.name }}"{% if engine.comment is not empty %} title="{{ engine.comment }}"{% endif %}
115115
{{- engine.name|lower == tbl_storage_engine|lower or (tbl_storage_engine is empty and engine.is_default) ? ' selected' }}>

‎templates/database/operations/index.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
<div class="mb-3 row g-3">
197197
<div class="col-auto">
198198
<label class="visually-hidden" for="select_db_collation">{% trans 'Collation' %}</label>
199-
<select class="form-control" lang="en" dir="ltr" name="db_collation" id="select_db_collation">
199+
<select class="form-select" lang="en" dir="ltr" name="db_collation" id="select_db_collation">
200200
<option value=""></option>
201201
{% for charset in charsets %}
202202
<optgroup label="{{ charset.getName() }}" title="{{ charset.getDescription() }}">

‎templates/sql/query.twig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<div class="col-xl-2 col-lg-3">
6161
<div class="mb-3">
6262
<label class="visually-hidden" for="fieldsSelect">{% trans 'Columns' %}</label>
63-
<select class="form-control resize-vertical" id="fieldsSelect" name="dummy" size="{{ textarea_rows }}" multiple>
63+
<select class="form-select resize-vertical" id="fieldsSelect" name="dummy" size="{{ textarea_rows }}" multiple>
6464
{% for field in columns_list %}
6565
<option value="{{ backquote(field['Field']) }}"
6666
{{- field['Field'] is not null and field['Comment'] is not null and field['Field']|length > 0 ? ' title="' ~ field['Comment'] ~ '"' }}>
@@ -160,7 +160,7 @@
160160
<label class="form-label" for="id_bookmark">{% trans 'Bookmark:' %}</label>
161161
</div>
162162
<div class="col-6">
163-
<select class="form-control" name="id_bookmark" id="id_bookmark">
163+
<select class="form-select" name="id_bookmark" id="id_bookmark">
164164
<option value="">&nbsp;</option>
165165
{% for bookmark in bookmarks %}
166166
<option value="{{ bookmark.id }}" data-varcount="{{ bookmark.variable_count }}">

‎templates/table/operations/index.twig‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<div class="row g-3">
1212
<div class="col-auto">
1313
<label class="visually-hidden" for="tableOrderFieldSelect">{% trans 'Column' %}</label>
14-
<select id="tableOrderFieldSelect" class="form-control" name="order_field" aria-describedby="tableOrderFieldSelectHelp">
14+
<select id="tableOrderFieldSelect" class="form-select" name="order_field" aria-describedby="tableOrderFieldSelectHelp">
1515
{% for column in columns %}
1616
<option value="{{ column.Field }}">{{ column.Field }}</option>
1717
{% endfor %}
@@ -53,7 +53,7 @@
5353
<div class="col-auto">
5454
<div class="input-group">
5555
{% if database_list is not empty %}
56-
<select id="moveTableDatabaseInput" class="form-control" name="target_db" aria-label="{% trans 'Database' %}">
56+
<select id="moveTableDatabaseInput" class="form-select" name="target_db" aria-label="{% trans 'Database' %}">
5757
{% for each_db in database_list %}
5858
<option value="{{ each_db.name }}"{{ each_db.is_selected ? ' selected' }}>{{ each_db.name }}</option>
5959
{% endfor %}
@@ -135,7 +135,7 @@
135135
</label>
136136
</div>
137137
<div class="col-6">
138-
<select class="form-control" name="new_tbl_storage_engine" id="newTableStorageEngineSelect">
138+
<select class="form-select" name="new_tbl_storage_engine" id="newTableStorageEngineSelect">
139139
{% for engine in storage_engines %}
140140
<option value="{{ engine.name }}"{% if engine.comment is not empty %} title="{{ engine.comment }}"{% endif %}
141141
{{- engine.name|lower == storage_engine|lower or (storage_engine is empty and engine.is_default) ? ' selected' }}>
@@ -151,7 +151,7 @@
151151
<label for="collationSelect">{% trans 'Collation' %}</label>
152152
</div>
153153
<div class="col-6">
154-
<select class="form-control" id="collationSelect" lang="en" dir="ltr" name="tbl_collation">
154+
<select class="form-select" id="collationSelect" lang="en" dir="ltr" name="tbl_collation">
155155
<option value=""></option>
156156
{% for charset in charsets %}
157157
<optgroup label="{{ charset.getName() }}" title="{{ charset.getDescription() }}">
@@ -177,7 +177,7 @@
177177
<label for="new_pack_keys">PACK_KEYS</label>
178178
</div>
179179
<div class="col-6">
180-
<select class="form-control" name="new_pack_keys" id="new_pack_keys">
180+
<select class="form-select" name="new_pack_keys" id="new_pack_keys">
181181
<option value="DEFAULT"{{ pack_keys == 'DEFAULT' ? ' selected' }}>DEFAULT</option>
182182
<option value="0"{{ pack_keys == '0' ? ' selected' }}>0</option>
183183
<option value="1"{{ pack_keys == '1' ? ' selected' }}>1</option>
@@ -227,7 +227,7 @@
227227
<label for="new_row_format">ROW_FORMAT</label>
228228
</div>
229229
<div class="col-12">
230-
<select class="form-control" id="new_row_format" name="new_row_format">
230+
<select class="form-select" id="new_row_format" name="new_row_format">
231231
{% for row_format in row_formats %}
232232
<option value="{{ row_format }}"{{ row_format == row_format_current|upper ? ' selected' }}>{{ row_format }}</option>
233233
{% endfor %}
@@ -254,7 +254,7 @@
254254
<div class="col-auto">
255255
<div class="input-group">
256256
{% if database_list is not empty %}
257-
<select class="form-control" name="target_db" aria-label="{% trans 'Database' %}">
257+
<select class="form-select" name="target_db" aria-label="{% trans 'Database' %}">
258258
{% for each_db in database_list %}
259259
<option value="{{ each_db.name }}"{{ each_db.is_selected ? ' selected' }}>{{ each_db.name }}</option>
260260
{% endfor %}
@@ -478,7 +478,7 @@
478478
<div class="card-body">
479479
<div class="mb-3">
480480
<label for="partition_name">{% trans 'Partition' %}</label>
481-
<select class="form-control resize-vertical" id="partition_name" name="partition_name[]" multiple required>
481+
<select class="form-select resize-vertical" id="partition_name" name="partition_name[]" multiple required>
482482
{% for partition in partitions %}
483483
<option value="{{ partition }}"{{ loop.first ? ' selected' }}>{{ partition }}</option>
484484
{% endfor %}

0 commit comments

Comments
 (0)