Merge branch 'MDL-79148-401' of https://github.com/ssj365/moodle into…

… MOODLE_401_STABLE

mod/bigbluebuttonbn/classes/output/recording_row_playback.php

@@ -111,11 +111,6 @@ protected function should_be_included(array $playback): bool {
             return true;
         }
 
-        // Exclude imported recordings.
-        if ($this->recording->get('imported')) {
-            return false;
-        }
-
         // Exclude non moderators.
         if ($this->instance) {
             if (!$this->instance->is_admin() && !$this->instance->is_moderator()) {

mod/bigbluebuttonbn/tests/output/recording_row_playback_test.php

@@ -0,0 +1,122 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace mod_bigbluebuttonbn\output;
+
+use mod_bigbluebuttonbn\instance;
+use mod_bigbluebuttonbn\recording;
+use mod_bigbluebuttonbn\test\testcase_helper_trait;
+
+/**
+ * Recording row
+ *
+ * @package   mod_bigbluebuttonbn
+ * @copyright 2010 onwards, Blindside Networks Inc
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @author    Laurent David  (laurent.david [at] call-learning [dt] fr)
+ */
+class recording_row_playback_test extends \advanced_testcase {
+    use testcase_helper_trait;
+
+    /**
+     * Setup for test
+     */
+    public function setUp(): void {
+        parent::setUp();
+        $this->initialise_mock_server();
+    }
+
+    /**
+     * Recording sample data
+     */
+    const RECORDING_DATA = [
+        [
+            'status' => recording::RECORDING_STATUS_PROCESSED,
+            'playback' => [
+                'format' =>
+                    [
+                        [
+
+                            'type' => 'podcast',
+                            'url' => 'http://mypodcast',
+                            'processingTime' => 0,
+                            'length' => 0,
+
+                        ],
+                        [
+
+                            'type' => 'presentation',
+                            'url' => 'http://mypresentation',
+                            'processingTime' => 0,
+                            'length' => 0,
+
+                        ],
+                        [
+
+                            'type' => 'video',
+                            'url' => 'http://myvideo',
+                            'processingTime' => 0,
+                            'length' => 0,
+
+                        ],
+                        [
+
+                            'type' => 'settings',
+                            'url' => 'http://mysettings',
+                            'processingTime' => 0,
+                            'length' => 0,
+
+                        ]
+                    ]
+            ]
+        ]
+    ];
+
+    /**
+     * Test recording link is rendered for imported recordings.
+     *
+     * @return void
+     * @covers       \recording_row_playback::should_be_included
+     */
+    public function test_show_recording_links(): void {
+        global $PAGE;
+        $this->resetAfterTest();
+        set_config('bigbluebuttonbn_importrecordings_enabled', 1);
+        $plugingenerator = $this->getDataGenerator()->get_plugin_generator('mod_bigbluebuttonbn');
+        ['recordings' => $recordingsdata, 'activity' => $activity] = $this->create_activity_with_recordings(
+            $this->get_course(),
+            instance::TYPE_ALL,
+            self::RECORDING_DATA
+        );
+        $recording = new recording(0, $recordingsdata[0]);
+        $instance = instance::get_from_instanceid($activity->id);
+        // Now create a new activity and import the recording.
+        $newactivity = $plugingenerator->create_instance([
+            'course' => $instance->get_course_id(),
+            'type' => instance::TYPE_ALL,
+            'name' => 'Example 2',
+        ]);
+        $plugingenerator->create_meeting([
+            'instanceid' => $newactivity->id,
+        ]);
+        $newinstance = instance::get_from_instanceid($newactivity->id);
+        // Import recording into new instance.
+        $importedrecording = $recording->create_imported_recording($newinstance);
+        $importedrowplayback = new recording_row_playback($importedrecording, $newinstance);
+        $importedrowinfo = $importedrowplayback->export_for_template($PAGE->get_renderer('mod_bigbluebuttonbn'));
+        $this->assertNotEmpty($importedrowinfo->playbacks);
+    }
+}