moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-29538 core_condition: changed the logic in the code so that it works with the new database structure as well as tidying up parts of the code

Browse source
This commit is contained in:
Mark Nelson 2012-05-09 01:32:45 +08:00
parent 92fb7dd3a5
commit cb4492c200
5 changed files with 203 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

8
course/moodleform_mod.php
View file

@ -263,8 +263,8 @@ abstract class moodleform_mod extends moodleform {
foreach($fullcm->conditionsfield as $field=>$details) {
$groupelements=$mform->getElement('conditionfieldgroup['.$num.']')->getElements();
$groupelements[0]->setValue($field);
$groupelements[1]->setValue(is_null($details->operator)?'':$details->operator);
$groupelements[2]->setValue(is_null($details->value)?'':($details->value));
$groupelements[1]->setValue(is_null($details->operator) ? '' : $details->operator);
$groupelements[2]->setValue(is_null($details->value) ? '' : $details->value);
$num++;
}
@ -533,7 +533,7 @@ abstract class moodleform_mod extends moodleform {
$ci = new condition_info($this->_cm, CONDITION_MISSING_EXTRATABLE);
$this->_cm = $ci->get_full_course_module();
$count = count($this->_cm->conditionsgrade)+1;
$fieldcount = count($this->_cm->conditionsfield)+1;
$fieldcount = count($this->_cm->conditionsfield) + 1;
} else {
$count = 1;
$fieldcount = 1;
@ -575,7 +575,7 @@ abstract class moodleform_mod extends moodleform {
}
}
asort($completionoptions);
$completionoptions = array(0=>$strnone)+$completionoptions;
$completionoptions = array(0=>$strnone) + $completionoptions;
$completionvalues=array(
COMPLETION_COMPLETE=>get_string('completion_complete','condition'),