Merge branch 'MDL-75460-400' of https://github.com/ssj365/moodle into MOODLE_400_STABLE

mod/bigbluebuttonbn/amd/src/modform.js

@@ -137,6 +137,9 @@ const applyInstanceTypeProfile = (profileType, isFeatureEnabled) => {
     // Show recordings imported settings validation.
     showInput('id_recordings_imported', showAll ||
         isFeatureEnabled(profileType, 'showrecordings'));
+    // Show lock settings validation.
+    showFieldset('id_lock', showAll ||
+        isFeatureEnabled(profileType, 'lock'));
     // Preuploadpresentation feature validation.
     showFieldset('id_preuploadpresentation', showAll ||
         isFeatureEnabled(profileType, 'preuploadpresentation'));

mod/bigbluebuttonbn/classes/local/proxy/bigbluebutton_proxy.php

@@ -263,7 +263,7 @@ class bigbluebutton_proxy extends proxy_base {
                 'id' => instance::TYPE_ROOM_ONLY,
                 'name' => get_string('instance_type_room_only', 'bigbluebuttonbn'),
                 'features' => ['showroom', 'welcomemessage', 'voicebridge', 'waitformoderator', 'userlimit',
-                    'recording', 'sendnotifications', 'preuploadpresentation', 'permissions', 'schedule', 'groups',
+                    'recording', 'sendnotifications', 'lock', 'preuploadpresentation', 'permissions', 'schedule', 'groups',
                     'modstandardelshdr', 'availabilityconditionsheader', 'tagshdr', 'competenciessection',
                     'completionattendance', 'completionengagement', 'availabilityconditionsheader']
             ],

mod/bigbluebuttonbn/tests/behat/add_instance.feature

@@ -35,6 +35,13 @@ Feature: bigbluebuttonbn instance
     And I should not see "Join session"
     And I should see "Recordings"
 
+  Scenario: Add a Recording Only activity and check that no live session settings are available for this instance type
+    Given I am on the "Test course" "course" page logged in as "admin"
+    And I am on "Test course" course homepage with editing mode on
+    And I add a "BigBlueButton" to section "1"
+    When  I select "Recordings only" from the "Instance type" singleselect
+    Then I should not see "Lock settings"
+
   Scenario Outline: Add an activity and check that required settings are available for the three types of instance types
     When I turn editing mode on
     And I add a "BigBlueButton" to section "1"