mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 05:58:34 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'w13_MDL-44107_m27_canview' of git://github.com/skodak/moodle

Browse Source
This commit is contained in:
Marina Glancy 2014-03-25 17:10:27 +08:00
commit daf7b64ef7
5 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/classes/event/base.php
View File

@ -304,12 +304,18 @@ abstract class base implements \IteratorAggregate {
}
/**
* Define whether a user can view the event or not.
* This method was originally intended for granular
* access control on the event level, unfortunately
* the proper implementation would be too expensive
* in many cases.
*
* @deprecated since 2.7
*
* @param int|\stdClass $user_or_id ID of the user.
* @return bool True if the user can view the event, false otherwise.
*/
public function can_view($user_or_id = null) {
debugging('can_view() method is deprecated, use anonymous flag instead if necessary.', DEBUG_DEVELOPER);
return is_siteadmin($user_or_id);
}

3
mod/feedback/classes/event/course_module_viewed.php
View File

@ -53,11 +53,14 @@ class course_module_viewed extends \core\event\course_module_viewed {
/**
* Define whether a user can view the event or not. Make sure no one except admin can see details of an anonymous response.
*
* @deprecated since 2.7
*
* @param int|\stdClass $userorid ID of the user.
* @return bool True if the user can view the event, false otherwise.
*/
public function can_view($userorid = null) {
global $USER;
debugging('can_view() method is deprecated, use anonymous flag instead if necessary.', DEBUG_DEVELOPER);
if (empty($userorid)) {
$userorid = $USER;

3
mod/feedback/classes/event/response_deleted.php
View File

@ -84,11 +84,14 @@ class response_deleted extends \core\event\base {
/**
* Define whether a user can view the event or not. Make sure no one except admin can see details of an anonymous response.
*
* @deprecated since 2.7
*
* @param int|\stdClass $userorid ID of the user.
* @return bool True if the user can view the event, false otherwise.
*/
public function can_view($userorid = null) {
global $USER;
debugging('can_view() method is deprecated, use anonymous flag instead if necessary.', DEBUG_DEVELOPER);
if (empty($userorid)) {
$userorid = $USER;

3
mod/feedback/classes/event/response_submitted.php
View File

@ -106,11 +106,14 @@ class response_submitted extends \core\event\base {
/**
* Define whether a user can view the event or not. Make sure no one except admin can see details of an anonymous response.
*
* @deprecated since 2.7
*
* @param int|\stdClass $userorid ID of the user.
* @return bool True if the user can view the event, false otherwise.
*/
public function can_view($userorid = null) {
global $USER;
debugging('can_view() method is deprecated, use anonymous flag instead if necessary.', DEBUG_DEVELOPER);
if (empty($userorid)) {
$userorid = $USER;

8
mod/feedback/tests/events_test.php
View File

@ -135,8 +135,10 @@ class mod_feedback_events_testcase extends advanced_testcase {
// Test can_view() .
$this->setUser($this->eventuser);
$this->assertFalse($event->can_view());
$this->assertDebuggingCalled();
$this->setAdminUser();
$this->assertTrue($event->can_view());
$this->assertDebuggingCalled();
// Create a response, with anonymous set to no and test can_view().
$response = new stdClass();
@ -162,8 +164,10 @@ class mod_feedback_events_testcase extends advanced_testcase {
// Test can_view() .
$this->setUser($this->eventuser);
$this->assertTrue($event->can_view());
$this->assertDebuggingCalled();
$this->setAdminUser();
$this->assertTrue($event->can_view());
$this->assertDebuggingCalled();
$this->assertEventContextNotUsed($event);
}
@ -228,8 +232,10 @@ class mod_feedback_events_testcase extends advanced_testcase {
$this->assertEquals(FEEDBACK_ANONYMOUS_YES, $event->other['anonymous']);
$this->setUser($this->eventuser);
$this->assertFalse($event->can_view());
$this->assertDebuggingCalled();
$this->setAdminUser();
$this->assertTrue($event->can_view());
$this->assertDebuggingCalled();
// Test legacy data.
$this->assertEventLegacyLogData(null, $event);
@ -262,8 +268,10 @@ class mod_feedback_events_testcase extends advanced_testcase {
// Test can_view().
$this->assertTrue($event->can_view());
$this->assertDebuggingCalled();
$this->setAdminUser();
$this->assertTrue($event->can_view());
$this->assertDebuggingCalled();
$this->assertEventContextNotUsed($event);
}