EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3676 from dpalou/MOBILE-4270 

Mobile 4270
main
Noel De Martin 2023-05-11 17:29:21 +02:00 committed by GitHub
parent fa9cbd0315 e20cedac32
commit 626ca8d0fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/addons/mod/forum/services/handlers/push-click.ts
View File

@ -61,6 +61,8 @@ export class AddonModForumPushClickHandlerService implements CorePushNotificatio
const cmId = Number(data.cmid); const cmId = Number(data.cmid);
const pageParams: Params = { const pageParams: Params = {
forumId: Number(data.instance), forumId: Number(data.instance),
cmId,
courseId,
}; };
if (data.postid || contextUrlParams.urlHash) { if (data.postid || contextUrlParams.urlHash) {
@ -68,11 +70,11 @@ export class AddonModForumPushClickHandlerService implements CorePushNotificatio
} }
await CoreUtils.ignoreErrors( await CoreUtils.ignoreErrors(
AddonModForum.invalidateDiscussionPosts(pageParams.discussionId, undefined, notification.site), AddonModForum.invalidateDiscussionPosts(discussionId, undefined, notification.site),
); );
await CoreNavigator.navigateToSitePath( await CoreNavigator.navigateToSitePath(
`${AddonModForumModuleHandlerService.PAGE_NAME}/${courseId}/${cmId}/${discussionId}`, `${AddonModForumModuleHandlerService.PAGE_NAME}/discussion/${discussionId}`,
{ siteId: notification.site, params: pageParams }, { siteId: notification.site, params: pageParams },
); );
} }

2
src/core/features/login/lang.json
View File

@ -23,7 +23,7 @@
"emailconfirmsentnoemail": "<p>An email should have been sent to your address.</p><p>It contains easy instructions to complete your registration.</p>", "emailconfirmsentnoemail": "<p>An email should have been sent to your address.</p><p>It contains easy instructions to complete your registration.</p>",
"emailconfirmsentsuccess": "Confirmation email sent successfully", "emailconfirmsentsuccess": "Confirmation email sent successfully",
"emailnotmatch": "Emails do not match", "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.", "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. <strong>Please use the URL of your school or organization's site.</strong>", "errorexampleurl": "The URL https://campus.example.edu is only an example URL, it's not a real site. <strong>Please use the URL of your school or organization's site.</strong>",
"errorqrnoscheme": "This URL isn't a valid login URL.", "errorqrnoscheme": "This URL isn't a valid login URL.",