Merge #15847 - Fix #15447 Disable phpMyAdmin storage database checkbox on database list

Pull-request: #15847
Fixes: #15447

Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2020-03-06 23:32:31 +01:00
commit 8ecd3ee293
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
2 changed files with 3 additions and 2 deletions

View File

@ -394,6 +394,7 @@ class DatabasesController extends AbstractController
$database['SCHEMA_NAME'],
true
),
'is_pmadb' => $database['SCHEMA_NAME'] === $cfg['Server']['pmadb'],
'url' => $url,
];
$collation = Charsets::findCollationByName(

View File

@ -169,13 +169,13 @@
<tbody>
{% for database in databases %}
<tr class="db-row{{ database.is_system_schema ? ' noclick' }}" data-filter-row="{{ database.name|upper }}">
<tr class="db-row{{ database.is_system_schema or database.is_pmadb ? ' noclick' }}" data-filter-row="{{ database.name|upper }}">
{% if is_drop_allowed %}
<td class="tool">
<input type="checkbox" name="selected_dbs[]" class="checkall" title="
{{- database.name }}" value="
{{- database.name }}"
{{- database.is_system_schema ? ' disabled' }}>
{{- database.is_system_schema or database.is_pmadb ? ' disabled' }}>
</td>
{% endif %}