mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-21 08:00:37 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-55981-master' of git://github.com/andrewnicols/moodle

Browse Source
This commit is contained in:
David Monllao 2016-10-24 13:20:42 +08:00
commit c10cd185a9
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
completion/tests/externallib_test.php
View File

@ -116,7 +116,7 @@ class core_completion_externallib_testcase extends externallib_advanced_testcase
$cmforum = get_coursemodule_from_id('forum', $forum->cmid);
$studentrole = $DB->get_record('role', array('shortname' => 'student'));
$teacherrole = $DB->get_record('role', array('shortname' => 'teacher'));
$teacherrole = $DB->get_record('role', array('shortname' => 'editingteacher'));
$this->getDataGenerator()->enrol_user($student->id, $course->id, $studentrole->id);
$this->getDataGenerator()->enrol_user($teacher->id, $course->id, $teacherrole->id);
@ -220,7 +220,7 @@ class core_completion_externallib_testcase extends externallib_advanced_testcase
$cmforum = get_coursemodule_from_id('forum', $forum->cmid);
$studentrole = $DB->get_record('role', array('shortname' => 'student'));
$teacherrole = $DB->get_record('role', array('shortname' => 'teacher'));
$teacherrole = $DB->get_record('role', array('shortname' => 'editingteacher'));
$this->getDataGenerator()->enrol_user($student->id, $course->id, $studentrole->id);
$this->getDataGenerator()->enrol_user($teacher->id, $course->id, $teacherrole->id);

1
lib/db/access.php
View File

@ -391,7 +391,6 @@ $capabilities = array(
'captype' => 'read',
'contextlevel' => CONTEXT_COURSE,
'archetypes' => array(
'teacher' => CAP_ALLOW,
'editingteacher' => CAP_ALLOW,
'manager' => CAP_ALLOW
)

4
mod/assign/tests/locallib_test.php
View File

@ -929,7 +929,7 @@ class mod_assign_locallib_testcase extends mod_assign_base_testcase {
$this->assertEmpty($notices, 'No errors on save submission');
// Set active groups to all groups.
$this->setUser($this->teachers[0]);
$this->setUser($this->editingteachers[0]);
$SESSION->activegroup[$this->course->id]['aag'][0] = 0;
$this->assertEquals(1, $assign->count_submissions_with_status(ASSIGN_SUBMISSION_STATUS_SUBMITTED));
@ -1055,7 +1055,7 @@ class mod_assign_locallib_testcase extends mod_assign_base_testcase {
$this->assertEquals(1, $assign2->count_submissions_with_status(ASSIGN_SUBMISSION_STATUS_SUBMITTED));
// Set active groups to all groups.
$this->setUser($this->teachers[0]);
$this->setUser($this->editingteachers[0]);
$SESSION->activegroup[$this->course->id]['aag'][0] = 0;
$this->assertEquals(1, $assign2->count_submissions_with_status(ASSIGN_SUBMISSION_STATUS_SUBMITTED));

2
version.php
View File

@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2016102000.00; // YYYYMMDD = weekly release date of this DEV branch.
$version = 2016102100.00; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.