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

MOBILE-4081 wiki: Allow viewing empty subwikis

main
Dani Palou 2022-11-24 13:09:06 +01:00
parent 2ad9d2645c
commit 32d1e0761b
3 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/addons/mod/wiki/components/index/index.ts
View File

@ -638,14 +638,8 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
* @param subwikiId Subwiki ID. * @param subwikiId Subwiki ID.
* @param userId User ID of the subwiki. * @param userId User ID of the subwiki.
* @param groupId Group ID of the subwiki. * @param groupId Group ID of the subwiki.
* @param canEdit Whether the subwiki can be edited.
*/ */
goToSubwiki(subwikiId: number, userId: number, groupId: number, canEdit: boolean): void { goToSubwiki(subwikiId: number, userId: number, groupId: number): void {
// Check if the subwiki is disabled.
if (subwikiId <= 0 && !canEdit) {
return;
}
if (subwikiId != this.currentSubwiki!.id || userId != this.currentSubwiki!.userid || if (subwikiId != this.currentSubwiki!.id || userId != this.currentSubwiki!.userid ||
groupId != this.currentSubwiki!.groupid) { groupId != this.currentSubwiki!.groupid) {
@ -828,7 +822,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
* @param event Event. * @param event Event.
*/ */
async showSubwikiPicker(event: MouseEvent): Promise<void> { async showSubwikiPicker(event: MouseEvent): Promise<void> {
const popoverData = await CoreDomUtils.openPopover<AddonModWikiSubwiki>({ const subwiki = await CoreDomUtils.openPopover<AddonModWikiSubwiki>({
component: AddonModWikiSubwikiPickerComponent, component: AddonModWikiSubwikiPickerComponent,
componentProps: { componentProps: {
subwikis: this.subwikiData.subwikis, subwikis: this.subwikiData.subwikis,
@ -837,8 +831,8 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
event, event,
}); });
if (popoverData) { if (subwiki) {
this.goToSubwiki(popoverData.id, popoverData.userid, popoverData.groupid, popoverData.canedit); this.goToSubwiki(subwiki.id, subwiki.userid, subwiki.groupid);
} }
} }

3
src/addons/mod/wiki/components/subwiki-picker/addon-mod-wiki-subwiki-picker.html
View File

@ -5,8 +5,7 @@
<h2>{{ group.label }}</h2> <h2>{{ group.label }}</h2>
</ion-label> </ion-label>
</ion-item-divider> </ion-item-divider>
<ion-item class="ion-text-wrap" *ngFor="let subwiki of group.subwikis" (click)="openSubwiki(subwiki)" <ion-item class="ion-text-wrap" *ngFor="let subwiki of group.subwikis" (click)="openSubwiki(subwiki)" button
[attr.disabled]="!subwiki.canedit && subwiki.id <= 0" [button]="subwiki.canedit || subwiki.id > 0"
[attr.aria-current]="isSubwikiSelected(subwiki) ? 'page' : 'false'" detail="false"> [attr.aria-current]="isSubwikiSelected(subwiki) ? 'page' : 'false'" detail="false">
<ion-label>{{ subwiki.name }}</ion-label> <ion-label>{{ subwiki.name }}</ion-label>
<ion-icon *ngIf="isSubwikiSelected(subwiki)" name="fas-check" slot="end" aria-hidden="true"></ion-icon> <ion-icon *ngIf="isSubwikiSelected(subwiki)" name="fas-check" slot="end" aria-hidden="true"></ion-icon>

9
src/addons/mod/wiki/components/subwiki-picker/subwiki-picker.ts
View File

@ -49,12 +49,9 @@ export class AddonModWikiSubwikiPickerComponent {
* @param subwiki The subwiki to open. * @param subwiki The subwiki to open.
*/ */
openSubwiki(subwiki: AddonModWikiSubwiki): void { openSubwiki(subwiki: AddonModWikiSubwiki): void {
// Check if the subwiki is disabled. // Check if it isn't current subwiki.
if (subwiki.id > 0 || subwiki.canedit) { if (subwiki !== this.currentSubwiki) {
// Check if it isn't current subwiki. PopoverController.dismiss(subwiki);
if (subwiki != this.currentSubwiki) {
PopoverController.dismiss(subwiki);
}
} }
} }