L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-9907 searching/sorting by author name fixed when paging, MDL-14389 more transition fixes; merged from MOODLE_19_STABLE

Browse Source
This commit is contained in:
skodak
2008-04-16 13:54:01 +00:00
parent 69c0a60994
commit de8ff5813d
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/data/lib.php
+1
View File
@@ -1130,6 +1130,7 @@ function data_print_preference_form($data, $perpage, $search, $sort='', $order='
// End -->
//]]>
</script>';
echo '&nbsp;<input type="hidden" name="advanced" value="0" />';
echo '&nbsp;<input type="checkbox" id="advancedcheckbox" name="advanced" value="1" '.$checked.' onchange="showHideAdvSearch(this.checked);" /><label for="advancedcheckbox">'.get_string('advancedsearch', 'data').'</label>';
echo '&nbsp;<input type="submit" value="'.get_string('savesettings','data').'" />';
mod/data/view.php
+14 -4
View File
@@ -105,7 +105,17 @@
$SESSION->dataprefs[$data->id]['advanced'] = 0;
$SESSION->dataprefs[$data->id]['order'] = ($data->defaultsortdir == 0) ? 'ASC' : 'DESC';
}
$advanced = optional_param('advanced', $SESSION->dataprefs[$data->id]['advanced'], PARAM_INT);
$advanced = optional_param('advanced', -1, PARAM_INT);
if ($advanced == -1) {
$advanced = $SESSION->dataprefs[$data->id]['advanced'];
} else {
if (!$advanced) {
// explicitly switched to normal mode - discard all advanced search settings
$SESSION->dataprefs[$data->id]['search_array'] = array();
}
}
$search_array = $SESSION->dataprefs[$data->id]['search_array'];
if (!empty($advanced)) {
@@ -166,8 +176,8 @@
$fn = optional_param('u_fn', '', PARAM_NOTAGS);
$ln = optional_param('u_ln', '', PARAM_NOTAGS);
} else {
$fn = isset($search_array[DATA_FIRSTNAME]) ? $search_array[DATA_FIRSTNAME] : '';
$ln = isset($search_array[DATA_LASTNAME]) ? $search_array[DATA_LASTNAME] : '';
$fn = isset($search_array[DATA_FIRSTNAME]) ? $search_array[DATA_FIRSTNAME]->data : '';
$ln = isset($search_array[DATA_LASTNAME]) ? $search_array[DATA_LASTNAME]->data : '';
}
if (!empty($fn)) {
$search_array[DATA_FIRSTNAME] = new object();
@@ -633,7 +643,7 @@
}
//Advanced search form doesn't make sense for single (redirects list view)
if ($records || $search || $page || $mode == 'asearch' && $mode != 'single') {
if (($records || $search || $page || $mode == 'asearch') && $mode != 'single') {
data_print_preference_form($data, $perpage, $search, $sort, $order, $search_array, $advanced, $mode);
}