Merge branch 'MDL-36804-master' of git://github.com/damyon/moodle

This commit is contained in:
Dan Poltawski
2013-04-03 17:32:15 +08:00
+8 -2
View File
@@ -530,7 +530,10 @@ class assign {
$update->requireallteammemberssubmit = $formdata->requireallteammemberssubmit;
$update->teamsubmissiongroupingid = $formdata->teamsubmissiongroupingid;
$update->blindmarking = $formdata->blindmarking;
$update->attemptreopenmethod = $formdata->attemptreopenmethod;
$update->attemptreopenmethod = ASSIGN_ATTEMPT_REOPEN_METHOD_NONE;
if (!empty($formdata->attemptreopenmethod)) {
$update->attemptreopenmethod = $formdata->attemptreopenmethod;
}
if (!empty($formdata->maxattempts)) {
$update->maxattempts = $formdata->maxattempts;
}
@@ -848,7 +851,10 @@ class assign {
$update->requireallteammemberssubmit = $formdata->requireallteammemberssubmit;
$update->teamsubmissiongroupingid = $formdata->teamsubmissiongroupingid;
$update->blindmarking = $formdata->blindmarking;
$update->attemptreopenmethod = $formdata->attemptreopenmethod;
$update->attemptreopenmethod = ASSIGN_ATTEMPT_REOPEN_METHOD_NONE;
if (!empty($formdata->attemptreopenmethod)) {
$update->attemptreopenmethod = $formdata->attemptreopenmethod;
}
if (!empty($formdata->maxattempts)) {
$update->maxattempts = $formdata->maxattempts;
}