Skip to content

Commit 25daf89

Browse files
MauricioFauthMauricioFauth
committed
Fix edit privileges submenu
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
1 parent a2633be commit 25daf89

8 files changed

Lines changed: 20 additions & 32 deletions

File tree

‎js/src/server/privileges.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ function addOrUpdateSubmenu () {
370370
$subNav = $('<ul></ul>').prop('class', 'nav nav-pills m-2');
371371

372372
$('#edit_user_dialog .submenu-item').each(function () {
373-
submenuLabel = $(this).find('legend[data-submenu-label]').data('submenu-label');
373+
submenuLabel = $(this).find('.js-submenu-label[data-submenu-label]').data('submenu-label');
374374

375375
submenuLink = $('<a></a>')
376376
.prop('class', 'nav-link')

‎templates/server/privileges/add_user.twig‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{% trans 'Add user account' %}
55
</h2>
66

7-
<div name="usersForm" id="addUsersForm" action="{{ url('/server/privileges') }}" method="post" autocomplete="off">
7+
<form name="usersForm" id="addUsersForm" action="{{ url('/server/privileges') }}" method="post" autocomplete="off">
88
{{ get_hidden_inputs() }}
99

1010
{{ login_information_fields_new|raw }}
@@ -33,10 +33,9 @@
3333
{{ privileges_table|raw }}
3434
{% endif %}
3535

36-
<div class="card-footer">
36+
<div>
3737
<input type="hidden" name="adduser_submit" value="1">
38-
<input class="btn btn-primary" type="submit" id="adduser_submit" value="{% trans 'Go' %}">
38+
<input class="btn btn-primary" type="submit" id="adduser_submit" value="{% trans 'Create user' %}">
3939
</div>
40-
</div>
4140
</form>
42-
</div>
41+
</div>

‎templates/server/privileges/change_password.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{% endif %}
88

99
<fieldset class="pma-fieldset" id="fieldset_change_password">
10-
<legend{{ is_privileges ? ' data-submenu-label="Change password"' }}>{% trans 'Change password' %}</legend>
10+
<legend{{ is_privileges ? ' class="js-submenu-label" data-submenu-label="Change password"' }}>{% trans 'Change password' %}</legend>
1111
<table class="table table-borderless w-auto">
1212
<tr>
1313
<td colspan="2">

‎templates/server/privileges/edit_routine_privileges.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<input type="hidden" name="grant_count" value="{{ privileges|length }}">
4444

4545
<fieldset class="pma-fieldset" id="fieldset_user_global_rights">
46-
<legend data-submenu-label="{% trans 'Routine' %}">
46+
<legend class="js-submenu-label" data-submenu-label="{% trans 'Routine' %}">
4747
{% trans 'Routine-specific privileges' %}
4848
</legend>
4949
<p>

‎templates/server/privileges/privileges_summary.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<input type="hidden" name="hostname" value="{{ hostname }}">
55

66
<fieldset class="pma-fieldset">
7-
<legend data-submenu-label="{{ sub_menu_label }}">
7+
<legend class="js-submenu-label" data-submenu-label="{{ sub_menu_label }}">
88
{{ legend }}
99
</legend>
1010

‎templates/server/privileges/privileges_table.twig‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<input type="hidden" name="grant_count" value="{{ row|length }}">
44
<input type="hidden" name="column_count" value="{{ columns|length }}">
55
<fieldset class="pma-fieldset" id="fieldset_user_priv">
6-
<legend data-submenu-label="{% trans 'Table' %}">
6+
<legend class="js-submenu-label" data-submenu-label="{% trans 'Table' %}">
77
{% trans 'Table-specific privileges' %}
88
</legend>
99
<p>
@@ -249,8 +249,8 @@
249249
{% else %}
250250

251251
{% set grant_count = 0 %}
252-
<div class="card">
253-
<div class="card-header" data-submenu-label="
252+
<div class="card mb-3">
253+
<div class="card-header js-submenu-label" data-submenu-label="
254254
{%- if is_global %}
255255
{%- trans 'Global' -%}
256256
{% elseif is_database %}
@@ -866,13 +866,14 @@
866866
</div>
867867
{% endif %}
868868
</div>
869+
</div>
869870
<input type="hidden" name="grant_count" value="{{ grant_count - (row['Grant_priv'] is defined ? 1 : 0) }}">
870871

871872
{% endif %}
872873

873874
{% if has_submit %}
874-
<div class="card-footer">
875+
<div>
875876
<input type="hidden" name="update_privs" value="1">
876-
<input class="btn btn-primary" type="submit" value="{% trans 'Go' %}">
877+
<input class="btn btn-primary" type="submit" value="{% trans 'Update user privileges' %}">
877878
</div>
878879
{% endif %}

‎templates/server/privileges/user_properties.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
{% endif %}
104104

105105
<fieldset class="pma-fieldset" id="fieldset_change_copy_user">
106-
<legend data-submenu-label="{% trans 'Login Information' %}">
106+
<legend class="js-submenu-label" data-submenu-label="{% trans 'Login Information' %}">
107107
{% trans 'Change login information / Copy user account' %}
108108
</legend>
109109

‎test/classes/Server/PrivilegesTest.php‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -682,22 +682,13 @@ public function testGetHtmlToDisplayPrivilegesTable(): void
682682
$html = $serverPrivileges->getHtmlToDisplayPrivilegesTable();
683683
$GLOBALS['username'] = 'username';
684684

685-
//validate 1: fieldset
686-
$this->assertStringContainsString(
687-
'<div class="card-footer">',
688-
$html
689-
);
690-
691685
//validate 2: button
692-
$this->assertStringContainsString(
693-
__('Go'),
694-
$html
695-
);
686+
$this->assertStringContainsString('Update user privileges', $html);
696687

697688
//validate 3: getHtmlForGlobalOrDbSpecificPrivs
698689
$this->assertStringContainsString('<div class="card">', $html);
699690
$this->assertStringContainsString(
700-
'<div class="card-header" data-submenu-label="' . __('Global') . '">',
691+
'<div class="card-header js-submenu-label" data-submenu-label="' . __('Global') . '">',
701692
$html
702693
);
703694
$this->assertStringContainsString(
@@ -1085,10 +1076,7 @@ public function testGetHtmlForAddUser(): void
10851076
);
10861077

10871078
//validate 5: button
1088-
$this->assertStringContainsString(
1089-
__('Go'),
1090-
$html
1091-
);
1079+
$this->assertStringContainsString('Create user', $html);
10921080

10931081
$GLOBALS['dbi'] = $dbi_old;
10941082
$this->serverPrivileges->dbi = $dbi_old;
@@ -1650,7 +1638,7 @@ public function testGetHtmlForAllTableSpecificRights(): void
16501638
$actual = $this->serverPrivileges->getHtmlForAllTableSpecificRights('pma', 'host', 'table', 'pmadb');
16511639
$this->assertStringContainsString('<input type="hidden" name="username" value="pma">', $actual);
16521640
$this->assertStringContainsString('<input type="hidden" name="hostname" value="host">', $actual);
1653-
$this->assertStringContainsString('<legend data-submenu-label="Table">', $actual);
1641+
$this->assertStringContainsString('<legend class="js-submenu-label" data-submenu-label="Table">', $actual);
16541642
$this->assertStringContainsString('Table-specific privileges', $actual);
16551643

16561644
// Test case 2
@@ -1661,7 +1649,7 @@ public function testGetHtmlForAllTableSpecificRights(): void
16611649
'z',
16621650
];
16631651
$actual = $this->serverPrivileges->getHtmlForAllTableSpecificRights('pma2', 'host2', 'database', '');
1664-
$this->assertStringContainsString('<legend data-submenu-label="Database">', $actual);
1652+
$this->assertStringContainsString('<legend class="js-submenu-label" data-submenu-label="Database">', $actual);
16651653
$this->assertStringContainsString('Database-specific privileges', $actual);
16661654
}
16671655

0 commit comments

Comments
 (0)