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

Merge pull request #1747 from moodlehq/desktop 

Desktop
main
Juan Leyva 2019-02-04 15:16:13 +01:00 committed by GitHub
parent 6e9b7114de 688d7a246c
commit f792c84ee0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/addon/mod/assign/providers/prefetch-handler.ts
View File

@ -392,7 +392,7 @@ export class AddonModAssignPrefetchHandler extends CoreCourseActivityPrefetchHan
// Prefetch feedback. // Prefetch feedback.
if (submission.feedback) { if (submission.feedback) {
// Get profile and image of the grader. // Get profile and image of the grader.
if (submission.feedback.grade && submission.feedback.grade.grader) { if (submission.feedback.grade && submission.feedback.grade.grader && submission.feedback.grade.grader != -1) {
userIds.push(submission.feedback.grade.grader); userIds.push(submission.feedback.grade.grader);
} }

14
src/core/login/providers/helper.ts
View File

@ -179,10 +179,10 @@ export class CoreLoginHelperProvider {
} else { } else {
this.goToSiteInitialPage(); this.goToSiteInitialPage();
} }
}).catch((errorMessage) => { }).catch((error) => {
if (errorMessage) { if (error) {
// An error occurred, display the error and logout the user. // An error occurred, display the error and logout the user.
this.domUtils.showErrorModal(errorMessage); this.treatUserTokenError(siteData.siteUrl, error);
this.sitesProvider.logout(); this.sitesProvider.logout();
} }
}).finally(() => { }).finally(() => {
@ -561,8 +561,8 @@ export class CoreLoginHelperProvider {
* @return {boolean} True if embedded browser, false othwerise. * @return {boolean} True if embedded browser, false othwerise.
*/ */
isSSOEmbeddedBrowser(code: number): boolean { isSSOEmbeddedBrowser(code: number): boolean {
if (this.appProvider.isLinux()) { if (this.appProvider.isLinux() || this.appProvider.isMac()) {
// In Linux desktop apps, always use embedded browser. // In Linux and Mac desktop apps, always use embedded browser.
return true; return true;
} }
@ -647,8 +647,8 @@ export class CoreLoginHelperProvider {
loginUrl += '&oauthsso=' + params.id; loginUrl += '&oauthsso=' + params.id;
if (this.appProvider.isLinux()) { if (this.appProvider.isLinux() || this.appProvider.isMac()) {
// In Linux desktop apps, always use embedded browser. // In Linux and Mac desktop apps, always use embedded browser.
this.utils.openInApp(loginUrl); this.utils.openInApp(loginUrl);
} else { } else {
// Always open it in browser because the user might have the session stored in there. // Always open it in browser because the user might have the session stored in there.

2
src/core/user/providers/user.ts
View File

@ -397,7 +397,7 @@ export class CoreUserProvider {
userId = Number(userId); // Make sure it's a number. userId = Number(userId); // Make sure it's a number.
// Prevent repeats and errors. // Prevent repeats and errors.
if (!isNaN(userId) && !treated[userId]) { if (!isNaN(userId) && !treated[userId] && userId > 0) {
treated[userId] = true; treated[userId] = true;
promises.push(this.getProfile(userId, courseId, false, siteId).then((profile) => { promises.push(this.getProfile(userId, courseId, false, siteId).then((profile) => {

5
src/providers/utils/dom.ts
View File

@ -140,13 +140,12 @@ export class CoreDomUtilsProvider {
const readableSize = this.textUtils.bytesToSize(size.size, 2); const readableSize = this.textUtils.bytesToSize(size.size, 2);
return this.showConfirm(this.translate.instant('core.course.confirmpartialdownloadsize', { size: readableSize })); return this.showConfirm(this.translate.instant('core.course.confirmpartialdownloadsize', { size: readableSize }));
} else if (size.size >= wifiThreshold || (this.appProvider.isNetworkAccessLimited() && size.size >= limitedThreshold)) { } else if (alwaysConfirm || size.size >= wifiThreshold ||
(this.appProvider.isNetworkAccessLimited() && size.size >= limitedThreshold)) {
message = message || 'core.course.confirmdownload'; message = message || 'core.course.confirmdownload';
const readableSize = this.textUtils.bytesToSize(size.size, 2); const readableSize = this.textUtils.bytesToSize(size.size, 2);
return this.showConfirm(this.translate.instant(message, { size: readableSize })); return this.showConfirm(this.translate.instant(message, { size: readableSize }));
} else if (alwaysConfirm) {
return this.showConfirm(this.translate.instant('core.areyousure'));
} }
return Promise.resolve(); return Promise.resolve();