moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-10 19:36:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-73313_master' of https://github.com/tasosb/moodle

Browse source
This commit is contained in:
Sara Arjona 2022-02-17 08:38:08 +01:00
commit af7a0ed1a1
6 changed files with 28 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
mod/bigbluebuttonbn/classes/instance.php
View file

@ -797,6 +797,9 @@ EOF;
*/
public function get_welcome_message(): string {
$welcomestring = $this->get_instance_var('welcome');
if (!config::get('welcome_editable') || empty($welcomestring)) {
$welcomestring = config::get('welcome_default');
}
if (empty($welcomestring)) {
$welcomestring = get_string('mod_form_field_welcome_default', 'bigbluebuttonbn');
}

1
mod/bigbluebuttonbn/classes/local/config.php
View file

@ -224,6 +224,7 @@ class config {
'lockonjoinconfigurable_editable' => self::get('lockonjoinconfigurable_editable'),
'lockonjoinconfigurable_default' => self::get('lockonjoinconfigurable_default'),
'welcome_default' => self::get('welcome_default'),
'welcome_editable' => self::get('welcome_editable'),
];
}

12
mod/bigbluebuttonbn/classes/settings.php
View file

@ -193,6 +193,18 @@ class settings {
$item,
$settingsgeneral
);
$settingsgeneral->add($item);
$item = new admin_setting_configcheckbox(
'bigbluebuttonbn_welcome_editable',
get_string('config_welcome_editable', 'bigbluebuttonbn'),
get_string('config_welcome_editable_description', 'bigbluebuttonbn'),
1,
);
$this->add_conditional_element(
'welcome_editable',
$item,
$settingsgeneral
);
}
return $settingsgeneral;
}