Skip to content

Commit e20f2c9

Browse files
authored
Merge pull request #3565 from alfonso-salces/MOBILE-4077
Mobile 4077 - Open in browser
2 parents fdf9f99 + edf0eab commit e20f2c9

File tree

2 files changed

+32
-4
lines changed

2 files changed

+32
-4
lines changed

src/core/features/reportbuilder/components/report-detail/report-detail.ts

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,11 @@ import {
2323
import { IonRefresher } from '@ionic/angular';
2424
import { CoreNavigator } from '@services/navigator';
2525
import { CoreScreen } from '@services/screen';
26+
import { CoreSites } from '@services/sites';
2627
import { CoreDomUtils } from '@services/utils/dom';
28+
import { CoreTextErrorObject } from '@services/utils/text';
2729
import { CoreUtils } from '@services/utils/utils';
30+
import { Translate } from '@singletons';
2831
import { BehaviorSubject, Observable } from 'rxjs';
2932
import { map } from 'rxjs/operators';
3033

@@ -111,8 +114,33 @@ export class CoreReportBuilderReportDetailComponent implements OnInit {
111114
});
112115

113116
this.onReportLoaded.emit(report.details);
114-
} catch (err) {
115-
await CoreDomUtils.showErrorModal(err);
117+
} catch {
118+
const errorConfig: CoreTextErrorObject = {
119+
title: Translate.instant('core.error'),
120+
body: `
121+
<p>${Translate.instant('addon.mod_page.errorwhileloadingthepage')}</p>
122+
<p>${Translate.instant('core.course.useactivityonbrowser')}</p>
123+
`,
124+
buttons: [
125+
{
126+
text: Translate.instant('core.cancel'),
127+
role: 'cancel',
128+
handler: async () => await CoreNavigator.back(),
129+
},
130+
{
131+
text: Translate.instant('core.openinbrowser'),
132+
role: 'confirm',
133+
handler: async () => {
134+
const site = CoreSites.getRequiredCurrentSite();
135+
const href = `${site.getURL()}/reportbuilder/view.php?id=${this.reportId}`;
136+
await CoreUtils.openInBrowser(href, { showBrowserWarning: false });
137+
await CoreNavigator.back();
138+
},
139+
},
140+
],
141+
};
142+
143+
await CoreDomUtils.showErrorModal(errorConfig);
116144
}
117145
}
118146

src/core/features/reportbuilder/components/report-summary/report-summary.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ <h1>
3939
<ion-label>
4040
<p>
4141
<ion-icon name="fas-info-circle" aria-hidden="true"></ion-icon>
42-
<core-format-text [text]="'core.reportbuilder.filtersapplied' | translate: { $a: reportUrl }" [filter]="false"
43-
[clean]="true"></core-format-text>
42+
<core-format-text [text]="'core.reportbuilder.filtersapplied' | translate: { $a: reportUrl }" [filter]="false">
43+
</core-format-text>
4444
</p>
4545
</ion-label>
4646
</ion-item>

0 commit comments

Comments
 (0)