Merge pull request #23866 from civicrm/5.51

5.51 to master
civicrm · Jun 22, 2022 · c558802 · c558802
2 parents 3786535 + f228e2c
commit c558802
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php
@@ -1321,7 +1321,7 @@ public static function processOnBehalfOrganization(&$behalfOrganization, &$conta
         \Civi\Api4\Relationship::create(FALSE)
           ->addValue('contact_id_a', $contactID)
           ->addValue('contact_id_b', $orgID)
-          ->addValue('relationship_type_id', $relTypeId = CRM_Contact_BAO_RelationshipType::getEmployeeRelationshipTypeID())
+          ->addValue('relationship_type_id', CRM_Contact_BAO_RelationshipType::getEmployeeRelationshipTypeID())
           ->addValue('is_permission_a_b:name', 'View and update')
           ->execute();
       }

diff --git a/CRM/Core/SelectValues.php b/CRM/Core/SelectValues.php
@@ -1041,9 +1041,21 @@ public static function activityTextOptions() {
    */
   public static function getPermissionedRelationshipOptions() {
     return [
-      CRM_Contact_BAO_Relationship::NONE => ts('None'),
-      CRM_Contact_BAO_Relationship::VIEW => ts('View only'),
-      CRM_Contact_BAO_Relationship::EDIT => ts('View and update'),
+      [
+        'id' => CRM_Contact_BAO_Relationship::NONE,
+        'name' => 'None',
+        'label' => ts('None'),
+      ],
+      [
+        'id' => CRM_Contact_BAO_Relationship::VIEW,
+        'name' => 'View only',
+        'label' => ts('View only'),
+      ],
+      [
+        'id' => CRM_Contact_BAO_Relationship::EDIT,
+        'name' => 'View and update',
+        'label' => ts('View and update'),
+      ],
     ];
   }
 

diff --git a/tests/phpunit/api/v4/Entity/RelationshipTest.php b/tests/phpunit/api/v4/Entity/RelationshipTest.php
@@ -47,7 +47,7 @@ public function testRelCacheCount() {
     $this->assertCount(2, $cacheRecords);
   }
 
-  public function testRelCacheCalcFields() {
+  public function testRelationshipCacheCalcFields(): void {
     $c1 = Contact::create(FALSE)->addValue('first_name', '1')->execute()->first()['id'];
     $c2 = Contact::create(FALSE)->addValue('first_name', '2')->execute()->first()['id'];
     $relationship = Relationship::create(FALSE)
@@ -57,7 +57,7 @@ public function testRelCacheCalcFields() {
         'relationship_type_id' => 1,
         'description' => "Wow, we're related!",
         'is_permission_a_b' => 1,
-        'is_permission_b_a' => 2,
+        'is_permission_b_a:name' => 'View only',
       ])->execute()->first();
     $relationship = Relationship::get(FALSE)
       ->addWhere('id', '=', $relationship['id'])