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

MOBILE-4470 blog: add module association from cmId

main
Alfonso Salces 2024-05-30 16:05:09 +02:00
parent 53e346d7ae
commit f535c5bbd7
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/addons/blog/pages/edit-entry/edit-entry.ts
View File

@ -133,19 +133,30 @@ export class AddonBlogEditEntryPage implements CanLeave, OnInit {
const lastModified = CoreNavigator.getRouteNumberParam('lastModified'); const lastModified = CoreNavigator.getRouteNumberParam('lastModified');
const filters: AddonBlogFilter | undefined = CoreNavigator.getRouteParam('filters'); const filters: AddonBlogFilter | undefined = CoreNavigator.getRouteParam('filters');
const courseId = CoreNavigator.getRouteNumberParam('courseId'); const courseId = CoreNavigator.getRouteNumberParam('courseId');
const cmId = CoreNavigator.getRouteNumberParam('cmId');
this.userId = CoreNavigator.getRouteNumberParam('userId'); this.userId = CoreNavigator.getRouteNumberParam('userId');
this.siteHomeId = CoreSites.getCurrentSiteHomeId(); this.siteHomeId = CoreSites.getCurrentSiteHomeId();
if (courseId) {
this.courseId = courseId;
this.form.controls.associateWithCourse.setValue(true);
const { course } = await CoreCourseHelper.getCourse(this.courseId);
this.associatedCourse = course;
}
if (!entryId) { if (!entryId) {
this.loaded = true; this.loaded = true;
try {
if (cmId) {
this.modId = cmId;
this.form.controls.associateWithModule.setValue(true);
this.associatedModule = await CoreCourse.getModule(this.modId);
}
if (courseId) {
this.courseId = courseId;
this.form.controls.associateWithCourse.setValue(true);
const { course } = await CoreCourseHelper.getCourse(this.courseId);
this.associatedCourse = course;
}
} catch (error) {
CoreDomUtils.showErrorModalDefault(error, 'Error getting associations, they may not be displayed correctly.');
}
return; return;
} }
@ -154,7 +165,7 @@ export class AddonBlogEditEntryPage implements CanLeave, OnInit {
this.files = this.entry.attachmentfiles ?? []; this.files = this.entry.attachmentfiles ?? [];
this.initialFiles = [...this.files]; this.initialFiles = [...this.files];
this.courseId = this.courseId || this.entry.courseid; this.courseId = this.courseId || this.entry.courseid;
this.modId = this.entry.coursemoduleid ? this.entry.coursemoduleid : CoreNavigator.getRouteNumberParam('cmId'); this.modId = CoreNavigator.getRouteNumberParam('cmId') || this.entry.coursemoduleid;
if (this.courseId) { if (this.courseId) {
this.form.controls.associateWithCourse.setValue(true); this.form.controls.associateWithCourse.setValue(true);

2
src/addons/blog/pages/index/index.ts
View File

@ -298,7 +298,7 @@ export class AddonBlogIndexPage implements OnInit, OnDestroy {
* Redirect to entry creation form. * Redirect to entry creation form.
*/ */
createNewEntry(): void { createNewEntry(): void {
CoreNavigator.navigateToSitePath('blog/edit/0'); CoreNavigator.navigateToSitePath('blog/edit/0', { params: { cmId: this.filter.cmid } });
} }
/** /**