projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7821133)
CRM-14700 - Fix membershipType visibility in schema and tests
authorColeman Watts <coleman@civicrm.org>
Tue, 20 May 2014 20:38:54 +0000 (21:38 +0100)
committerColeman Watts <coleman@civicrm.org>
Tue, 20 May 2014 20:38:54 +0000 (21:38 +0100)
tests/phpunit/CiviTest/CiviUnitTestCase.php patch | blob | blame | history
xml/schema/Member/MembershipType.xml patch | blob | blame | history

diff --git a/tests/phpunit/CiviTest/CiviUnitTestCase.php b/tests/phpunit/CiviTest/CiviUnitTestCase.php
index 0096187ebf9aa229c6174a543e93d1b86081fc69..5655e1951ddb544584f4adb5add60631c6f919d3 100644 (file)
--- a/tests/phpunit/CiviTest/CiviUnitTestCase.php
+++ b/tests/phpunit/CiviTest/CiviUnitTestCase.php
@@ -1027,7 +1027,7 @@ class CiviUnitTestCase extends PHPUnit_Extensions_Database_TestCase {
       'financial_type_id' => 1,
       'is_active' => 1,
       'sequential' => 1,
-      'visibility' => 1,
+      'visibility' => 'Public',
     ), $params);
 
     $result = $this->callAPISuccess('MembershipType', 'Create', $params);
diff --git a/xml/schema/Member/MembershipType.xml b/xml/schema/Member/MembershipType.xml
index ffbab31e17313c54fabd87c3f9a064b521e6f407..5a59a92586d071633c4daba0f06a6d0c4a935718 100644 (file)
--- a/xml/schema/Member/MembershipType.xml
+++ b/xml/schema/Member/MembershipType.xml
@@ -183,7 +183,7 @@
     <length>64</length>
     <add>1.5</add>
     <pseudoconstant>
-      <optionGroupName>visibility</optionGroupName>
+      <callback>CRM_Core_SelectValues::memberVisibility</callback>
     </pseudoconstant>
     <html>
       <type>Select</type>