Skip to content

Commit a35cc80

Browse files
committed
MOBILE-2272 essay: Fix issues with attachments in essay
1 parent 5977cab commit a35cc80

File tree

5 files changed

+15
-5
lines changed

5 files changed

+15
-5
lines changed

src/addon/mod/quiz/providers/quiz.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1577,8 +1577,7 @@ export class AddonModQuizProvider {
15771577
const question = result.questions[i];
15781578

15791579
if (!question.settings) {
1580-
// Site doesn't return settings, stop.
1581-
break;
1580+
continue;
15821581
}
15831582

15841583
question.settings = this.textUtils.parseJSON(question.settings, null);

src/addon/qtype/essay/component/addon-qtype-essay.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<!-- Draft files not supported. -->
1919
<ng-container *ngIf="question.textarea && question.hasDraftFiles && !uploadFilesSupported">
2020
<ion-item text-wrap class="core-danger-item">
21-
<p class="core-question-warning">{{ 'core.question.errorinlinefilesnotsupportedinsite' | translate }}</p>
21+
<p class="core-question-warning">{{ 'core.question.errorembeddedfilesnotsupportedinsite' | translate }}</p>
2222
</ion-item>
2323
<ion-item text-wrap>
2424
<p><core-format-text [component]="component" [componentId]="componentId" [text]="question.textarea.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId"></core-format-text></p>

src/addon/qtype/essay/providers/handler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ export class AddonQtypeEssayHandler implements CoreQuestionHandler {
130130
}
131131

132132
if (!uploadFilesSupported && this.questionHelper.hasDraftFileUrls(element.innerHTML)) {
133-
return 'core.question.errorinlinefilesnotsupportedinsite';
133+
return 'core.question.errorembeddedfilesnotsupportedinsite';
134134
}
135135
}
136136

src/components/attachments/attachments.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ export class CoreAttachmentsComponent implements OnInit {
6969
const siteInfo = currentSite && currentSite.getInfo();
7070

7171
if (siteInfo && siteInfo.usermaxuploadfilesize) {
72-
this.maxSizeReadable = this.textUtils.bytesToSize(siteInfo.usermaxuploadfilesize, 2);
72+
this.maxSize = siteInfo.usermaxuploadfilesize;
73+
this.maxSizeReadable = this.textUtils.bytesToSize(this.maxSize, 2);
7374
} else {
7475
this.maxSizeReadable = this.translate.instant('core.unknown');
7576
}

src/core/fileuploader/providers/helper.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import { CoreTextUtilsProvider } from '@providers/utils/text';
2727
import { CoreUtilsProvider, PromiseDefer } from '@providers/utils/utils';
2828
import { CoreFileUploaderProvider, CoreFileUploaderOptions } from './fileuploader';
2929
import { CoreFileUploaderDelegate } from './delegate';
30+
import { CoreSites } from '@providers/sites';
3031

3132
/**
3233
* Helper service to upload files.
@@ -697,6 +698,15 @@ export class CoreFileUploaderHelperProvider {
697698
* @return Promise resolved when done.
698699
*/
699700
async uploadFileObject(file: any, maxSize?: number, upload?: boolean, allowOffline?: boolean, name?: string): Promise<any> {
701+
if (maxSize === 0) {
702+
const currentSite = CoreSites.instance.getCurrentSite();
703+
const siteInfo = currentSite && currentSite.getInfo();
704+
705+
if (siteInfo && siteInfo.usermaxuploadfilesize) {
706+
maxSize = siteInfo.usermaxuploadfilesize;
707+
}
708+
}
709+
700710
if (maxSize != -1 && file.size > maxSize) {
701711
return this.errorMaxBytes(maxSize, file.name);
702712
}

0 commit comments

Comments
 (0)