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

Merge branch 'MDL-50091_28' of git://github.com/timhunt/moodle into MOODLE_28_STABLE

Browse Source
This commit is contained in:
Dan Poltawski
2015-06-22 12:06:53 +01:00
parent ad02c3adf0 8e3f31debe
commit 8ce0acb5de
2 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grade/report/lib.php
+1 -1
View File
@@ -55,7 +55,7 @@ abstract class grade_report {
/**
* The grade_tree object.
* @var object $gtree
* @var grade_tree $gtree
*/
public $gtree;
grade/report/singleview/classes/local/screen/user.php
-17
View File
@@ -111,12 +111,6 @@ class user extends tablelike implements selectable_items {
$params = array('courseid' => $this->courseid);
$seq = new grade_seq($this->courseid, true);
foreach ($seq->items as $key => $item) {
if (isset($item->itemmodule)) {
list($courseid, $cmid) = get_course_and_cm_from_instance($item->iteminstance, $item->itemmodule);
$seq->items[$key]->cmid = $cmid->id;
}
}
$this->items = array();
foreach ($seq->items as $itemid => $item) {
@@ -177,11 +171,6 @@ class user extends tablelike implements selectable_items {
$lockicon = $OUTPUT->pix_icon('t/locked', 'grade is locked');
}
$realmodid = '';
if (isset($item->cmid)) {
$realmodid = $item->cmid;
}
$iconstring = get_string('filtergrades', 'gradereport_singleview', $item->get_name());
// Create a fake gradetreeitem so we can call get_element_header().
@@ -198,12 +187,6 @@ class user extends tablelike implements selectable_items {
$itemlabel = $this->structure->get_element_header($gradetreeitem, true, false, false, false, true);
$grade->label = $item->get_name();
$itemlabel = $item->get_name();
if (!empty($realmodid)) {
$url = new moodle_url('/mod/' . $item->itemmodule . '/view.php', array('id' => $realmodid));
$itemlabel = html_writer::link($url, $item->get_name());
}
$line = array(
$OUTPUT->action_icon($this->format_link('grade', $item->id), new pix_icon('t/editstring', $iconstring)),
$this->format_icon($item) . $lockicon . $itemlabel,