Skip to content
Browse files

MDL-28604 Question bank display forgets sort order

  • Loading branch information...
1 parent 80eb52c commit 3e1d47f2cc91887b8a0fb32e470b0620d7f41238 @timhunt timhunt committed Aug 4, 2011
Showing with 18 additions and 25 deletions.
  1. +1 −2 mod/quiz/edit.php
  2. +3 −3 mod/quiz/editlib.php
  3. +3 −3 question/edit.php
  4. +11 −17 question/editlib.php
View
3 mod/quiz/edit.php
@@ -453,8 +453,7 @@ function module_specific_controls($totalnumber, $recurse, $category, $cmid, $cmo
echo '<div class="bd">';
$questionbank->display('editq',
$pagevars['qpage'],
- $pagevars['qperpage'], $pagevars['qsortorder'],
- $pagevars['qsortorderdecoded'],
+ $pagevars['qperpage'],
$pagevars['cat'], $pagevars['recurse'], $pagevars['showhidden'],
$pagevars['showquestiontext']);
echo '</div>';
View
6 mod/quiz/editlib.php
@@ -1129,8 +1129,8 @@ public function add_to_quiz_url($questionid) {
return new moodle_url('/mod/quiz/edit.php', $params);
}
- public function display($tabname, $page, $perpage, $sortorder,
- $sortorderdecoded, $cat, $recurse, $showhidden, $showquestiontext) {
+ public function display($tabname, $page, $perpage, $cat,
+ $recurse, $showhidden, $showquestiontext) {
global $OUTPUT;
if ($this->process_actions_needing_ui()) {
return;
@@ -1150,7 +1150,7 @@ public function display($tabname, $page, $perpage, $sortorder,
// continues with list of questions
$this->display_question_list($this->contexts->having_one_edit_tab_cap($tabname),
$this->baseurl, $cat, $this->cm, $recurse, $page,
- $perpage, $showhidden, $sortorder, $sortorderdecoded, $showquestiontext,
+ $perpage, $showhidden, $showquestiontext,
$this->contexts->having_cap('moodle/question:add'));
$this->display_options($recurse, $showhidden, $showquestiontext);
View
6 question/edit.php
@@ -65,9 +65,9 @@
echo $OUTPUT->header();
echo '<div class="questionbankwindow boxwidthwide boxaligncenter">';
-$questionbank->display('questions', $pagevars['qpage'],
- $pagevars['qperpage'], $pagevars['qsortorder'], $pagevars['qsortorderdecoded'],
- $pagevars['cat'], $pagevars['recurse'], $pagevars['showhidden'], $pagevars['showquestiontext']);
+$questionbank->display('questions', $pagevars['qpage'], $pagevars['qperpage'],
+ $pagevars['cat'], $pagevars['recurse'], $pagevars['showhidden'],
+ $pagevars['showquestiontext']);
echo "</div>\n";
echo $OUTPUT->footer();
View
28 question/editlib.php
@@ -155,7 +155,6 @@ public function is_extra_row() {
/**
* Output the column header cell.
- * @param int $currentsort 0 for none. 1 for normal sort, -1 for reverse sort.
*/
public function display_header() {
echo '<th class="header ' . $this->get_classes() . '" scope="col">';
@@ -1168,8 +1167,8 @@ public function preview_question_url($question) {
* category Chooses the category
* displayoptions Sets display options
*/
- public function display($tabname, $page, $perpage, $sortorder,
- $sortorderdecoded, $cat, $recurse, $showhidden, $showquestiontext){
+ public function display($tabname, $page, $perpage, $cat,
+ $recurse, $showhidden, $showquestiontext) {
global $PAGE, $OUTPUT;
if ($this->process_actions_needing_ui()) {
@@ -1191,8 +1190,9 @@ public function display($tabname, $page, $perpage, $sortorder,
$this->print_category_info($category);
// continues with list of questions
- $this->display_question_list($this->contexts->having_one_edit_tab_cap($tabname), $this->baseurl, $cat, $this->cm,
- $recurse, $page, $perpage, $showhidden, $sortorder, $sortorderdecoded, $showquestiontext,
+ $this->display_question_list($this->contexts->having_one_edit_tab_cap($tabname),
+ $this->baseurl, $cat, $this->cm,
+ $recurse, $page, $perpage, $showhidden, $showquestiontext,
$this->contexts->having_cap('moodle/question:add'));
}
@@ -1297,7 +1297,6 @@ protected function create_new_question_form($category, $canadd) {
*/
protected function display_question_list($contexts, $pageurl, $categoryandcontext,
$cm = null, $recurse=1, $page=0, $perpage=100, $showhidden=false,
- $sortorder='typename', $sortorderdecoded='qtype, name ASC',
$showquestiontext = false, $addcontexts = array()) {
global $CFG, $DB, $OUTPUT;
@@ -1639,17 +1638,12 @@ function question_edit_setup($edittab, $baseurl, $requirecmid = false, $requirec
$pagevars['qperpage'] = DEFAULT_QUESTIONS_PER_PAGE;
}
- $sortoptions = array('alpha' => 'name, qtype ASC',
- 'typealpha' => 'qtype, name ASC',
- 'age' => 'id ASC');
-
- if ($sortorder = optional_param('qsortorder', '', PARAM_ALPHA)) {
- $pagevars['qsortorderdecoded'] = $sortoptions[$sortorder];
- $pagevars['qsortorder'] = $sortorder;
- $thispageurl->param('qsortorder', $sortorder);
- } else {
- $pagevars['qsortorderdecoded'] = $sortoptions['typealpha'];
- $pagevars['qsortorder'] = 'typealpha';
+ for ($i = 1; $i <= question_bank_view::MAX_SORTS; $i++) {
+ $param = 'qbs' . $i;
+ if (!$sort = optional_param($param, '', PARAM_ALPHAEXT)) {
+ break;
+ }
+ $thispageurl->param($param, $sort);
}
$defaultcategory = question_make_default_categories($contexts->all());

0 comments on commit 3e1d47f

Please sign in to comment.
Something went wrong with that request. Please try again.