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

Addapt getHtmlForAddColumn to use twig template

Browse Source 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
This commit is contained in:
Leonardo Strozzi 2018-03-20 23:21:01 -03:00
parent 6addf992fa
commit 2c7f3613ee
3 changed files with 50 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
libraries/classes/CentralColumns.php
View File

@ -875,39 +875,24 @@ class CentralColumns
*
* @return string html to add a column in the central list
*/
public function getHtmlForAddColumn(
$total_rows,
$pos,
$db
) {
$columnAdd = '<table class="central_columns_add_column" '
. 'class="navigation nospacing nopadding">'
. '<tr>'
. '<td class="navigation_separator largescreenonly"></td>'
. '<td class="central_columns_navigation">'
. Util::getIcon(
'centralColumns_add',
__('Add column')
)
. '<form id="add_column" action="db_central_columns.php" method="post">'
. Url::getHiddenInputs(
$db
)
. '<input type="hidden" name="add_column" value="add">'
. '<input type="hidden" name="pos" value="' . $pos . '" />'
. '<input type="hidden" name="total_rows" value="' . $total_rows . '"/>'
. $this->getHtmlForTableDropdown($db)
. '<select name="column-select" id="column-select">'
. '<option value="" selected="selected">'
. __('Select a column.') . '</option>'
. '</select></form>'
. '</td>'
. '<td class="navigation_separator largescreenonly"></td>'
. '</tr>'
. '</table>';
return $columnAdd;
}
public function getHtmlForAddColumn(
$total_rows,
$pos,
$db
) {
$icon = Util::getIcon(
'centralColumns_add',
__('Add column')
);
$table_drop_down = $this->getHtmlForTableDropdown($db);
return Template::get('database/central_columns/add_column')->render(array(
'icon' => $icon,
'pos' => $pos,
'db' => $db,
'total_rows' => $total_rows,
'table_drop_down' => $table_drop_down,
));
}
/**
* build html for a row in central columns table

19
templates/database/central_columns/add_column.twig Normal file
View File

@ -0,0 +1,19 @@
<table class="central_columns_add_column" class="navigation nospacing nopadding">
<tr>
<td class="navigation_separator largescreenonly"></td>
<td class="central_columns_navigation">
{{ icon|raw }}
<form id="add_column" action="db_central_columns.php" method="post">
{{ Url_getHiddenInputs(db)}}
<input type="hidden" name="add_column" value="add">
<input type="hidden" name="pos" value="{{ pos }}" />
<input type="hidden" name="total_rows" value="{{ total_rows }}"/>
{{ table_drop_down|raw }}
<select name="column-select" id="column-select">
<option value="" selected="selected">{% trans 'Select a column.' %}</option>
</select>
</form>
</td>
<td class="navigation_separator largescreenonly"></td>
</tr>
</table>

17
test/classes/CentralColumnsTest.php
View File

@ -730,10 +730,19 @@ class CentralColumnsTest extends TestCase
$result
);
$this->assertContains(
Url::getHiddenInputs('phpmyadmin')
. '<input type="hidden" name="add_column" value="add">'
. '<input type="hidden" name="pos" value="0" />'
. '<input type="hidden" name="total_rows" value="20"/>',
Url::getHiddenInputs('phpmyadmin'),
$result
);
$this->assertContains(
'<input type="hidden" name="add_column" value="add">',
$result
);
$this->assertContains(
'<input type="hidden" name="pos" value="0" />',
$result
);
$this->assertContains(
'<input type="hidden" name="total_rows" value="20"/>',
$result
);
}