gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🔥 Remove usage of Generator::getButtonOrImage()

Browse Source 
Signed-off-by: Temuri Takalandze <takalandzet@gmail.com>
This commit is contained in:
Temuri Takalandze 2020-06-28 22:06:14 +04:00
parent 271eb4ffeb
commit 97d50ea314
2 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libraries/classes/CentralColumns.php
View File

@ -947,20 +947,18 @@ class CentralColumns
'text_dir' => $text_dir,
'form_name' => 'tableslistcontainer',
]);
$html_output .= Generator::getButtonOrImage(
'edit_central_columns',
'mult_submit change_central_columns',
__('Edit'),
'b_edit',
'edit central columns'
);
$html_output .= Generator::getButtonOrImage(
'delete_central_columns',
'mult_submit',
__('Delete'),
'b_drop',
'remove_from_central_columns'
);
$html_output .= '<button class="btn btn-link mult_submit change_central_columns" type="submit"'
. ' name="edit_central_columns" value="edit central columns"'
. ' title="' . __('Edit') . '">' . "\n"
. Generator::getIcon('b_edit', __('Edit'))
. '</button>' . "\n";
$html_output .= '<button class="btn btn-link mult_submit" type="submit"'
. ' name="delete_central_columns" value="remove_from_central_columns"'
. ' title="' . __('Delete') . '">' . "\n"
. Generator::getIcon('b_drop', __('Delete'))
. '</button>' . "\n";
return $html_output;
}

26
test/classes/CentralColumnsTest.php
View File

@ -673,20 +673,18 @@ class CentralColumnsTest extends AbstractTestCase
$this->assertStringContainsString(__('Click to sort.'), $result);
$this->assertStringContainsString(Url::getHiddenInputs($db), $result);
$this->assertStringContainsString(Url::getHiddenInputs($db), $result);
$editSelectedButton = Generator::getButtonOrImage(
'edit_central_columns',
'mult_submit change_central_columns',
__('Edit'),
'b_edit',
'edit central columns'
);
$deleteSelectedButton = Generator::getButtonOrImage(
'delete_central_columns',
'mult_submit',
__('Delete'),
'b_drop',
'remove_from_central_columns'
);
$editSelectedButton = ' <button class="btn btn-link mult_submit change_central_columns"'
. ' type="submit" name="edit_central_columns"' . "\n"
. ' value="edit central columns" title="' . __('Edit') . '">' . "\n"
. ' ' . Generator::getIcon('b_edit', __('Edit')) . "\n"
. ' </button>' . "\n";
$deleteSelectedButton = ' <button class="btn btn-link mult_submit" type="submit"'
. ' name="delete_central_columns"' . "\n"
. ' value="remove_from_central_columns" title="' . __('Delete') . '">' . "\n"
. ' ' . Generator::getIcon('b_drop', __('Delete')) . "\n"
. ' </button>' . "\n";
$this->assertStringContainsString($editSelectedButton, $result);
$this->assertStringContainsString($deleteSelectedButton, $result);
// test for empty table