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

MOBILE-2159 geolocation: Improve error message when permission is denied

main
Noel De Martin 2019-12-10 17:06:04 +01:00
parent 3d17c2cf03
commit 2846e6838a
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/addon/mod/data/fields/latlong/component/latlong.ts
View File

@ -117,9 +117,19 @@ export class AddonModDataFieldLatlongComponent extends AddonModDataFieldPluginCo
this.form.controls['f_' + this.field.id + '_0'].setValue(result.coords.latitude); this.form.controls['f_' + this.field.id + '_0'].setValue(result.coords.latitude);
this.form.controls['f_' + this.field.id + '_1'].setValue(result.coords.longitude); this.form.controls['f_' + this.field.id + '_1'].setValue(result.coords.longitude);
}).catch((error) => { }).catch((error) => {
if (this.isPositionError(error) && error.code === error.PERMISSION_DENIED) {
this.domUtils.showErrorModal('addon.mod_data.locationpermissiondenied', true);
return;
}
this.domUtils.showErrorModalDefault(error, 'Error getting location'); this.domUtils.showErrorModalDefault(error, 'Error getting location');
}).finally(() => { }).finally(() => {
modal.dismiss(); modal.dismiss();
}); });
} }
protected isPositionError(error?: any): error is PositionError {
return error && 'code' in error && 'PERMISSION_DENIED' in error;
}
} }

1
src/addon/mod/data/lang/en.json
View File

@ -22,6 +22,7 @@
"foundrecords": "Found records: {{$a.num}}/{{$a.max}} (<a href=\"{{$a.reseturl}}\">Reset filters</a>)", "foundrecords": "Found records: {{$a.num}}/{{$a.max}} (<a href=\"{{$a.reseturl}}\">Reset filters</a>)",
"gettinglocation": "Getting location", "gettinglocation": "Getting location",
"latlongboth": "Both latitude and longitude are required.", "latlongboth": "Both latitude and longitude are required.",
"locationpermissiondenied": "Permission to access your location has been denied.",
"menuchoose": "Choose...", "menuchoose": "Choose...",
"modulenameplural": "Databases", "modulenameplural": "Databases",
"more": "More", "more": "More",

1
src/assets/lang/en.json
View File

@ -501,6 +501,7 @@
"addon.mod_data.foundrecords": "Found records: {{$a.num}}/{{$a.max}} (<a href=\"{{$a.reseturl}}\">Reset filters</a>)", "addon.mod_data.foundrecords": "Found records: {{$a.num}}/{{$a.max}} (<a href=\"{{$a.reseturl}}\">Reset filters</a>)",
"addon.mod_data.gettinglocation": "Getting location", "addon.mod_data.gettinglocation": "Getting location",
"addon.mod_data.latlongboth": "Both latitude and longitude are required.", "addon.mod_data.latlongboth": "Both latitude and longitude are required.",
"addon.mod_data.locationpermissiondenied": "Permission to access your location has been denied.",
"addon.mod_data.menuchoose": "Choose...", "addon.mod_data.menuchoose": "Choose...",
"addon.mod_data.modulenameplural": "Databases", "addon.mod_data.modulenameplural": "Databases",
"addon.mod_data.more": "More", "addon.mod_data.more": "More",