From 5f3decb5cb76408c4e7e4ec3a80096175f3e4477 Mon Sep 17 00:00:00 2001
From: Zachary Durber <zdurber@gmail.com>
Date: Mon, 6 Oct 2014 14:38:43 +0800
Subject: [PATCH] MDL-18229 gradebook: Additional fixes.

Random foo left in options. (test code)
Allowed editing link for Course total.
Fixes based on Apu's review.
---
 grade/report/grader/lib.php                                | 2 +-
 grade/report/singleview/lang/en/gradereport_singleview.php | 4 ++--
 grade/report/singleview/lib.php                            | 4 +++-
 grade/report/singleview/screens/grade/lib.php              | 1 -
 grade/report/singleview/screens/user/lib.php               | 2 +-
 grade/report/singleview/tests/behat/singleview.feature     | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index eece138a0f5..e7d75f87485 100644
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -816,7 +816,7 @@ class grade_report_grader extends grade_report {
 
                     $singleview = '';
                     if (has_capability('gradereport/singleview:view', $this->context) &&
-                        preg_match('/^item/', $type)) {
+                        !preg_match('/^category/', $type)) {
                         $url = new moodle_url('/grade/report/singleview/index.php', array(
                             'id' => $this->course->id,
                             'item' => 'grade',
diff --git a/grade/report/singleview/lang/en/gradereport_singleview.php b/grade/report/singleview/lang/en/gradereport_singleview.php
index 0058db8fa77..429e6f87863 100755
--- a/grade/report/singleview/lang/en/gradereport_singleview.php
+++ b/grade/report/singleview/lang/en/gradereport_singleview.php
@@ -38,11 +38,11 @@ $string['feedbackfor'] = 'Feedback for {$a}';
 $string['filtergrades'] = 'Show grades for {$a}.';
 $string['gradefor'] = 'Grade for {$a}';
 $string['noscreens'] = 'Could not find a suitable Single view screen.';
-$string['notallowed'] = 'Not allowed to quick edit this item';
+$string['notallowed'] = 'Not allowed to use Singleview on this item.';
 $string['notvalid'] = 'Not a valid Single view screen: {$a}';
 $string['override'] = 'Override';
 $string['overrideall'] = 'Override all grades';
 $string['overridefor'] = 'Override for {$a}';
 $string['overridenone'] = 'Override no grades';
 $string['pluginname'] = 'Single view';
-$string['singleview:view'] = 'View the '.$string['pluginname'].' report';
+$string['singleview:view'] = 'View report';
diff --git a/grade/report/singleview/lib.php b/grade/report/singleview/lib.php
index fac070d905f..798729e636d 100755
--- a/grade/report/singleview/lib.php
+++ b/grade/report/singleview/lib.php
@@ -75,7 +75,9 @@ class gradereport_singleview extends grade_report {
     }
 
     function process_data($data) {
-        return $this->screen->process($data);
+        if (has_capability('moodle/grade:manage', $this->context)) {
+            return $this->screen->process($data);
+        }
     }
 
     function process_action($target, $action) {
diff --git a/grade/report/singleview/screens/grade/lib.php b/grade/report/singleview/screens/grade/lib.php
index 147817e8f47..b403a06cdda 100644
--- a/grade/report/singleview/screens/grade/lib.php
+++ b/grade/report/singleview/screens/grade/lib.php
@@ -65,7 +65,6 @@ class gradereport_singleview_grade extends gradereport_singleview_tablelike
             }
         }, $this->items);
 
-        $options['name']= 'foo';
         return $options;
     }
 
diff --git a/grade/report/singleview/screens/user/lib.php b/grade/report/singleview/screens/user/lib.php
index 63349eee3b8..513dfa24784 100644
--- a/grade/report/singleview/screens/user/lib.php
+++ b/grade/report/singleview/screens/user/lib.php
@@ -113,7 +113,7 @@ class gradereport_singleview_user extends gradereport_singleview_tablelike imple
         if (isset($item->cmid)) {
             $realuserid = $item->cmid;
         }
-        $url = new moodle_url("/mod/$item->itemmodule/view.php", array('id' => $realuserid));
+        $url = new moodle_url('/mod/' . $item->itemmodule . '/view.php', array('id' => $realuserid));
         $iconstring = get_string('filtergrades', 'gradereport_singleview', $item->get_name());
         $grade->label = $item->get_name();
 
diff --git a/grade/report/singleview/tests/behat/singleview.feature b/grade/report/singleview/tests/behat/singleview.feature
index e215ffdcd10..6ea012463fd 100644
--- a/grade/report/singleview/tests/behat/singleview.feature
+++ b/grade/report/singleview/tests/behat/singleview.feature
@@ -64,7 +64,7 @@ Feature: We can use Single view
         | 12.05 |
         | Excluded |
 
-  Scenario: Single view quick links work on grade report.
+  Scenario: Single view links work on grade report.
     Given I follow "Single view for Test assignment one"
     Then I should see "Test assignment one"
     Then I follow "Grader report"