Skip to content

Commit

Permalink
MDL-31633 grades: Fixing incorrect redirect when trying to edit grade…
Browse files Browse the repository at this point in the history
… letters from admin settings
  • Loading branch information
ankitagarwal committed Aug 24, 2012
1 parent d71c486 commit a8dfc48
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion grade/lib.php
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2610,16 +2610,23 @@ public static function get_info_edit_structure($courseid) {
* @return array * @return array
*/ */
public static function get_info_letters($courseid) { public static function get_info_letters($courseid) {
global $SITE;
if (self::$letterinfo !== null) { if (self::$letterinfo !== null) {
return self::$letterinfo; return self::$letterinfo;
} }
$context = context_course::instance($courseid); $context = context_course::instance($courseid);
$canmanage = has_capability('moodle/grade:manage', $context); $canmanage = has_capability('moodle/grade:manage', $context);
$canmanageletters = has_capability('moodle/grade:manageletters', $context); $canmanageletters = has_capability('moodle/grade:manageletters', $context);
if ($canmanage || $canmanageletters) { if ($canmanage || $canmanageletters) {
// Redirect to system context when report is accessed from admin settings MDL-31633
if ($context->instanceid == $SITE->id) {
$param = array('edit' => 1);
} else {
$param = array('edit' => 1,'id' => $context->id);
}
self::$letterinfo = array( self::$letterinfo = array(
'view' => new grade_plugin_info('view', new moodle_url('/grade/edit/letter/index.php', array('id'=>$context->id)), get_string('view')), 'view' => new grade_plugin_info('view', new moodle_url('/grade/edit/letter/index.php', array('id'=>$context->id)), get_string('view')),
'edit' => new grade_plugin_info('edit', new moodle_url('/grade/edit/letter/index.php', array('edit'=>1,'id'=>$context->id)), get_string('edit')) 'edit' => new grade_plugin_info('edit', new moodle_url('/grade/edit/letter/index.php', $param), get_string('edit'))
); );
} else { } else {
self::$letterinfo = false; self::$letterinfo = false;
Expand Down

0 comments on commit a8dfc48

Please sign in to comment.