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

moodle · Oct 24, 2016 · c10cd18 · c10cd18
2 parents 0c6cf86 + 4ceed4d
commit c10cd18
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/completion/tests/externallib_test.php b/completion/tests/externallib_test.php
@@ -116,7 +116,7 @@ public function test_get_activities_completion_status() {
         $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 @@ public function test_get_course_completion_status() {
         $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);
 

diff --git a/lib/db/access.php b/lib/db/access.php
@@ -391,7 +391,6 @@
         'captype' => 'read',
         'contextlevel' => CONTEXT_COURSE,
         'archetypes' => array(
-            'teacher' => CAP_ALLOW,
             'editingteacher' => CAP_ALLOW,
             'manager' => CAP_ALLOW
         )

diff --git a/mod/assign/tests/locallib_test.php b/mod/assign/tests/locallib_test.php
@@ -929,7 +929,7 @@ public function test_submit_to_default_group() {
         $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 @@ public function test_count_submissions() {
         $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));
 

diff --git a/version.php b/version.php
@@ -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.