Merge pull request civicrm#10839 from MegaphoneJon/CRM-21049

CRM-21049 - Allow creating relationship types with no contact type specified
seamuslee001 · Aug 22, 2017 · 8af1022 · 8af1022
2 parents 1f8eeb3 + e14ba58
commit 8af1022
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 16 deletions.
diff --git a/api/v3/RelationshipType.php b/api/v3/RelationshipType.php
@@ -77,8 +77,6 @@ function civicrm_api3_relationship_type_create($params) {
  *   Array of parameters determined by getfields.
  */
 function _civicrm_api3_relationship_type_create_spec(&$params) {
-  $params['contact_type_a']['api.required'] = 1;
-  $params['contact_type_b']['api.required'] = 1;
   $params['name_a_b']['api.required'] = 1;
   $params['name_b_a']['api.required'] = 1;
   $params['is_active']['api.default'] = 1;

diff --git a/tests/phpunit/api/v3/RelationshipTypeTest.php b/tests/phpunit/api/v3/RelationshipTypeTest.php
@@ -93,19 +93,6 @@ public function testRelationshipTypeCreateWithoutName() {
     );
   }
 
-  /**
-   * Check with no contact type.
-   */
-  public function testRelationshipTypeCreateWithoutContactType() {
-    $relTypeParams = array(
-      'name_a_b' => 'Relation 1 without contact type',
-      'name_b_a' => 'Relation 2 without contact type',
-    );
-    $result = $this->callAPIFailure('relationship_type', 'create', $relTypeParams,
-      'Mandatory key(s) missing from params array: contact_type_a, contact_type_b'
-    );
-  }
-
   /**
    * Create relationship type.
    */
@@ -190,7 +177,7 @@ public function testRelationshipTypeDelete() {
   public function testRelationshipTypeUpdateEmpty() {
     $params = array();
     $result = $this->callAPIFailure('relationship_type', 'create', $params);
-    $this->assertEquals($result['error_message'], 'Mandatory key(s) missing from params array: name_a_b, name_b_a, contact_type_a, contact_type_b');
+    $this->assertEquals($result['error_message'], 'Mandatory key(s) missing from params array: name_a_b, name_b_a');
   }
 
   /**