From 45e296539e54b2ef0c9b33045e2e3f65e123f05f Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Fri, 31 Aug 2012 21:30:08 +0200 Subject: [PATCH] Adding select instead of input + fixing a PHP warning --- main/inc/lib/formvalidator/Rule/CompareFields.php | 2 +- main/inc/lib/grade_model.lib.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/main/inc/lib/formvalidator/Rule/CompareFields.php b/main/inc/lib/formvalidator/Rule/CompareFields.php index 866a795e76..4f28a1c297 100644 --- a/main/inc/lib/formvalidator/Rule/CompareFields.php +++ b/main/inc/lib/formvalidator/Rule/CompareFields.php @@ -12,7 +12,7 @@ class HTML_QuickForm_Compare_Fields extends HTML_QuickForm_Rule_Compare * @param string the value to compare * @return boolean True if date is valid */ - function validate($values, $operator_and_max_value) { + function validate($values, $operator_and_max_value = null) { if (is_array($values) && !empty($values) && !empty($operator_and_max_value)) { $final_value = 0; foreach ($values as $value) { diff --git a/main/inc/lib/grade_model.lib.php b/main/inc/lib/grade_model.lib.php index d6bc3f0b3f..8fd24d8c0f 100644 --- a/main/inc/lib/grade_model.lib.php +++ b/main/inc/lib/grade_model.lib.php @@ -108,7 +108,8 @@ class GradeModel extends Model { $form->addElement('text', 'components['.$i.'][prefix]', null, array('class' => 'span2')); $form->addElement('text', 'components['.$i.'][exclusions]', null, array('class' => 'span2')); - $form->addElement('text', 'components['.$i.'][count_elements]', null, array('class' => 'span2')); + $options = array(0=>0, 1 => 1, 2 => 2, 3=>3, 4=> 4, 5=> 5); + $form->addElement('select', 'components['.$i.'][count_elements]', null, $options); $form->addElement('text', 'components['.$i.'][title]', null, array('class' => 'span2'));