mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 14:03:52 +01:00
Code Issues Projects Releases Wiki Activity

merged fix for MDL-5736, retained search string problem

Browse Source
This commit is contained in:
toyomoyo 2007-02-23 03:55:50 +00:00
parent e2d84bf3ab
commit 2535bff9bd
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lang/en_utf8/data.php
View File

@ -203,6 +203,7 @@ $string['savetemplate'] = 'Save template';
$string['sendinratings'] = 'Send in my latest ratings';
$string['single'] = 'View single';
$string['singletemplate'] = 'Single template';
$string['showall'] = 'Show all entries';
$string['teachersandstudents'] = '$a->teachers and $a->students';
$string['templates'] = 'Templates';
$string['templatesaved'] = 'Template saved';

21
mod/data/lib.php
View File

@ -904,6 +904,24 @@ function data_print_template($template, $records, $data, $search='',$page=0, $re
}
function data_print_show_all_form($data, $perpage, $sort, $order, $mode) {
echo '<div align="center">';
echo '<form id="options" action="view.php" method="get">';
echo '<fieldset class="invisiblefieldset">';
echo '<input type="hidden" name="d" value="'.$data->id.'" />';
echo '<input type="hidden" name="perpage" value="'.$perpage.'" />';
echo '<input type="hidden" name="search" value="" />'; // clear search
echo '<input type="hidden" name="sort" value="'.$sort.'" />';
echo '<input type="hidden" name="order" value="'.$order.'" />';
echo '<input type="hidden" name="mode" value="'.$mode.'" />';
echo '<input type="submit" value="'.get_string('showall','data').'" />';
echo '</fieldset>';
echo '</form>';
echo '</div>';
}
/************************************************************************
* function that takes in the current data, number of items per page, *
* a search string and prints a preference box in view.php *
@ -912,7 +930,7 @@ function data_print_template($template, $records, $data, $search='',$page=0, $re
* @param string $search *
* output null *
************************************************************************/
function data_print_preference_form($data, $perpage, $search, $sort='', $order='ASC'){
function data_print_preference_form($data, $perpage, $search, $sort='', $order='ASC', $mode='single'){
echo '<br /><div class="datapreferences" style="text-align:center">';
echo '<form id="options" action="view.php" method="get">';
echo '<fieldset class="invisiblefieldset">';
@ -949,6 +967,7 @@ function data_print_preference_form($data, $perpage, $search, $sort='', $order='
echo '</select>';
//print ASC or DESC
echo '&nbsp;&nbsp;&nbsp;';
echo '<input type="hidden" name="mode" value="'.$mode.'" />';
echo '<input type="submit" value="'.get_string('savesettings','data').'" />';
echo '</fieldset>';
echo '</form>';

3
mod/data/view.php
View File

@ -407,6 +407,7 @@
data_print_template('singletemplate', $records, $data, $search, $page);
} else if ($search){
notify(get_string('nomatch','data'));
data_print_show_all_form($data, $perpage, $sort, $order, $mode);
} else {
notify(get_string('norecords','data'));
}
@ -446,7 +447,7 @@
}
if ($records || $search || $page) {
data_print_preference_form($data, $perpage, $search, $sort, $order);
data_print_preference_form($data, $perpage, $search, $sort, $order, $mode);
}
/// If we have blocks, then print the left side here