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

Merge pull request #4088 from dpalou/MOBILE-4470 

MOBILE-4470 workshop: Fix switch phase option overrides the app
main
Pau Ferrer Ocaña 2024-06-07 11:13:32 +02:00 committed by GitHub
parent 1c9c3362b4 4dd7b45678
commit 96fb3fc81f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/addons/mod/workshop/components/phase/phase.html
View File

@ -21,7 +21,7 @@
</p>
</ion-label>
</ion-item-divider>
<ion-item class="ion-text-wrap" *ngIf="phase.switchUrl" [href]="phase.switchUrl" [detail]="false">
<ion-item class="ion-text-wrap" *ngIf="phase.switchUrl" [href]="phase.switchUrl" [detail]="false" core-link [capture]="false">
<ion-icon slot="start" name="fas-right-left" aria-hidden="true" />
<ion-label>
<p>{{ 'addon.mod_workshop.switchphase' + phase.code | translate }}</p>

5
src/core/features/grades/services/grades-helper.ts
View File

@ -43,7 +43,6 @@ import { CoreError } from '@classes/errors/error';
import { CoreCourseHelper } from '@features/course/services/course-helper';
import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
import { CoreCourseAccess } from '@features/course/services/course-options-delegate';
import { CorePlatform } from '@services/platform';
export const GRADES_PAGE_NAME = 'grades';
export const GRADES_PARTICIPANTS_PAGE_NAME = 'participant-grades';
@ -105,8 +104,8 @@ export class CoreGradesHelperProvider {
row.rowclass += itemNameColumn.class.indexOf('hidden') >= 0 ? ' hidden' : '';
row.rowclass += itemNameColumn.class.indexOf('dimmed_text') >= 0 ? ' dimmed_text' : '';
if (!useLegacyLayout && !CorePlatform.isAutomated()) {
// Activity name is only included in the webservice response from the latest version when behat is not running.
if (!useLegacyLayout) {
// Remove the "title" of the row (activity name, 'Manual item', 'Aggregation', etc.).
content = content.replace(/<span[^>]+>.+?<\/span>/i, '');
}