Merge branch 'MDL-59371-master' of git://github.com/lameze/moodle

This commit is contained in:
Andrew Nicols 2017-07-17 10:23:06 +08:00
commit cdbfc8d3ef
4 changed files with 51 additions and 4 deletions

View File

@ -31,8 +31,7 @@ $capabilities = array(
'captype' => 'read',
'contextlevel' => CONTEXT_COURSE,
'archetypes' => array(
'student' => CAP_ALLOW,
'manager' => CAP_ALLOW
'user' => CAP_ALLOW
)
)

View File

@ -0,0 +1,48 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Grade overview report upgrade steps.
*
* @package gradereport_overview
* @copyright 2017 Simey Lameze <simey@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
/**
* Function to upgrade grade overview report.
*
* @param int $oldversion the version we are upgrading from
* @return bool result
*/
function xmldb_gradereport_overview_upgrade($oldversion) {
if ($oldversion < 2017051501) {
$context = context_system::instance();
$capability = 'gradereport/overview:view';
// Now allow authenticated user role to access that report.
$authenticateduserroles = get_archetype_roles('user');
foreach ($authenticateduserroles as $roleid => $notused) {
assign_capability($capability, CAP_ALLOW, $roleid, $context->id);
}
upgrade_plugin_savepoint(true, 2017051501, 'gradereport', 'overview');
}
return true;
}

View File

@ -468,7 +468,7 @@ function gradereport_overview_myprofile_navigation(core_user\output\myprofile\tr
$usercontext = context_user::instance($user->id);
$coursecontext = context_course::instance($course->id);
if (grade_report_overview::check_access($systemcontext, $coursecontext, $usercontext, $course, $user->id)) {
$url = new moodle_url('/grade/report/overview/index.php', array('userid' => $user->id));
$url = new moodle_url('/grade/report/overview/index.php', array('userid' => $user->id, 'id' => $course->id));
$node = new core_user\output\myprofile\node('reports', 'grades', get_string('gradesoverview', 'gradereport_overview'),
null, $url);
$tree->add_node($node);

View File

@ -24,6 +24,6 @@
defined('MOODLE_INTERNAL') || die();
$plugin->version = 2017051500; // The current plugin version (Date: YYYYMMDDXX)
$plugin->version = 2017051501; // The current plugin version (Date: YYYYMMDDXX)
$plugin->requires = 2017050500; // Requires this Moodle version
$plugin->component = 'gradereport_overview'; // Full name of the plugin (used for diagnostics)