From b1bf3a76f5e5fe6411840ad08c7ada56069b4e88 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Thu, 11 May 2023 17:01:57 +0200 Subject: [PATCH 1/2] MOBILE-4270 forum: Fix discussion push handler in tablet --- src/addons/mod/forum/services/handlers/push-click.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/addons/mod/forum/services/handlers/push-click.ts b/src/addons/mod/forum/services/handlers/push-click.ts index 220a3cce2..fb520cc3e 100644 --- a/src/addons/mod/forum/services/handlers/push-click.ts +++ b/src/addons/mod/forum/services/handlers/push-click.ts @@ -61,6 +61,8 @@ export class AddonModForumPushClickHandlerService implements CorePushNotificatio const cmId = Number(data.cmid); const pageParams: Params = { forumId: Number(data.instance), + cmId, + courseId, }; if (data.postid || contextUrlParams.urlHash) { @@ -68,11 +70,11 @@ export class AddonModForumPushClickHandlerService implements CorePushNotificatio } await CoreUtils.ignoreErrors( - AddonModForum.invalidateDiscussionPosts(pageParams.discussionId, undefined, notification.site), + AddonModForum.invalidateDiscussionPosts(discussionId, undefined, notification.site), ); await CoreNavigator.navigateToSitePath( - `${AddonModForumModuleHandlerService.PAGE_NAME}/${courseId}/${cmId}/${discussionId}`, + `${AddonModForumModuleHandlerService.PAGE_NAME}/discussion/${discussionId}`, { siteId: notification.site, params: pageParams }, ); } From e20cedac32dbd16b7bde1743806fbc3eded28ea4 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Thu, 11 May 2023 17:02:21 +0200 Subject: [PATCH 2/2] MOBILE-4270 lang: Fix devdocs URL in string --- src/core/features/login/lang.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/features/login/lang.json b/src/core/features/login/lang.json index 01c5f519f..7be709c6f 100644 --- a/src/core/features/login/lang.json +++ b/src/core/features/login/lang.json @@ -23,7 +23,7 @@ "emailconfirmsentnoemail": "

An email should have been sent to your address.

It contains easy instructions to complete your registration.

", "emailconfirmsentsuccess": "Confirmation email sent successfully", "emailnotmatch": "Emails do not match", - "erroraccesscontrolalloworigin": "The cross-origin call you're trying to perform has been rejected. Please check https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium", + "erroraccesscontrolalloworigin": "The cross-origin call you're trying to perform has been rejected. Please check https://moodledev.io/general/app/development/setup/app-in-browser", "errordeletesite": "An error occurred while deleting this account. Please try again.", "errorexampleurl": "The URL https://campus.example.edu is only an example URL, it's not a real site. Please use the URL of your school or organization's site.", "errorqrnoscheme": "This URL isn't a valid login URL.",