Merge branch 'MDL-80973-403' of https://github.com/jleyva/moodle into…

… MOODLE_403_STABLE
PhMemmel · May 30, 2024 · 5b39c49 · 5b39c49
2 parents 9459034 + 770947d
commit 5b39c49
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/admin/tool/policy/classes/api.php b/admin/tool/policy/classes/api.php
@@ -1034,7 +1034,9 @@ public static function update_policyagreed($user = null) {
             }
         }
 
-        if ($user->policyagreed != $allresponded) {
+        // MDL-80973: At this point, the policyagreed value in DB could be 0 but $user->policyagreed could be 1 (as it was copied from $USER).
+        // So we need to ensure that the value in DB is set true if all policies were responded.
+        if ($user->policyagreed != $allresponded || $allresponded) {
             $user->policyagreed = $allresponded;
             $DB->set_field('user', 'policyagreed', $allresponded, ['id' => $user->id]);
         }

diff --git a/admin/tool/policy/tests/api_test.php b/admin/tool/policy/tests/api_test.php
@@ -579,7 +579,7 @@ public function test_fix_revision_values() {
      * Test that accepting policy updates 'policyagreed'
      */
     public function test_accept_policies() {
-        global $DB;
+        global $DB, $USER;
         $this->resetAfterTest();
         $this->setAdminUser();
 
@@ -623,6 +623,12 @@ public function test_accept_policies() {
 
         api::accept_policies([$policy3->id]);
         $this->assertEquals(1, $DB->get_field('user', 'policyagreed', ['id' => $user2->id]));
+
+        // Ensure policies are always accepted when all are responded regardless the $USER->policyagreed value.
+        $USER->policyagreed = 1;
+        $DB->set_field('user', 'policyagreed', 0, ['id' => $user2->id]);
+        api::accept_policies([$policy3->id]);
+        $this->assertEquals(1, $DB->get_field('user', 'policyagreed', ['id' => $user2->id]));
     }
 
     /**