Skip to content

Commit c6bbfe2

Browse files
lucaboeschsrobotta
lucaboesch
authored and
srobotta
committed
Update version to 2023101500.
1 parent 71712af commit c6bbfe2

File tree

7 files changed

+67
-57
lines changed

7 files changed

+67
-57
lines changed

‎classes/feedback_section_form.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
require_once($CFG->libdir . '/formslib.php');
2222
require_once($CFG->dirroot.'/mod/questionnaire/lib.php');
2323

24+
#[\AllowDynamicProperties]
2425
/**
2526
* Print the form to add or edit a questionnaire-instance
2627
*
@@ -38,6 +39,9 @@ class feedback_section_form extends \moodleform {
3839
*/
3940
public $context;
4041

42+
/** @var int $sid The section id. */
43+
protected $sid;
44+
4145
/**
4246
* Form definition.
4347
*/

‎classes/question/file.php‎

Lines changed: 40 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -136,44 +136,47 @@ protected function response_survey_display($response) {
136136
$fs = get_file_storage();
137137
$file = $fs->get_file_by_id($answer->value);
138138

139-
$moodleurl = moodle_url::make_pluginfile_url(
140-
$file->get_contextid(),
141-
$file->get_component(),
142-
$file->get_filearea(),
143-
$file->get_itemid(),
144-
$file->get_filepath(),
145-
$file->get_filename());
146-
147-
$mimetype = $file->get_mimetype();
148-
$title = '';
149-
150-
$extension = resourcelib_get_extension($file->get_filename());
151-
152-
$mediamanager = core_media_manager::instance($PAGE);
153-
$embedoptions = array(
154-
core_media_manager::OPTION_TRUSTED => true,
155-
core_media_manager::OPTION_BLOCK => true,
156-
);
157-
158-
if (file_mimetype_in_typegroup($mimetype, 'web_image')) { // It's an image.
159-
$code = resourcelib_embed_image($moodleurl->out(), $title);
160-
161-
} else if ($mimetype === 'application/pdf') {
162-
// PDF document.
163-
$code = resourcelib_embed_pdf($moodleurl->out(), $title, get_string('view'));
164-
165-
} else if ($mediamanager->can_embed_url($moodleurl, $embedoptions)) {
166-
// Media (audio/video) file.
167-
$code = $mediamanager->embed_url($moodleurl, $title, 0, 0, $embedoptions);
168-
169-
} else {
170-
// We need a way to discover if we are loading remote docs inside an iframe.
171-
$moodleurl->param('embed', 1);
172-
173-
// Anything else - just try object tag enlarged as much as possible.
174-
$code = resourcelib_embed_general($moodleurl, $title, get_string('view'), $mimetype);
139+
if ($file) {
140+
// There is a file.
141+
$moodleurl = moodle_url::make_pluginfile_url(
142+
$file->get_contextid(),
143+
$file->get_component(),
144+
$file->get_filearea(),
145+
$file->get_itemid(),
146+
$file->get_filepath(),
147+
$file->get_filename()
148+
);
149+
150+
$mimetype = $file->get_mimetype();
151+
$title = '';
152+
153+
$extension = resourcelib_get_extension($file->get_filename());
154+
155+
$mediamanager = core_media_manager::instance($PAGE);
156+
$embedoptions = array(
157+
core_media_manager::OPTION_TRUSTED => true,
158+
core_media_manager::OPTION_BLOCK => true,
159+
);
160+
161+
if (file_mimetype_in_typegroup($mimetype, 'web_image')) { // It's an image.
162+
$code = resourcelib_embed_image($moodleurl->out(), $title);
163+
164+
} else if ($mimetype === 'application/pdf') {
165+
// PDF document.
166+
$code = resourcelib_embed_pdf($moodleurl->out(), $title, get_string('view'));
167+
168+
} else if ($mediamanager->can_embed_url($moodleurl, $embedoptions)) {
169+
// Media (audio/video) file.
170+
$code = $mediamanager->embed_url($moodleurl, $title, 0, 0, $embedoptions);
171+
172+
} else {
173+
// We need a way to discover if we are loading remote docs inside an iframe.
174+
$moodleurl->param('embed', 1);
175+
176+
// Anything else - just try object tag enlarged as much as possible.
177+
$code = resourcelib_embed_general($moodleurl, $title, get_string('view'), $mimetype);
178+
}
175179
}
176-
177180
$output = '';
178181
$output .= '<div class="response text">';
179182
$output .= $code;

‎classes/responsetype/file.php‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -259,23 +259,26 @@ public function get_results_tags($weights, $participants, $respondents, $showtot
259259
$fs = get_file_storage();
260260
$file = $fs->get_file_by_id($row->fileid);
261261

262-
$imageurl = moodle_url::make_pluginfile_url(
263-
$file->get_contextid(),
264-
$file->get_component(),
265-
$file->get_filearea(),
266-
$file->get_itemid(),
267-
$file->get_filepath(),
268-
$file->get_filename());
262+
if ($file) {
263+
// There is a file.
264+
$imageurl = moodle_url::make_pluginfile_url(
265+
$file->get_contextid(),
266+
$file->get_component(),
267+
$file->get_filearea(),
268+
$file->get_itemid(),
269+
$file->get_filepath(),
270+
$file->get_filename());
269271

270-
$response->text = \html_writer::link($imageurl, $file->get_filename());
271-
if ($viewsingleresponse && $nonanonymous) {
272-
$rurl = $url . '&amp;rid=' . $row->rid . '&amp;individualresponse=1';
273-
$title = userdate($row->submitted);
274-
if (!isset($users[$row->userid])) {
275-
$users[$row->userid] = $DB->get_record('user', ['id' => $row->userid]);
272+
$response->text = \html_writer::link($imageurl, $file->get_filename());
273+
if ($viewsingleresponse && $nonanonymous) {
274+
$rurl = $url . '&amp;rid=' . $row->rid . '&amp;individualresponse=1';
275+
$title = userdate($row->submitted);
276+
if (!isset($users[$row->userid])) {
277+
$users[$row->userid] = $DB->get_record('user', ['id' => $row->userid]);
278+
}
279+
$response->respondent =
280+
'<a href="' . $rurl . '" title="' . $title . '">' . fullname($users[$row->userid]) . '</a>';
276281
}
277-
$response->respondent =
278-
'<a href="' . $rurl . '" title="' . $title . '">' . fullname($users[$row->userid]) . '</a>';
279282
} else {
280283
$response->respondent = '';
281284
}

‎db/upgrade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1002,7 +1002,7 @@ function xmldb_questionnaire_upgrade($oldversion=0) {
10021002
upgrade_mod_savepoint(true, 2022121600.02, 'questionnaire');
10031003
}
10041004

1005-
if ($oldversion < 2022121600.03) {
1005+
if ($oldversion < 2023101500) {
10061006
$questiontype = new stdClass();
10071007
$questiontype->typeid = 12;
10081008
$questiontype->type = 'File';
@@ -1032,7 +1032,7 @@ function xmldb_questionnaire_upgrade($oldversion=0) {
10321032
}
10331033

10341034
// Questionnaire savepoint reached.
1035-
upgrade_mod_savepoint(true, 2022121600.03, 'questionnaire');
1035+
upgrade_mod_savepoint(true, 2023101500, 'questionnaire');
10361036
}
10371037

10381038
return true;

‎questionnaire.class.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
* @author Mike Churchward
3030
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
3131
*/
32-
#[AllowDynamicProperties]
3332
class questionnaire {
3433

3534
// Class Properties.

‎tests/behat/behat_mod_questionnaire.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
Behat\Gherkin\Node\TableNode as TableNode,
3333
Behat\Mink\Exception\ExpectationException as ExpectationException;
3434

35+
#[\AllowDynamicProperties]
3536
/**
3637
* Questionnaire-related steps definitions.
3738
*

‎version.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525

2626
defined('MOODLE_INTERNAL') || die();
2727

28-
$plugin->version = 2022121600.02; // The current module version (Date: YYYYMMDDXX).
28+
$plugin->version = 2023101500; // The current module version (Date: YYYYMMDDXX).
2929
$plugin->requires = 2022112800.00; // Moodle version (4.1.0).
3030

3131
$plugin->component = 'mod_questionnaire';
3232

33-
$plugin->release = '4.1.0 (Build - 2023081100)';
33+
$plugin->release = '4.1.1 (Build - 2023101500)';
3434
$plugin->maturity = MATURITY_STABLE;

0 commit comments

Comments
 (0)