merged fix for MDL-5736, retained search string problem

diff --git a/lang/en_utf8/data.php b/lang/en_utf8/data.php
index be397ac236715a4cec66db6a44aea2fb09e17d7f..18f558a4a51708bd5eb9730c3aef6a492ca7cc59 100644 (file)
--- a/lang/en_utf8/data.php
+++ b/lang/en_utf8/data.php
@@ -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';

diff --git a/mod/data/lib.php b/mod/data/lib.php
index bbb35b40ab201112a866581bc8b5cfd8a5fcd3de..8ed6196a34eee65808b4057625a7452c1e0e23a2 100755 (executable)
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -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>';

diff --git a/mod/data/view.php b/mod/data/view.php
index 468818d0c4c824efe20b6b037d701714c76680e5..46037815f67d985243e1cdb2dfb46e5306b6d674 100755 (executable)
--- a/mod/data/view.php
+++ b/mod/data/view.php
@@ -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