Properly fixed page flow for approvals and deletions

diff --git a/mod/data/lib.php b/mod/data/lib.php
index 81d1cca5f9b4705bafdd40f6d75df26bbfae6d46..7805c33ab9569cc37d375be6007c1b93e01dc1f3 100755 (executable)
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -840,7 +840,7 @@ function data_print_template($records, $data, $search, $template, $sort, $page=0
         $patterns[]='/\#\#Delete\#\#/i';
         if (data_isowner($record->id) or isteacheredit($course->id)){
             $replacement[] = '<a href="'.$CFG->wwwroot.'/mod/data/view.php?d='
-                             .$data->id.'&amp;rid='.$record->id.'&amp;delete='.$record->id.'&amp;sesskey='.sesskey().'"><img src="'.$CFG->pixpath.'/t/delete.gif" height="11" width="11" border="0" alt="'.get_string('delete').'" /></a>';
+                             .$data->id.'&amp;delete='.$record->id.'&amp;sesskey='.sesskey().'"><img src="'.$CFG->pixpath.'/t/delete.gif" height="11" width="11" border="0" alt="'.get_string('delete').'" /></a>';
         }else {
             $replacement[] = '';
         }
@@ -853,7 +853,7 @@ function data_print_template($records, $data, $search, $template, $sort, $page=0
 
         $patterns[]='/\#\#Approve\#\#/i';
         if (isteacher($course->id) && ($data->approval) && (!$record->approved)){
-            $replacement[] = '<a href="'.$CFG->wwwroot.'/mod/data/view.php?d='.$data->id.'&amp;rid='.$record->id.'&amp;approve='.$record->id.'&search='.$search.'&amp;sort='.$sort.'&amp;order='.$order.'&amp;group='.$group.'&amp;sesskey='.sesskey().'"><img src="'.$CFG->pixpath.'/i/show.gif" height="11" width="11" border="0" alt="'.get_string('approve').'" /></a>';
+            $replacement[] = '<a href="'.$CFG->wwwroot.'/mod/data/view.php?d='.$data->id.'&amp;approve='.$record->id.'&search='.$search.'&amp;sort='.$sort.'&amp;order='.$order.'&amp;group='.$group.'&amp;sesskey='.sesskey().'"><img src="'.$CFG->pixpath.'/i/show.gif" height="11" width="11" border="0" alt="'.get_string('approve').'" /></a>';
         } else {
             $replacement[] = '';
         }

diff --git a/mod/data/view.php b/mod/data/view.php
index f7a778611f8f960b1eafeb2f8dc4c6bad358bf68..0b8a884ba9d720ff4bc1735e82a94b2e6d5fa332 100755 (executable)
--- a/mod/data/view.php
+++ b/mod/data/view.php
@@ -158,6 +158,8 @@
     $currenttab = 'browse';
     include('tabs.php'); 
 
+    $perpage = get_user_preferences('data_perpage', 10);    //get default per page
+
 /// Approve any requested records
 
     if ($approve && confirm_sesskey() && isteacher($course->id)) {
@@ -168,6 +170,9 @@
                 if (update_record('data_records', $newrecord)) {
                     notify(get_string('recordapproved','data'), 'notifysuccess');
                 }
+                if ($perpage == 1) {
+                    $rid = $approve;
+                }
             }
         }
     }
@@ -175,7 +180,7 @@
 /// Delete any requested records
 
     if ($delete && confirm_sesskey()) {
-        if (isteacheredit($course) or data_isowner($delete)){
+        if (isteacher($course->id) or data_isowner($delete)){
             if ($confirm = optional_param('confirm',0,PARAM_INT)) {
                 if ($contents = get_records('data_content','recordid', $delete)) {
                     foreach ($contents as $content) {  // Delete files or whatever else this field allows
@@ -189,7 +194,11 @@
                     
                 add_to_log($course->id, 'data', 'record delete', "view.php?id=$cm->id", $data->id, $cm->id);
                     
-                notify(get_string('recorddeleted','data'));
+                notify(get_string('recorddeleted','data'), 'notifysuccess');
+
+                if ($perpage == 1) {
+                    $rid = $delete;
+                }
 
             } else {   // Print a confirmation page
                 notice_yesno(get_string('confirmdeleterecord','data'), 
@@ -202,15 +211,15 @@
         }
     }
 
-// If not editting teacher, check whether user has sufficient records to view
-    if (!isteacheredit($course->id) and data_numentries($data) < $data->requiredentriestoview){
+// If not teacher, check whether user has sufficient records to view
+    if (!isteacher($course->id) and data_numentries($data) < $data->requiredentriestoview){
         notify (($data->requiredentriestoview - data_numentries($data)).'&nbsp;'.get_string('insufficiententries','data'));
         echo '</td></tr></table>';
         print_footer($course);
         exit;
     }
 
-    if ($rid){    //set per page to 1, if looking for 1 specific record
+    if ($rid) {    //set per page to 1, if looking for 1 specific record
         set_user_preference('data_perpage', DATA_PERPAGE_SINGLE);
     }