From a11ca3726b7365b0f37ed56a1c63a9f5875529a5 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 17 Mar 2022 16:14:01 +0100
Subject: [PATCH] MOBILE-3833 calendar: Fix route conflicts

---
 src/addons/calendar/calendar-lazy.module.ts   | 2 +-
 src/addons/calendar/pages/index/index.page.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/addons/calendar/calendar-lazy.module.ts b/src/addons/calendar/calendar-lazy.module.ts
index d675bf134..c01e053cc 100644
--- a/src/addons/calendar/calendar-lazy.module.ts
+++ b/src/addons/calendar/calendar-lazy.module.ts
@@ -28,7 +28,7 @@ function buildRoutes(injector: Injector): Routes {
             loadChildren: () => import('@addons/calendar/pages/index/index.module').then(m => m.AddonCalendarIndexPageModule),
         },
         {
-            path: 'settings',
+            path: 'calendar-settings',
             loadChildren: () =>
                 import('@addons/calendar/pages/settings/settings.module').then(m => m.AddonCalendarSettingsPageModule),
         },
diff --git a/src/addons/calendar/pages/index/index.page.ts b/src/addons/calendar/pages/index/index.page.ts
index c0ac2fb1c..9b9fd080b 100644
--- a/src/addons/calendar/pages/index/index.page.ts
+++ b/src/addons/calendar/pages/index/index.page.ts
@@ -360,7 +360,7 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
      * Open calendar events settings.
      */
     openSettings(): void {
-        CoreNavigator.navigateToSitePath('/calendar/settings');
+        CoreNavigator.navigateToSitePath('/calendar/calendar-settings');
     }
 
     /**