Merge branch 'MDL-73206' of https://github.com/call-learning/moodle

mod/bigbluebuttonbn/amd/src/modform.js

@@ -296,8 +296,7 @@ const participantListRoleUpdate = (type, id) => {
     const pList = getParticipantList();
 
     for (var i = 0; i < pList.length; i++) {
-        if (pList[i].selectiontype === type &&
-            pList[i].selectionid === (id === '' ? null : parseInt(id))) {
+        if (pList[i].selectiontype === type && pList[i].selectionid === id) {
             pList[i].role = participantListRoleSelection.value;
         }
     }

mod/bigbluebuttonbn/mod_form.php

@@ -58,16 +58,13 @@ class mod_bigbluebuttonbn_mod_form extends moodleform_mod {
                 \mod_bigbluebuttonbn\local\config::get('server_url')
             );
         }
-        $bigbluebuttonbn = null;
-        if ($this->current->id) {
-            $bigbluebuttonbn = $DB->get_record('bigbluebuttonbn', ['id' => $this->current->id], '*', MUST_EXIST);
-        }
         // UI configuration options.
         $cfg = \mod_bigbluebuttonbn\local\config::get_options();
 
         // Get only those that are allowed.
         $course = $this->_course;
         $context = context_course::instance($course->id);
+        $bigbluebuttonbn = empty($this->get_current()->id) ? null : $this->get_current();
 
         $instancetyperofiles = $this->get_instance_type_profiles();
         $this->bigbluebuttonbn_mform_add_block_profiles($mform, $instancetyperofiles);

mod/bigbluebuttonbn/templates/participant_form_add.mustache

@@ -29,6 +29,7 @@
         "canRemove": true
     }
 }}
+
 <tr id="participant_list_tr_{{selectiontypevalue}}-{{selectionvalue}}">
     <td class="participant_list_c0">
         <b><i>{{participanttype}}</i></b>
@@ -40,7 +41,7 @@
         <i>{{#str}}mod_form_field_participant_list_text_as, mod_bigbluebuttonbn{{/str}}</i>
     </td>
     <td class="participant_list_c3">
-        <select class="participant-select custom-select">
+        <select class="participant-select custom-select" name="select-for-{{selectiontypevalue}}-{{selectionvalue}}">
             {{#roles}}
                 <option value="{{id}}" {{#isselected}}selected{{/isselected}}>{{label}}</option>
             {{/roles}}

mod/bigbluebuttonbn/tests/behat/roles.feature

@@ -0,0 +1,27 @@
+@mod @mod_bigbluebuttonbn @javascript
+Feature: Bigbluebuttonbn rooms
+  When a meeting is created, roles for each type of participant can be changed
+
+  Background:  Make sure that a course is created
+    And the following course exists:
+      | name      | Test course |
+      | shortname | C1          |
+    And the following "users" exist:
+      | username | firstname | lastname | email                 |
+      | traverst | Terry     | Travers  | t.travers@example.com |
+    And the following "course enrolments" exist:
+      | user     | course | role   |
+      | traverst | C1     | student |
+    And the following "activities" exist:
+      | activity        | name           | intro                           | course | idnumber         | type | recordings_imported |
+      | bigbluebuttonbn | RoomRecordings | Test Room Recording description | C1     | bigbluebuttonbn1 | 0    | 0                   |
+
+  Scenario: Add a mod_bigbluebuttonbn instance and set the teacher role as moderator
+    When I am on the "RoomRecordings" "bigbluebuttonbn activity editing" page logged in as "admin"
+    Then I set the field "bigbluebuttonbn_participant_selection_type" to "Role"
+    Then I set the field "bigbluebuttonbn_participant_selection" to "Manager"
+    Then I click on "bigbluebuttonbn_participant_selection_add" "button"
+    Then I set the field "select-for-role-1" to "Moderator"
+    Then I press "Save and display"
+    Then I am on the "RoomRecordings" "bigbluebuttonbn activity editing" page logged in as "admin"
+    And "[name=select-for-role-1] option[value=moderator][selected]" "css_element" should exist