moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-66297 mod_forum: Prepared export to handle URL filters

Browse source 
Added the ability for discussion IDs and from/to timestamps to be
passed in via URL (to match filters available in the summary report,
which will link to the export). Also fixed a bug where "all users"
would fail as an optional array param.
This commit is contained in:
Michael Hawkins 2019-11-01 14:16:11 +08:00
parent 1743d4a3e9
commit 2e7a16b954
2 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mod/forum/classes/form/export_form.php
View file

@ -66,7 +66,7 @@ class export_form extends \moodleform {
return $OUTPUT->render_from_template('mod_forum/form-user-selector-suggestion', $useroptiondata); return $OUTPUT->render_from_template('mod_forum/form-user-selector-suggestion', $useroptiondata);
} }
]; ];
$mform->addElement('autocomplete', 'userids', get_string('users'), [], $options); $mform->addElement('autocomplete', 'useridsselected', get_string('users'), [], $options);
// Get the discussions on this forum. // Get the discussions on this forum.
$vaultfactory = \mod_forum\local\container::get_vault_factory(); $vaultfactory = \mod_forum\local\container::get_vault_factory();

31
mod/forum/export.php
View file

@ -26,11 +26,29 @@ define('NO_OUTPUT_BUFFERING', true);
require_once(__DIR__ . '/../../config.php'); require_once(__DIR__ . '/../../config.php');
require_once($CFG->libdir . '/adminlib.php'); require_once($CFG->libdir . '/adminlib.php');
require_once($CFG->libdir . '/dataformatlib.php'); require_once($CFG->libdir . '/dataformatlib.php');
require_once($CFG->dirroot . '/calendar/externallib.php');
$forumid = required_param('id', PARAM_INT); $forumid = required_param('id', PARAM_INT);
$userids = optional_param_array('userids', [], PARAM_INT); $userids = optional_param_array('userids', [], PARAM_INT);
$from = optional_param('from', '', PARAM_INT); $discussionids = optional_param_array('discids', [], PARAM_INT);
$to = optional_param('to', '', PARAM_INT); $from = optional_param_array('from', [], PARAM_INT);
$to = optional_param_array('to', [], PARAM_INT);
$fromtimestamp = optional_param('timestampfrom', '', PARAM_INT);
$totimestamp = optional_param('timestampto', '', PARAM_INT);
if (!empty($from['enabled'])) {
unset($from['enabled']);
$from = core_calendar_external::get_timestamps([$from])['timestamps'][0]['timestamp'];
} else {
$from = $fromtimestamp;
}
if (!empty($to['enabled'])) {
unset($to['enabled']);
$to = core_calendar_external::get_timestamps([$to])['timestamps'][0]['timestamp'];
} else {
$to = $totimestamp;
}
$vaultfactory = mod_forum\local\container::get_vault_factory(); $vaultfactory = mod_forum\local\container::get_vault_factory();
$managerfactory = mod_forum\local\container::get_manager_factory(); $managerfactory = mod_forum\local\container::get_manager_factory();
@ -69,10 +87,9 @@ if ($form->is_cancelled()) {
$discussionvault = $vaultfactory->get_discussion_vault(); $discussionvault = $vaultfactory->get_discussion_vault();
$postvault = $vaultfactory->get_post_vault(); $postvault = $vaultfactory->get_post_vault();
$discussionids = [];
if ($data->discussionids) { if ($data->discussionids) {
$discussionids = $data->discussionids; $discussionids = $data->discussionids;
} else { } else if (empty($discussionids)) {
$discussions = $discussionvault->get_all_discussions_in_forum($forum); $discussions = $discussionvault->get_all_discussions_in_forum($forum);
$discussionids = array_map(function ($discussion) { $discussionids = array_map(function ($discussion) {
return $discussion->get_id(); return $discussion->get_id();
@ -80,8 +97,8 @@ if ($form->is_cancelled()) {
} }
$filters = ['discussionids' => $discussionids]; $filters = ['discussionids' => $discussionids];
if ($data->userids) { if ($data->useridsselected) {
$filters['userids'] = $data->userids; $filters['userids'] = $data->useridsselected;
} }
if ($data->from) { if ($data->from) {
$filters['from'] = $data->from; $filters['from'] = $data->from;
@ -146,7 +163,7 @@ echo $OUTPUT->header();
echo $OUTPUT->heading($pagetitle); echo $OUTPUT->heading($pagetitle);
// It is possible that the following fields have been provided in the URL. // It is possible that the following fields have been provided in the URL.
$form->set_data(['userids' => $userids, 'from' => $from, 'to' => $to]); $form->set_data(['useridsselected' => $userids, 'discussionids' => $discussionids, 'from' => $from, 'to' => $to]);
$form->display(); $form->display();