fix issues in merge

microsoft · Jan 28, 2021 · 7861b90 · 7861b90
1 parent 834412f
commit 7861b90
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/local/o365/classes/page/acp.php b/local/o365/classes/page/acp.php
@@ -711,6 +711,10 @@ public function mode_usergroupcustom() {
         echo \html_writer::script($js);
         echo \html_writer::tag('h2', get_string('acp_usergroupcustom', 'local_o365'));
 
+        // Option to enable all sync features on all pages.
+        echo \html_writer::tag('button', get_string('acp_usrgroupcustom_enable_all', 'local_o365'),
+            ['onclick' => 'local_o365_usergroup_all_set_feature(1)']);
+
         // Option to enable sync by default for new courses.
         require_once($CFG->libdir . '/adminlib.php');
         $enablefornewcourse = new \admin_setting_configcheckbox('local_o365/sync_new_course',

diff --git a/local/o365/classes/page/ajax.php b/local/o365/classes/page/ajax.php
@@ -514,7 +514,7 @@ public function mode_checkteamsmoodlesetup() {
             $data->info[] = get_string('settings_notice_restalreadyenabled', 'local_o365');
         }
 
-        // Enable Office 365 Webservices.
+        // Enable Microsoft 365 Webservices.
         $webservicemanager = new \webservice();
         $o365service = $webservicemanager->get_external_service_by_shortname('o365_webservices');
         if (!$o365service->enabled) {