Merge branch 'MDL-32386b' of git://github.com/srynot4sale/moodle

This commit is contained in:
Aparup Banerjee 2012-08-27 11:30:44 +08:00
commit 7cc32281fc
2 changed files with 6 additions and 2 deletions

View file

@ -621,16 +621,20 @@ class completion_info {
debugging('set_module_viewed must be called before header is printed',
DEBUG_DEVELOPER);
}
// Don't do anything if view condition is not turned on
if ($cm->completionview == COMPLETION_VIEW_NOT_REQUIRED || !$this->is_enabled($cm)) {
return;
}
// Get current completion state
$data = $this->get_data($cm, $userid);
$data = $this->get_data($cm, false, $userid);
// If we already viewed it, don't do anything
if ($data->viewed == COMPLETION_VIEWED) {
return;
}
// OK, change state, save it, and update completion
$data->viewed = COMPLETION_VIEWED;
$this->internal_set_data($cm, $data);

View file

@ -257,7 +257,7 @@ class completionlib_testcase extends basic_testcase {
->will($this->returnValue(true));
$c->expects($this->at(1))
->method('get_data')
->with($cm, 1337)
->with($cm, false, 1337)
->will($this->returnValue((object)array('viewed'=>COMPLETION_NOT_VIEWED)));
$c->expects($this->at(2))
->method('internal_set_data')