moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'patch_view_anon_event_MDL-66213' of git://github.com/Dave-B/moodle

Browse source
This commit is contained in:
Sara Arjona 2020-01-13 10:10:10 +01:00
commit e3f29b01c0
5 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lang/en/role.php
View file

@ -423,6 +423,7 @@ $string['site:restore'] = 'Restore courses';
$string['site:sendmessage'] = 'Send messages to any user'; $string['site:sendmessage'] = 'Send messages to any user';
$string['site:trustcontent'] = 'Trust submitted content'; $string['site:trustcontent'] = 'Trust submitted content';
$string['site:uploadusers'] = 'Upload new users from file'; $string['site:uploadusers'] = 'Upload new users from file';
$string['site:viewanonymousevents'] = 'View anonymous events in reports';
$string['site:viewfullnames'] = 'Always see full names of users'; $string['site:viewfullnames'] = 'Always see full names of users';
$string['site:viewparticipants'] = 'View participants'; $string['site:viewparticipants'] = 'View participants';
$string['site:viewreports'] = 'View reports'; $string['site:viewreports'] = 'View reports';

11
lib/db/access.php
View file

@ -391,6 +391,17 @@ $capabilities = array(
) )
), ),
'moodle/site:viewanonymousevents' => array(
'captype' => 'read',
'contextlevel' => CONTEXT_MODULE,
'archetypes' => array(
'teacher' => CAP_PROHIBIT,
'editingteacher' => CAP_PROHIBIT,
'manager' => CAP_ALLOW
)
),
'moodle/site:viewfullnames' => array( 'moodle/site:viewfullnames' => array(
'captype' => 'read', 'captype' => 'read',

9
report/log/classes/table_log.php
View file

@ -504,7 +504,14 @@ class report_log_table_log extends table_sql {
if (!($this->filterparams->logreader instanceof logstore_legacy\log\store)) { if (!($this->filterparams->logreader instanceof logstore_legacy\log\store)) {
// Filter out anonymous actions, this is N/A for legacy log because it never stores them. // Filter out anonymous actions, this is N/A for legacy log because it never stores them.
$joins[] = "anonymous = 0"; if ($this->filterparams->modid) {
$context = context_module::instance($this->filterparams->modid);
} else {
$context = context_course::instance($this->filterparams->courseid);
}
if (!has_capability('moodle/site:viewanonymousevents', $context)) {
$joins[] = "anonymous = 0";
}
} }
$selector = implode(' AND ', $joins); $selector = implode(' AND ', $joins);

6
report/loglive/classes/renderable.php
View file

@ -180,7 +180,11 @@ class report_loglive_renderable implements renderable {
$filter->logreader = $readers[$this->selectedlogreader]; $filter->logreader = $readers[$this->selectedlogreader];
$filter->date = $this->date; $filter->date = $this->date;
$filter->orderby = $this->order; $filter->orderby = $this->order;
$filter->anonymous = 0;
$context = context_course::instance($filter->courseid);
if (!has_capability('moodle/site:viewanonymousevents', $context)) {
$filter->anonymous = 0;
}
return $filter; return $filter;
} }

2
version.php
View file

@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die(); defined('MOODLE_INTERNAL') || die();
$version = 2020010900.00; // YYYYMMDD = weekly release date of this DEV branch. $version = 2020010900.01; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches. // RR = release increments - 00 in DEV branches.
// .XX = incremental changes. // .XX = incremental changes.
$release = '3.9dev (Build: 20200109)'; // Human-friendly version name $release = '3.9dev (Build: 20200109)'; // Human-friendly version name