L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-65978 blog: Fix removing associations

Browse Source
This commit is contained in:
Juan Leyva
2024-03-07 11:58:22 +01:00
committed by Sara Arjona
parent d92f86635b
commit fc0f94626e
2 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blog/classes/external/update_entry.php
Vendored
+18 -11
View File
@@ -150,22 +150,29 @@ class update_entry extends external_api {
$context = context_system::instance();
// Validate course association. We need to convert the course id to context.
if (!empty($entrydata->courseassoc)) {
$coursecontext = context_course::instance($entrydata->courseassoc);
if (isset($entrydata->courseassoc)) {
$entrydata->courseid = $entrydata->courseassoc;
$entrydata->courseassoc = $coursecontext->id; // Convert to context.
$context = $coursecontext;
if (!empty($entrydata->courseid)) {
$coursecontext = context_course::instance($entrydata->courseassoc);
$entrydata->courseassoc = $coursecontext->id; // Convert to context.
$context = $coursecontext;
}
}
// Validate mod association.
if (!empty($entrydata->modassoc)) {
$modcontext = context_module::instance($entrydata->modassoc);
if (!empty($coursecontext) && $coursecontext->id != $modcontext->get_course_context(true)->id) {
throw new moodle_exception('errorinvalidparam', 'webservice', '', 'modassoc');
}
if (isset($entrydata->modassoc)) {
$entrydata->coursemoduleid = $entrydata->modassoc;
$entrydata->modassoc = $modcontext->id; // Convert to context.
$context = $modcontext;
if (!empty($entrydata->coursemoduleid)) {
$modcontext = context_module::instance($entrydata->modassoc);
if (!empty($coursecontext) && $coursecontext->id != $modcontext->get_course_context(true)->id) {
throw new moodle_exception('errorinvalidparam', 'webservice', '', 'modassoc');
}
$entrydata->modassoc = $modcontext->id; // Convert to context.
$context = $modcontext;
}
}
// Validate context. It might be upated because of the new association.
blog/tests/external/external_test.php
Vendored
+20
View File
@@ -1086,6 +1086,26 @@ class external_test extends \externallib_advanced_testcase {
$this->assertEquals($newattachfilename, $entry['attachmentfiles'][0]['filename']);
}
}
// Update removing associations.
$options = [
['name' => 'courseassoc', 'value' => 0],
['name' => 'modassoc', 'value' => 0],
];
$result = update_entry::execute($entryid, $subject, $summary, FORMAT_HTML, $options);
$result = external_api::clean_returnvalue(update_entry::execute_returns(), $result);
// Retrieve files via WS.
$result = \core_blog\external::get_entries();
$result = external_api::clean_returnvalue(\core_blog\external::get_entries_returns(), $result);
foreach ($result['entries'] as $entry) {
if ($entry['id'] == $entryid) {
$this->assertEmpty($entry['courseid']);
$this->assertEmpty($entry['coursemoduleid']);
}
}
}
/**