projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-04-04-00-08-28
[civicrm-core.git]
/
xml
/
schema
/
Member
/
MembershipType.xml
diff --git
a/xml/schema/Member/MembershipType.xml
b/xml/schema/Member/MembershipType.xml
index 9b06a592dcb2c4460b60c80872b3a8bd1ea93033..ffbab31e17313c54fabd87c3f9a064b521e6f407 100644
(file)
--- a/
xml/schema/Member/MembershipType.xml
+++ b/
xml/schema/Member/MembershipType.xml
@@
-45,9
+45,11
@@
<field>
<name>description</name>
<type>varchar</type>
<field>
<name>description</name>
<type>varchar</type>
- <htmlType>textarea</htmlType>
- <rows>6</rows>
- <cols>50</cols>
+ <html>
+ <type>TextArea</type>
+ <rows>6</rows>
+ <cols>50</cols>
+ </html>
<length>255</length>
<localizable>true</localizable>
<comment>Description of Membership Type</comment>
<length>255</length>
<localizable>true</localizable>
<comment>Description of Membership Type</comment>
@@
-104,10
+106,16
@@
</field>
<field>
<name>duration_unit</name>
</field>
<field>
<name>duration_unit</name>
- <type>
enum
</type>
- <
values>day, month, year, lifetime</values
>
+ <type>
varchar
</type>
+ <
length>8</length
>
<comment>Unit in which membership period is expressed.</comment>
<comment>Unit in which membership period is expressed.</comment>
+ <pseudoconstant>
+ <callback>CRM_Core_SelectValues::membershipTypeUnitList</callback>
+ </pseudoconstant>
<add>1.5</add>
<add>1.5</add>
+ <html>
+ <type>Select</type>
+ </html>
</field>
<field>
<name>duration_interval</name>
</field>
<field>
<name>duration_interval</name>
@@
-117,9
+125,12
@@
</field>
<field>
<name>period_type</name>
</field>
<field>
<name>period_type</name>
- <type>
enum
</type>
- <
values>rolling, fixed</values
>
+ <type>
varchar
</type>
+ <
length>8</length
>
<comment>Rolling membership period starts on signup date. Fixed membership periods start on fixed_period_start_day.</comment>
<comment>Rolling membership period starts on signup date. Fixed membership periods start on fixed_period_start_day.</comment>
+ <pseudoconstant>
+ <callback>CRM_Core_SelectValues::periodType</callback>
+ </pseudoconstant>
<add>1.5</add>
</field>
<field>
<add>1.5</add>
</field>
<field>
@@
-174,6
+185,9
@@
<pseudoconstant>
<optionGroupName>visibility</optionGroupName>
</pseudoconstant>
<pseudoconstant>
<optionGroupName>visibility</optionGroupName>
</pseudoconstant>
+ <html>
+ <type>Select</type>
+ </html>
</field>
<field>
<name>weight</name>
</field>
<field>
<name>weight</name>
@@
-184,9
+198,11
@@
<field>
<name>receipt_text_signup</name>
<type>varchar</type>
<field>
<name>receipt_text_signup</name>
<type>varchar</type>
- <htmlType>textarea</htmlType>
- <rows>6</rows>
- <cols>50</cols>
+ <html>
+ <type>TextArea</type>
+ <rows>6</rows>
+ <cols>50</cols>
+ </html>
<length>255</length>
<comment>Receipt Text for membership signup</comment>
<add>2.0</add>
<length>255</length>
<comment>Receipt Text for membership signup</comment>
<add>2.0</add>
@@
-194,9
+210,11
@@
<field>
<name>receipt_text_renewal</name>
<type>varchar</type>
<field>
<name>receipt_text_renewal</name>
<type>varchar</type>
- <htmlType>textarea</htmlType>
- <rows>6</rows>
- <cols>50</cols>
+ <html>
+ <type>TextArea</type>
+ <rows>6</rows>
+ <cols>50</cols>
+ </html>
<length>255</length>
<comment>Receipt Text for membership renewal</comment>
<add>2.0</add>
<length>255</length>
<comment>Receipt Text for membership renewal</comment>
<add>2.0</add>