stop acl deletion if mapping couldnt be deleted

Tamara Gunkel · Tamara Gunkel · commit 3ff82c60a29b · 2022-03-08T12:34:54.000+01:00
diff --git a/classes/external.php b/classes/external.php
@@ -297,11 +297,15 @@ public static function unlink_series(int $contextid, int $ocinstanceid, string $
                 }
             }
 
+            if (!$mapping->delete()) {
+                throw new moodle_exception('delete_series_failed', 'block_opencast');
+            }
+
             // Unlinking series from course.
             $apibridge = apibridge::get_instance($params['ocinstanceid']);
             $seriesunlinked = $apibridge->unlink_series_from_course($course->id, $params['seriesid']);
 
-            if (!$seriesunlinked || !$mapping->delete()) {
+            if (!$seriesunlinked) {
                 throw new moodle_exception('delete_series_failed', 'block_opencast');
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -297,11 +297,15 @@ public static function unlink_series(int $contextid, int $ocinstanceid, string $`
`297`	`297`	`}`
`298`	`298`	`}`
`299`	`299`
	`300`	`+ if (!$mapping->delete()) {`
	`301`	`+ throw new moodle_exception('delete_series_failed', 'block_opencast');`
	`302`	`+ }`
	`303`	`+`
`300`	`304`	`// Unlinking series from course.`
`301`	`305`	`$apibridge = apibridge::get_instance($params['ocinstanceid']);`
`302`	`306`	`$seriesunlinked = $apibridge->unlink_series_from_course($course->id, $params['seriesid']);`
`303`	`307`
`304`		`- if (!$seriesunlinked \|\| !$mapping->delete()) {`
	`308`	`+ if (!$seriesunlinked) {`
`305`	`309`	`throw new moodle_exception('delete_series_failed', 'block_opencast');`
`306`	`310`	`}`
`307`	`311`	`}`