mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-12 03:52:16 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-62056-master' of git://github.com/sarjona/moodle

Browse Source
This commit is contained in:
David Monllao 2018-05-09 15:20:46 +02:00 committed by Jun Pataleta
commit 337673949b
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
admin/tool/policy/classes/output/page_viewdoc.php
View File

@ -155,12 +155,13 @@ class page_viewdoc implements renderable, templatable {
$data = (object) [
'pluginbaseurl' => (new moodle_url('/admin/tool/policy'))->out(false),
'returnurl' => $this->returnurl ? (new moodle_url($this->returnurl))->out(false) : null,
'editurl' => ($this->manage && $this->policy->status != policy_version::STATUS_ARCHIVED) ?
(new moodle_url('/admin/tool/policy/editpolicydoc.php',
['policyid' => $this->policy->policyid, 'versionid' => $this->policy->id]))->out(false) : null,
'numpolicy' => $this->numpolicy ? : null,
'totalpolicies' => $this->totalpolicies ? : null,
];
if ($this->manage && $this->policy->status != policy_version::STATUS_ARCHIVED) {
$paramsurl = ['policyid' => $this->policy->policyid, 'versionid' => $this->policy->id];
$data->editurl = (new moodle_url('/admin/tool/policy/editpolicydoc.php', $paramsurl))->out(false);
}
$data->policy = clone($this->policy);

16
admin/tool/policy/tests/privacy_provider_test.php
View File

@ -112,7 +112,7 @@ class tool_policy_privacy_provider_testcase extends \core_privacy\tests\provider
// Create policies and agree to them as admin.
$this->setAdminUser();
$admin = fullclone($USER);
$admincontext = context_user::instance($admin->id);
$admincontext = \context_user::instance($admin->id);
$CFG->sitepolicyhandler = 'tool_policy';
$policy1 = $this->add_policy();
api::make_current($policy1->get('id'));
@ -122,7 +122,7 @@ class tool_policy_privacy_provider_testcase extends \core_privacy\tests\provider
// Agree to the policies for oneself.
$this->setUser($this->user);
$usercontext = context_user::instance($this->user->id);
$usercontext = \context_user::instance($this->user->id);
api::accept_policies([$policy1->get('id'), $policy2->get('id')]);
// Request export for this user.
@ -139,7 +139,7 @@ class tool_policy_privacy_provider_testcase extends \core_privacy\tests\provider
$writer = writer::with_context($usercontext);
$datauser = $writer->get_related_data([get_string('userpoliciesagreements', 'tool_policy'), $this->user->id]);
$this->assertEquals(2, count($datauser));
$this->assertCount(2, (array) $datauser);
$this->assertEquals($policy1->get('name'), $datauser['policyagreement-'.$policy1->get('id')]->name);
$this->assertEquals($this->user->id, $datauser['policyagreement-'.$policy1->get('id')]->usermodified);
$this->assertEquals($policy2->get('name'), $datauser['policyagreement-'.$policy2->get('id')]->name);
@ -159,8 +159,8 @@ class tool_policy_privacy_provider_testcase extends \core_privacy\tests\provider
api::make_current($policy2->get('id'));
// Agree to the policies for oneself and for another user.
$usercontext = context_user::instance($this->user->id);
$admincontext = context_user::instance($USER->id);
$usercontext = \context_user::instance($this->user->id);
$admincontext = \context_user::instance($USER->id);
api::accept_policies([$policy1->get('id'), $policy2->get('id')]);
api::accept_policies([$policy1->get('id'), $policy2->get('id')], $this->user->id, 'Mynote');
@ -181,7 +181,7 @@ class tool_policy_privacy_provider_testcase extends \core_privacy\tests\provider
$writer = writer::with_context($usercontext);
$datauser = $writer->get_related_data([get_string('userpoliciesagreements', 'tool_policy'), $this->user->id]);
$this->assertEquals(2, count($datauser));
$this->assertCount(2, (array) $datauser);
$this->assertEquals($policy1->get('name'), $datauser['policyagreement-'.$policy1->get('id')]->name);
$this->assertEquals($admin->id, $datauser['policyagreement-'.$policy1->get('id')]->usermodified);
$this->assertEquals('Mynote', $datauser['policyagreement-'.$policy1->get('id')]->note);
@ -200,7 +200,7 @@ class tool_policy_privacy_provider_testcase extends \core_privacy\tests\provider
// Admin can see all four agreements.
$writer = writer::with_context($admincontext);
$dataadmin = $writer->get_related_data([get_string('userpoliciesagreements', 'tool_policy'), $admin->id]);
$this->assertEquals(2, count($dataadmin));
$this->assertCount(2, (array) $dataadmin);
$this->assertEquals($policy1->get('name'), $dataadmin['policyagreement-'.$policy1->get('id')]->name);
$this->assertEquals($admin->id, $dataadmin['policyagreement-'.$policy1->get('id')]->usermodified);
$this->assertEquals($policy2->get('name'), $dataadmin['policyagreement-'.$policy2->get('id')]->name);
@ -208,7 +208,7 @@ class tool_policy_privacy_provider_testcase extends \core_privacy\tests\provider
$writer = writer::with_context($usercontext);
$datauser = $writer->get_related_data([get_string('userpoliciesagreements', 'tool_policy'), $this->user->id]);
$this->assertEquals(2, count($datauser));
$this->assertCount(2, (array) $datauser);
$this->assertEquals($policy1->get('name'), $datauser['policyagreement-'.$policy1->get('id')]->name);
$this->assertEquals($admin->id, $datauser['policyagreement-'.$policy1->get('id')]->usermodified);
$this->assertEquals('Mynote', $datauser['policyagreement-'.$policy1->get('id')]->note);