Skip to content

Commit f266bfa

Browse files
committed
MOBILE-1701 assign: Fix cache problem in submission directive
1 parent 01776e0 commit f266bfa

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

www/addons/mod/assign/directives/submission.js

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -310,14 +310,19 @@ angular.module('mm.addons.mod_assign')
310310
controller: controller,
311311
templateUrl: 'addons/mod/assign/templates/submission.html',
312312
link: function(scope, element, attributes, controller) {
313-
scope.isGrading = !!attributes.submitid;
313+
var moduleId = parseInt(attributes.moduleid, 10),
314+
courseId = parseInt(attributes.courseid, 10),
315+
submitId = parseInt(attributes.submitid, 10),
316+
blindId = parseInt(attributes.blindid, 10);
317+
318+
scope.isGrading = !!submitId;
314319
scope.statusNew = mmaModAssignSubmissionStatusNew;
315320
scope.statusReopened = mmaModAssignSubmissionStatusReopened;
316321
scope.loaded = false;
317322
scope.submitModel = {};
318323

319324
var obsLoaded = scope.$on(mmaModAssignSubmissionInvalidatedEvent, function() {
320-
controller.load(scope, attributes.moduleid, attributes.courseid, attributes.submitid, attributes.blindid);
325+
controller.load(scope, moduleId, courseId, submitId, blindId);
321326
});
322327

323328
// Check if submit through app is supported.
@@ -327,15 +332,15 @@ angular.module('mm.addons.mod_assign')
327332

328333
scope.$on('$destroy', obsLoaded);
329334

330-
controller.load(scope, attributes.moduleid, attributes.courseid, attributes.submitid, attributes.blindid);
335+
controller.load(scope, moduleId, courseId, submitId, blindId);
331336

332337
// Add or edit submission.
333338
scope.goToEdit = function() {
334339
$state.go('site.mod_assign-submission-edit', {
335-
moduleid: attributes.moduleid,
336-
courseid: attributes.courseid,
337-
userid: attributes.submitid,
338-
blindid: attributes.blindid
340+
moduleid: moduleId,
341+
courseid: courseId,
342+
userid: submitId,
343+
blindid: blindId
339344
});
340345
};
341346

@@ -427,14 +432,14 @@ angular.module('mm.addons.mod_assign')
427432
function invalidateAndRefresh() {
428433
scope.loaded = false;
429434

430-
var promises = [$mmaModAssign.invalidateAssignmentData(attributes.courseid)];
435+
var promises = [$mmaModAssign.invalidateAssignmentData(courseId)];
431436
if (scope.assign) {
432437
promises.push($mmaModAssign.invalidateAllSubmissionData(scope.assign.id));
433438
promises.push($mmaModAssign.invalidateAssignmentUserMappingsData(scope.assign.id));
434439
}
435440

436441
$q.all(promises).finally(function() {
437-
controller.load(scope, attributes.moduleid, attributes.courseid, attributes.submitid, attributes.blindid);
442+
controller.load(scope, moduleId, courseId, submitId, blindId);
438443
});
439444
}
440445
}

0 commit comments

Comments
 (0)