MDL-16917 Fixed Merged from MOODLE_19_STABLE

This commit is contained in:
nicolasconnault 2008-10-17 14:03:28 +00:00
parent a8ad411475
commit 976bf10efa
3 changed files with 10 additions and 2 deletions

View File

@ -215,6 +215,12 @@ $navigation = grade_build_nav(__FILE__, $stroutcome, array('courseid' => $course
print_header_simple($strgrades . ': ' . $strgraderreport, ': ' . $stroutcomesedit, $navigation, '', '', true, '', navmenu($course));
if (!$outcomes = grade_outcome::fetch_all_available($COURSE->id)) {
notice_yesno(get_string('nooutcomes', 'grades'), $CFG->wwwroot.'/grade/edit/outcome/course.php?id='.$courseid, $returnurl);
print_footer($course);
die();
}
$mform->display();
print_footer($course);

View File

@ -57,8 +57,9 @@ class edit_outcomeitem_form extends moodleform {
$options = array(0=>get_string('none'));
if ($coursemods = get_course_mods($COURSE->id)) {
foreach ($coursemods as $coursemod) {
$mod = get_coursemodule_from_id($coursemod->modname, $coursemod->id);
$options[$coursemod->id] = format_string($mod->name);
if ($mod = get_coursemodule_from_id($coursemod->modname, $coursemod->id)) {
$options[$coursemod->id] = format_string($mod->name);
}
}
}
$mform->addElement('select', 'cmid', get_string('linkedactivity', 'grades'), $options);

View File

@ -347,6 +347,7 @@ $string['nonnumericweight'] = 'Received non-numeric value for';
$string['nonunlockableverbose'] = 'This grade cannot be unlocked until $a->itemname is unlocked.';
$string['nonweightedpct'] = 'non-weighted %%';
$string['nooutcome'] = 'No outcome';
$string['nooutcomes'] = 'Outcome items must be linked to a course outcome, but there are no outcomes for this course. Would you like to add one?';
$string['nopublish'] = 'Do not publish';
$string['noselectedcategories'] = 'no categories were selected.';
$string['noselecteditems'] = 'no items were selected.';