Skip to content

Commit 201a703

Browse files
committed
MOBILE-2915 core: Show file not found error if no files
1 parent ceff885 commit 201a703

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

src/addon/mod/resource/components/index/index.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import { Component, Injector } from '@angular/core';
1616
import { CoreAppProvider } from '@providers/app';
1717
import { CoreSitesProvider } from '@providers/sites';
18+
import { CoreUtilsProvider } from '@providers/utils/utils';
1819
import { CoreCourseProvider } from '@core/course/providers/course';
1920
import { CoreCourseModuleMainResourceComponent } from '@core/course/classes/main-resource-component';
2021
import { AddonModResourceProvider } from '../../providers/resource';
@@ -38,7 +39,8 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
3839

3940
constructor(injector: Injector, private resourceProvider: AddonModResourceProvider, private courseProvider: CoreCourseProvider,
4041
private appProvider: CoreAppProvider, private prefetchHandler: AddonModResourcePrefetchHandler,
41-
private resourceHelper: AddonModResourceHelperProvider, private sitesProvider: CoreSitesProvider) {
42+
private resourceHelper: AddonModResourceHelperProvider, private sitesProvider: CoreSitesProvider,
43+
private utils: CoreUtilsProvider) {
4244
super(injector);
4345
}
4446

@@ -78,7 +80,7 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
7880
// Load module contents if needed. Passing refresh is needed to force reloading contents.
7981
return this.courseProvider.loadModuleContents(this.module, this.courseId, null, false, refresh).then(() => {
8082
if (!this.module.contents || !this.module.contents.length) {
81-
return Promise.reject(null);
83+
return Promise.reject(this.utils.createFakeWSError('core.filenotfound', true));
8284
}
8385

8486
// Get the resource instance to get the latest name/description and to know if it's embedded.

src/assets/lang/en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1342,6 +1342,7 @@
13421342
"core.favourites": "Starred",
13431343
"core.filename": "Filename",
13441344
"core.filenameexist": "File name already exists: {{$a}}",
1345+
"core.filenotfound": "File not found, sorry.",
13451346
"core.fileuploader.addfiletext": "Add file",
13461347
"core.fileuploader.audio": "Audio",
13471348
"core.fileuploader.camera": "Camera",

src/core/course/providers/helper.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ export class CoreCourseHelperProvider {
528528
// Make sure that module contents are loaded.
529529
return promise.then(() => {
530530
if (!files || !files.length) {
531-
return Promise.reject(null);
531+
return Promise.reject(this.utils.createFakeWSError('core.filenotfound', true));
532532
}
533533

534534
return this.sitesProvider.getSite(siteId);

src/lang/en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@
9595
"favourites": "Starred",
9696
"filename": "Filename",
9797
"filenameexist": "File name already exists: {{$a}}",
98+
"filenotfound": "File not found, sorry.",
9899
"folder": "Folder",
99100
"forcepasswordchangenotice": "You must change your password to proceed.",
100101
"fulllistofcourses": "All courses",

0 commit comments

Comments
 (0)