L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-10702 fixing handling of slashes in grade forms

Browse Source
This commit is contained in:
skodak
2007-08-03 08:12:06 +00:00
parent febf921c78
commit 41486d1c40
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grade/edit/tree/calculation.php
+1 -1
View File
@@ -39,7 +39,7 @@ if ($mform->is_cancelled()) {
$calculation = grade_item::denormalize_formula($grade_item->calculation, $grade_item->courseid);
$mform->set_data(array('courseid'=>$grade_item->courseid, 'calculation'=>$calculation, 'id'=>$grade_item->id, 'itemname'=>$grade_item->itemname));
if ($data = $mform->get_data()) {
if ($data = $mform->get_data(false)) {
$grade_item->set_calculation($data->calculation);
redirect($returnurl);
}
grade/edit/tree/category.php
+1 -1
View File
@@ -34,7 +34,7 @@ if ($category = get_record('grade_categories', 'id', $id, 'courseid', $course->i
if ($mform->is_cancelled()) {
redirect($returnurl);
} else if ($data = $mform->get_data()) {
} else if ($data = $mform->get_data(false)) {
$grade_category = new grade_category(array('id'=>$id, 'courseid'=>$course->id));
grade_category::set_properties($grade_category, $data);
grade/edit/tree/grade.php
+2 -2
View File
@@ -82,7 +82,7 @@ if ($mform->is_cancelled()) {
redirect($returnurl);
// form processing
} else if ($data = $mform->get_data()) {
} else if ($data = $mform->get_data(false)) {
$old_grade_grade = new grade_grade(array('userid'=>$data->userid, 'itemid'=>$grade_item->id), true); //might not exist yet
// update final grade or feedback
@@ -90,7 +90,7 @@ if ($mform->is_cancelled()) {
$grade_grade = grade_grade::fetch(array('userid'=>$data->userid, 'itemid'=>$grade_item->id));
$grade_grade->set_hidden($data->hidden); // TODO: this is wrong!
$grade_grade->set_hidden($data->hidden); // TODO: this is wrong - hidden might be a data to hide until
// ignore overridden flag when changing final grade
if ($old_grade_grade->finalgrade == $grade_grade->finalgrade) {
grade/edit/tree/item.php
+1 -1
View File
@@ -41,7 +41,7 @@ if ($item = get_record('grade_items', 'id', $id, 'courseid', $course->id)) {
$mform->set_data($item);
}
if ($data = $mform->get_data()) {
if ($data = $mform->get_data(false)) {
if (array_key_exists('calculation', $data)) {
$data->calculation = grade_item::normalize_formula($data->calculation, $course->id);
}
grade/edit/tree/outcomeitem.php
+1 -1
View File
@@ -46,7 +46,7 @@ if ($item = get_record('grade_items', 'id', $id, 'courseid', $course->id)) {
$mform->set_data($item);
}
if ($data = $mform->get_data()) {
if ($data = $mform->get_data(false)) {
if (array_key_exists('calculation', $data)) {
$data->calculation = grade_item::normalize_formula($data->calculation, $course->id);
}