projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 79cffaf b2779b6)
Merge pull request #2495 from civicrm/4.4
authorcolemanw <coleman@civicrm.org>
Sun, 9 Feb 2014 01:22:06 +0000 (17:22 -0800)
committercolemanw <coleman@civicrm.org>
Sun, 9 Feb 2014 01:22:06 +0000 (17:22 -0800)
Merge branch 4.4 into master

1  2 
xml/schema/Contribute/ContributionPage.xml patch | diff1 | diff2 | blob | history
xml/schema/Event/Event.xml patch | diff1 | diff2 | blob | history
xml/schema/Event/EventPage.xml patch | diff1 | diff2 | blob | history

diff --cc xml/schema/Event/Event.xml
index e71e2cb041ba8136ab95965cc83cb88a68aaf9a8,8eb7c8895f8651b2a17b1de26e4c4c1fdb6da405..8c9101f3424cc626c7e91f0deea3629b9823229c
--- 1/xml/schema/Event/Event.xml
--- 2/xml/schema/Event/Event.xml
+++ b/xml/schema/Event/Event.xml
@@@ -84,13 -74,13 +84,16 @@@
      <name>participant_listing_id</name>
      <type>int unsigned</type>
      <uniqueName>participant_listing_id</uniqueName>
-     <title>Participant Listing ID</title>
+     <title>Participant Listing</title>
      <default>0</default>
+     <pseudoconstant>
+       <optionGroupName>participant_listing</optionGroupName>
+     </pseudoconstant>
      <comment>Should we expose the participant list? Implicit FK to civicrm_option_value where option_group = participant_listing.</comment>
      <add>2.0</add>
 +    <html>
 +      <type>Select</type>
 +    </html>
    </field>
    <index>
      <name>index_participant_listing_id</name>
@@@ -329,11 -270,11 +332,14 @@@
      <import>true</import>
      <type>int unsigned</type>
      <default>1</default>
+     <pseudoconstant>
+       <optionGroupName>participant_role</optionGroupName>
+     </pseudoconstant>
      <comment>Participant role ID. Implicit FK to civicrm_option_value where option_group = participant_role.</comment>
      <add>2.0</add>
 +    <html>
 +      <type>Select</type>
 +    </html>
    </field>
    <field>
      <name>intro_text</name>
diff --cc xml/schema/Event/EventPage.xml
Simple merge