MDL-33212 Course page: Eye icon should override other conditions

This commit is contained in:
sam marshall
2012-05-28 16:26:36 +01:00
parent 14fdcb4f13
commit bcaed19cc9
3 changed files with 19 additions and 6 deletions
+5 -2
View File
@@ -79,7 +79,8 @@ class conditionlib_test extends UnitTestCaseUsingDatabase {
$this->assertEqual(
(object)array('id'=>$id,'showavailability'=>1,
'availablefrom'=>17,'availableuntil'=>398,'course'=>64,
'conditionsgrade'=>array(), 'conditionscompletion'=>array()),
'conditionsgrade' => array(), 'conditionscompletion' => array(),
'visible' => 1),
$test->get_full_course_module());
// just the course_modules stuff; check it doesn't request that from db
@@ -87,11 +88,13 @@ class conditionlib_test extends UnitTestCaseUsingDatabase {
$cm->availablefrom=2;
$cm->availableuntil=74;
$cm->course=38;
$cm->visible = 1;
$test=new condition_info($cm,CONDITION_MISSING_EXTRATABLE);
$this->assertEqual(
(object)array('id'=>$id,'showavailability'=>0,
'availablefrom'=>2,'availableuntil'=>74,'course'=>38,
'conditionsgrade'=>array(), 'conditionscompletion'=>array()),
'conditionsgrade' => array(), 'conditionscompletion' => array(),
'visible' => 1),
$test->get_full_course_module());
// Now let's add some actual grade/completion conditions