Skip to content

Reorganise local_o365 sync settings configuration page #3201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
weilai-irl wants to merge 1 commit into
base: MOODLE_502_STABLE
Choose a base branch
from
+85 −57
Open

Reorganise local_o365 sync settings configuration page #3201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions local/o365/classes/page/acp.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ protected function add_navbar() {
$params = ['section' => 'local_o365'];
switch ($mode) {
case 'coursesynccustom':
$params['section'] = 'local_o365_sync';
$this->title = get_string('settings_header_syncsettings', 'local_o365');
$params['section'] = 'local_o365_coursesync';
$this->title = get_string('settings_header_coursesync', 'local_o365');
break;
case 'healthcheck':
case 'usermatch':
Expand Down Expand Up @@ -1036,7 +1036,7 @@ public function mode_teamconnections() {
// Check settings.
$coursesyncsetting = get_config('local_o365', 'coursesync');
if ($coursesyncsetting === 'off') {
$redirecturl = new url('/admin/settings.php', ['section' => 'local_o365_sync']);
$redirecturl = new url('/admin/settings.php', ['section' => 'local_o365_coursesync']);
redirect($redirecturl, get_string('acp_teamconnections_sync_disabled', 'local_o365'));
}

Expand Down
2 changes: 2 additions & 0 deletions local/o365/lang/en/local_o365.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
// Settings - tabs.
$string['settings_header_setup'] = 'Setup';
$string['settings_header_syncsettings'] = 'Sync Settings';
$string['settings_header_usersync'] = 'User Sync';
$string['settings_header_coursesync'] = 'Course Sync';
$string['settings_header_advanced'] = 'Advanced';
$string['settings_header_sds'] = 'SDS sync';
$string['settings_header_teams'] = 'Teams Settings';
Expand Down
7 changes: 6 additions & 1 deletion local/o365/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@
const LOCAL_O365_TAB_TEAMS = 5;
/** @var int configuration tab "Teams Moodle app". */
const LOCAL_O365_TAB_MOODLE_APP = 6;
/** @var int configuration tab "User Sync settings". */
const LOCAL_O365_TAB_USERSYNC = 7;
/** @var int configuration tab "Course Sync settings". */
const LOCAL_O365_TAB_COURSESYNC = 8;

// Group roles.
/** @var int group role owner */
Expand Down Expand Up @@ -461,7 +465,8 @@ function local_o365_get_duplicate_emails() {
function local_o365_get_settings_nav_html(string $currentpage): string {
$pages = [
'local_o365' => get_string('settings_header_setup', 'local_o365'),
'local_o365_sync' => get_string('settings_header_syncsettings', 'local_o365'),
'local_o365_usersync' => get_string('settings_header_usersync', 'local_o365'),
'local_o365_coursesync' => get_string('settings_header_coursesync', 'local_o365'),
'local_o365_advanced' => get_string('settings_header_advanced', 'local_o365'),
'local_o365_sds' => get_string('settings_header_sds', 'local_o365'),
'local_o365_teams' => get_string('settings_header_teams', 'local_o365'),
Expand Down
Loading