mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-20 07:56:06 +02:00
Code Issues Projects Releases Wiki Activity

MDL-18190

Browse Source
This commit is contained in:
nicolasconnault 2009-02-10 12:52:53 +00:00
parent 46409b209d
commit 28a6ca98ca
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grade/edit/tree/category.php
View File

@ -30,7 +30,6 @@ require_once 'category_form.php';
$courseid = required_param('courseid', PARAM_INT);
$id = optional_param('id', 0, PARAM_INT); // grade_category->id
$grade_item_id = optional_param('grade_item_id', 0, PARAM_INT); // grade_item->id
if (!$course = $DB->get_record('course', array('id' => $courseid))) {
print_error('nocourseid');
@ -133,7 +132,6 @@ if ($mform->is_cancelled()) {
// If the user leaves these fields empty during creation of a category, we let the default values take effect
// Otherwise, we let the user-entered grade item values take effect
$grade_item = $grade_category->load_grade_item();
$grade_item_id = $grade_item->id;
$grade_item_copy = fullclone($grade_item);
grade_item::set_properties($grade_item, $itemdata);

8
grade/edit/tree/category_form.php
View File

@ -260,9 +260,7 @@ class edit_category_form extends moodleform {
// hidden params
$mform->addElement('hidden', 'id', 0);
$mform->addElement('hidden', 'grade_item_id', 0);
$mform->setType('id', PARAM_INT);
$mform->setType('grade_item_id', PARAM_INT);
$mform->addElement('hidden', 'courseid', 0);
$mform->setType('courseid', PARAM_INT);
@ -312,7 +310,6 @@ class edit_category_form extends moodleform {
$grade_category = grade_category::fetch(array('id'=>$id));
$grade_item = $grade_category->load_grade_item();
// remove agg coef if not used
if ($grade_category->is_course_category()) {
if ($mform->elementExists('parentcategory')) {
@ -376,8 +373,9 @@ class edit_category_form extends moodleform {
}
/// GRADE ITEM
if ($id = $mform->getElementValue('grade_item_id')) {
$grade_item = grade_item::fetch(array('id'=>$id));
if ($id = $mform->getElementValue('id')) {
$grade_category = grade_category::fetch(array('id'=>$id));
$grade_item = $grade_category->load_grade_item();
if (!$grade_item->is_raw_used()) {
$mform->removeElement('grade_item_plusfactor');