MDL-66269 mod_forum: removed the unnecessary hidden element

Part of MDL-66075.
This commit is contained in:
Shamim Rezaie 2019-08-17 17:07:53 +10:00 committed by Simey Lameze
parent 078ac3aa3c
commit c3ac38129d
2 changed files with 10 additions and 19 deletions

View File

@ -45,10 +45,6 @@ class export_form extends \moodleform {
$mform = $this->_form;
$forum = $this->_customdata['forum'];
$mform->addElement('hidden', 'export');
$mform->setType('export', PARAM_BOOL);
$mform->setDefault('export', true);
$mform->addElement('hidden', 'id');
$mform->setType('id', PARAM_INT);
$mform->setDefault('id', $forum->get_id());

View File

@ -28,7 +28,6 @@ require_once($CFG->libdir . '/adminlib.php');
require_once($CFG->libdir . '/dataformatlib.php');
$forumid = required_param('id', PARAM_INT);
$doexport = optional_param('export', false, PARAM_BOOL);
$vaultfactory = mod_forum\local\container::get_vault_factory();
$managerfactory = mod_forum\local\container::get_manager_factory();
@ -56,14 +55,6 @@ $url = new moodle_url('/mod/forum/export.php');
$pagetitle = get_string('export', 'mod_forum');
$context = $forum->get_context();
if ($doexport == false) {
$PAGE->set_context($context);
$PAGE->set_url($url);
$PAGE->set_title($pagetitle);
$PAGE->set_pagelayout('admin');
$PAGE->set_heading($pagetitle);
}
$form = new mod_forum\form\export_form($url->out(false), [
'forum' => $forum
]);
@ -99,12 +90,16 @@ if ($form->is_cancelled()) {
download_as_dataformat($filename, $dataformat, $fields, $iterator);
die();
}
if ($doexport == false) {
echo $OUTPUT->header();
echo $OUTPUT->heading($pagetitle);
$form->display();
$PAGE->set_context($context);
$PAGE->set_url($url);
$PAGE->set_title($pagetitle);
$PAGE->set_pagelayout('admin');
$PAGE->set_heading($pagetitle);
echo $OUTPUT->footer();
}
echo $OUTPUT->header();
echo $OUTPUT->heading($pagetitle);
$form->display();
echo $OUTPUT->footer();