Merge branch 'MDL-29069' of https://github.com/bostelm/moodle
This commit is contained in:
+9
-5
@@ -39,6 +39,7 @@
|
||||
$page = optional_param('page', 0, PARAM_INT);
|
||||
/// These can be added to perform an action on a record
|
||||
$approve = optional_param('approve', 0, PARAM_INT); //approval recordid
|
||||
$disapprove = optional_param('disapprove', 0, PARAM_INT); // disapproval recordid
|
||||
$delete = optional_param('delete', 0, PARAM_INT); //delete recordid
|
||||
$multidelete = optional_param_array('delcheck', null, PARAM_INT);
|
||||
$serialdelete = optional_param('serialdelete', null, PARAM_RAW);
|
||||
@@ -453,19 +454,22 @@ if ($showactivity) {
|
||||
$maxcount = 0;
|
||||
|
||||
} else {
|
||||
/// Approve any requested records
|
||||
// Approve or disapprove any requested records
|
||||
$params = array(); // named params array
|
||||
|
||||
$approvecap = has_capability('mod/data:approve', $context);
|
||||
|
||||
if ($approve && confirm_sesskey() && $approvecap) {
|
||||
if ($approverecord = $DB->get_record('data_records', array('id'=>$approve))) { // Need to check this is valid
|
||||
if (($approve || $disapprove) && confirm_sesskey() && $approvecap) {
|
||||
$newapproved = $approve ? 1 : 0;
|
||||
$recordid = $newapproved ? $approve : $disapprove;
|
||||
if ($approverecord = $DB->get_record('data_records', array('id' => $recordid))) { // Need to check this is valid
|
||||
if ($approverecord->dataid == $data->id) { // Must be from this database
|
||||
$newrecord = new stdClass();
|
||||
$newrecord->id = $approverecord->id;
|
||||
$newrecord->approved = 1;
|
||||
$newrecord->approved = $newapproved;
|
||||
$DB->update_record('data_records', $newrecord);
|
||||
echo $OUTPUT->notification(get_string('recordapproved','data'), 'notifysuccess');
|
||||
$msgkey = $newapproved ? 'recordapproved' : 'recorddisapproved';
|
||||
echo $OUTPUT->notification(get_string($msgkey, 'data'), 'notifysuccess');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user