projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bf76be7)
CRM-15168 more title metadate fixes (& some whitespace snuck in)
authorEileen McNaughton <eileen@fuzion.co.nz>
Fri, 22 Aug 2014 09:22:36 +0000 (21:22 +1200)
committerEileen McNaughton <eileen@fuzion.co.nz>
Fri, 22 Aug 2014 09:22:36 +0000 (21:22 +1200)
api/v3/Case.php patch | blob | blame | history
xml/schema/Contribute/Contribution.xml patch | blob | blame | history
xml/schema/Core/Phone.xml patch | blob | blame | history
xml/schema/Core/Setting.xml patch | blob | blame | history

diff --git a/api/v3/Case.php b/api/v3/Case.php
index 6cde101596e743010ebb58562a2b6e3b8ba9bdb3..a19d0f7d0920d4ebbb122d8607f72323fd0ec368 100644 (file)
--- a/api/v3/Case.php
+++ b/api/v3/Case.php
@@ -149,6 +149,7 @@ function _civicrm_api3_case_create_spec(&$params) {
   $params['status_id']['api.default'] = 1;
   $params['creator_id']['api.default'] = 'user_contact_id';
   $params['creator_id']['type'] = CRM_Utils_Type::T_INT;
+  $params['creator_id']['title'] = 'Case Created By';
   $params['start_date']['api.default'] = 'now';
   $params['medium_id'] = array(
     'name' => 'medium_id',
diff --git a/xml/schema/Contribute/Contribution.xml b/xml/schema/Contribute/Contribution.xml
index b74263329ec44e07ae12a2c14bbff859ef8c914e..adb74025d3c68f17baacd4e518d8ecc23d0ade25 100644 (file)
--- a/xml/schema/Contribute/Contribution.xml
+++ b/xml/schema/Contribute/Contribution.xml
@@ -224,7 +224,7 @@
     <comment>unique invoice id, system generated or passed in</comment>
     <html>
       <type>Text</type>
-    </html>  
+    </html>
     <add>1.3</add>
     </field>
   <field>
@@ -267,7 +267,7 @@
     <html>
       <type>Text</type>
     </html>
-    <add>1.3</add>    
+    <add>1.3</add>
   </field>
   <field>
     <name>receipt_date</name>
@@ -279,7 +279,7 @@
     <html>
       <type>Select Date</type>
     </html>
-    <add>1.3</add>    
+    <add>1.3</add>
   </field>
   <field>
     <name>thankyou_date</name>
@@ -342,6 +342,7 @@
   </index>
   <field>
     <name>contribution_recur_id</name>
+    <title>Recurring Contribution ID</title>
     <type>int unsigned</type>
     <comment>Conditional foreign key to civicrm_contribution_recur id. Each contribution made in connection with a recurring contribution carries a foreign key to the recurring contribution record. This assumes we can track these processor initiated events.</comment>
     <add>1.4</add>
diff --git a/xml/schema/Core/Phone.xml b/xml/schema/Core/Phone.xml
index ed2625d9480ce753e85c3512175418d8499f8e47..4f01f75e5624902d3baaf0bcf655afaa00b3edea 100644 (file)
--- a/xml/schema/Core/Phone.xml
+++ b/xml/schema/Core/Phone.xml
@@ -8,43 +8,45 @@
   <add>1.1</add>
   <log>true</log>
   <field>
-      <name>id</name>
-      <type>int unsigned</type>
-      <required>true</required>
-      <comment>Unique Phone ID</comment>
-      <add>1.1</add>
+    <name>id</name>
+    <title>Phone ID</title>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>Unique Phone ID</comment>
+    <add>1.1</add>
   </field>
   <primaryKey>
-       <name>id</name>
-       <autoincrement>true</autoincrement>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
   </primaryKey>
   <field>
-      <name>contact_id</name>
-      <type>int unsigned</type>
-      <comment>FK to Contact ID</comment>
-      <add>2.0</add>
+    <name>contact_id</name>
+    <title>Phone Contact</title>
+    <type>int unsigned</type>
+    <comment>FK to Contact ID</comment>
+    <add>2.0</add>
   </field>
   <foreignKey>
-       <name>contact_id</name>
-       <table>civicrm_contact</table>
-       <key>id</key>
-       <add>2.0</add>
-       <onDelete>CASCADE</onDelete>
+    <name>contact_id</name>
+    <table>civicrm_contact</table>
+    <key>id</key>
+    <add>2.0</add>
+    <onDelete>CASCADE</onDelete>
   </foreignKey>
   <field>
-      <name>location_type_id</name>
-      <title>Phone Location Type</title>
-      <type>int unsigned</type>
-      <comment>Which Location does this phone belong to.</comment>
-      <pseudoconstant>
-        <table>civicrm_location_type</table>
-        <keyColumn>id</keyColumn>
-        <labelColumn>display_name</labelColumn>
-      </pseudoconstant>
-      <html>
-        <type>Select</type>
-      </html>
-      <add>2.0</add>
+    <name>location_type_id</name>
+    <title>Phone Location Type</title>
+    <type>int unsigned</type>
+    <comment>Which Location does this phone belong to.</comment>
+    <pseudoconstant>
+      <table>civicrm_location_type</table>
+      <keyColumn>id</keyColumn>
+      <labelColumn>display_name</labelColumn>
+    </pseudoconstant>
+    <html>
+      <type>Select</type>
+    </html>
+    <add>2.0</add>
   </field>
   <index>
     <name>index_location_type</name>
@@ -52,12 +54,12 @@
     <add>2.0</add>
   </index>
   <field>
-       <name>is_primary</name>
-       <title>Is Phone Primary?</title>
-       <type>boolean</type>
-       <default>0</default>
-       <comment>Is this the primary phone for this contact and location.</comment>
-       <add>1.1</add>
+    <name>is_primary</name>
+    <title>Is Phone Primary?</title>
+    <type>boolean</type>
+    <default>0</default>
+    <comment>Is this the primary phone for this contact and location.</comment>
+    <add>1.1</add>
   </field>
   <index>
     <name>index_is_primary</name>
@@ -65,11 +67,12 @@
     <add>2.0</add>
   </index>
   <field>
-       <name>is_billing</name>
-       <type>boolean</type>
-       <default>0</default>
-       <comment>Is this the billing?</comment>
-       <add>2.0</add>
+    <name>is_billing</name>
+    <title>Is Billing Phone</title>
+    <type>boolean</type>
+    <default>0</default>
+    <comment>Is this the billing?</comment>
+    <add>2.0</add>
   </field>
   <index>
     <name>index_is_billing</name>
@@ -77,48 +80,48 @@
     <add>2.0</add>
   </index>
   <field>
-      <name>mobile_provider_id</name>
-      <type>int unsigned</type>
-      <comment>Which Mobile Provider does this phone belong to.</comment>
-       <add>1.1</add>
+    <name>mobile_provider_id</name>
+    <type>int unsigned</type>
+    <comment>Which Mobile Provider does this phone belong to.</comment>
+    <add>1.1</add>
   </field>
   <index>
-      <name>UI_mobile_provider_id</name>
-      <fieldName>mobile_provider_id</fieldName>
-      <add>1.6</add>
+    <name>UI_mobile_provider_id</name>
+    <fieldName>mobile_provider_id</fieldName>
+    <add>1.6</add>
   </index>
   <field>
-       <name>phone</name>
-       <type>varchar</type>
-       <length>32</length>
-       <import>true</import>
-       <headerPattern>/phone/i</headerPattern>
-       <dataPattern>/^[\d\(\)\-\.\s]+$/</dataPattern>
-       <comment>Complete phone number.</comment>
-       <add>1.1</add>
+    <name>phone</name>
+    <type>varchar</type>
+    <length>32</length>
+    <import>true</import>
+    <headerPattern>/phone/i</headerPattern>
+    <dataPattern>/^[\d\(\)\-\.\s]+$/</dataPattern>
+    <comment>Complete phone number.</comment>
+    <add>1.1</add>
   </field>
   <field>
-       <name>phone_ext</name>
-       <title>Phone Extension</title>
-       <type>varchar</type>
-       <length>16</length>
-       <html>
-         <type>Text</type>
-         <size>FOUR</size>
-       </html>
-       <import>true</import>
-       <export>true</export>
-       <headerPattern>/extension/i</headerPattern>
-       <dataPattern>/^\d+$/</dataPattern>
-       <comment>Optional extension for a phone number.</comment>
-       <add>3.3</add>
+    <name>phone_ext</name>
+    <title>Phone Extension</title>
+    <type>varchar</type>
+    <length>16</length>
+    <html>
+      <type>Text</type>
+      <size>FOUR</size>
+    </html>
+    <import>true</import>
+    <export>true</export>
+    <headerPattern>/extension/i</headerPattern>
+    <dataPattern>/^\d+$/</dataPattern>
+    <comment>Optional extension for a phone number.</comment>
+    <add>3.3</add>
   </field>
   <field>
-       <name>phone_numeric</name>
-       <type>varchar</type>
-       <length>32</length>
-       <comment>Phone number stripped of all whitespace, letters, and punctuation.</comment>
-       <add>4.3</add>
+    <name>phone_numeric</name>
+    <type>varchar</type>
+    <length>32</length>
+    <comment>Phone number stripped of all whitespace, letters, and punctuation.</comment>
+    <add>4.3</add>
   </field>
   <index>
     <name>index_phone_numeric</name>
@@ -126,26 +129,26 @@
     <add>4.3</add>
   </index>
   <field>
-       <name>phone_type</name>
-       <type>enum</type>
-       <values>Phone, Mobile, Fax, Pager</values>
-       <headerPattern>/phone\s+type/i</headerPattern>
-       <dataPattern>/phone|mobile|fax|pager/i</dataPattern>
-       <comment>What type of telecom device is this.</comment>
-       <add>1.1</add>
-       <drop>2.2</drop>
+    <name>phone_type</name>
+    <type>enum</type>
+    <values>Phone, Mobile, Fax, Pager</values>
+    <headerPattern>/phone\s+type/i</headerPattern>
+    <dataPattern>/phone|mobile|fax|pager/i</dataPattern>
+    <comment>What type of telecom device is this.</comment>
+    <add>1.1</add>
+    <drop>2.2</drop>
   </field>
   <field>
-      <name>phone_type_id</name>
-      <title>Phone Type</title>
-      <type>int unsigned</type>
-      <comment>Which type of phone does this number belongs.</comment>
-      <pseudoconstant>
-        <optionGroupName>phone_type</optionGroupName>
-      </pseudoconstant>
-      <html>
-        <type>Select</type>
-      </html>
-      <add>2.2</add>
+    <name>phone_type_id</name>
+    <title>Phone Type</title>
+    <type>int unsigned</type>
+    <comment>Which type of phone does this number belongs.</comment>
+    <pseudoconstant>
+      <optionGroupName>phone_type</optionGroupName>
+    </pseudoconstant>
+    <html>
+      <type>Select</type>
+    </html>
+    <add>2.2</add>
   </field>
 </table>
diff --git a/xml/schema/Core/Setting.xml b/xml/schema/Core/Setting.xml
index fdd016e64d383ce6073cb07c3550e15b1d487ec8..08f2978b9c82857cca89c4f4415c45d77253354b 100644 (file)
--- a/xml/schema/Core/Setting.xml
+++ b/xml/schema/Core/Setting.xml
@@ -8,6 +8,7 @@
   <add>4.1</add>
   <field>
       <name>id</name>
+    <title>Setting ID</title>
       <type>int unsigned</type>
       <required>true</required>
       <add>4.1</add>
@@ -18,6 +19,7 @@
   </primaryKey>
   <field>
        <name>group_name</name>
+    <title>Setting Group</title>
        <type>varchar</type>
        <length>64</length>
        <required>true</required>
@@ -26,6 +28,7 @@
   </field>
   <field>
        <name>name</name>
+    <title>Setting Name</title>
        <type>varchar</type>
        <length>255</length>
        <comment>Unique name for setting</comment>
@@ -45,6 +48,7 @@
   </field>
   <field>
       <name>domain_id</name>
+    <title>Setting Domain</title>
       <type>int unsigned</type>
       <required>true</required>
       <pseudoconstant>
@@ -64,6 +68,7 @@
   </foreignKey>
   <field>
       <name>contact_id</name>
+    <title>Setting Contact</title>
       <type>int unsigned</type>
       <comment>FK to Contact ID if the setting is localized to a contact</comment>
       <add>4.1</add>
@@ -77,12 +82,14 @@
   </foreignKey>
   <field>
        <name>is_domain</name>
+    <title>Is Domain Setting?</title>
        <type>boolean</type>
        <comment>Is this setting a contact specific or site wide setting?</comment>
        <add>4.1</add>
   </field>
   <field>
     <name>component_id</name>
+    <title>Setting Component</title>
     <type>int unsigned</type>
     <comment>Component that this menu item belongs to</comment>
     <add>4.1</add>
@@ -103,12 +110,14 @@
   </foreignKey>
   <field>
     <name>created_date</name>
+    <title>Setting Created Date</title>
     <type>datetime</type>
     <comment>When was the setting created</comment>
     <add>4.1</add>
   </field>
   <field>
     <name>created_id</name>
+    <title>Setting Created By</title>
     <type>int unsigned</type>
     <comment>FK to civicrm_contact, who created this setting</comment>
     <add>4.1</add>