Pseudoconstant - always explicitly name abbrColumn

Stop the overly-clever guesswork of abbrColumn so that it can always be know if a pseudoconstant has an abbreviation.

Pseudoconstant - always explicitly name abbrColumn
70c5cd97 · colemanw · e8a784a3 · 70c5cd97 · 70c5cd97 · 70c5cd97
Commit 70c5cd97 authored 3 years ago by colemanw
--- a/CRM/Core/DAO/Address.php
+++ b/CRM/Core/DAO/Address.php
@@ -6,7 +6,7 @@
 *
 * Generated from xml/schema/CRM/Core/Address.xml
 * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:bd0caca7da12cba4ed8161b892a77229)
+ * (GenCodeChecksum:40a96138e8081eaba0460889f49cc1cf)
 */

 /**
@@ -619,6 +619,7 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO {
            'table' => 'civicrm_county',
            'keyColumn' => 'id',
            'labelColumn' => 'name',
+            'abbrColumn' => 'abbreviation',
          ],
          'add' => '1.1',
        ],
@@ -643,6 +644,7 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO {
            'table' => 'civicrm_state_province',
            'keyColumn' => 'id',
            'labelColumn' => 'name',
+            'abbrColumn' => 'abbreviation',
          ],
          'add' => '1.1',
        ],

--- a/CRM/Core/DAO/County.php
+++ b/CRM/Core/DAO/County.php
@@ -6,7 +6,7 @@
 *
 * Generated from xml/schema/CRM/Core/County.xml
 * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:6666108a662d719144f390bf4746268d)
+ * (GenCodeChecksum:f54f7ff28a6ecde09252698c389db154)
 */

 /**
@@ -181,6 +181,7 @@ class CRM_Core_DAO_County extends CRM_Core_DAO {
            'table' => 'civicrm_state_province',
            'keyColumn' => 'id',
            'labelColumn' => 'name',
+            'abbrColumn' => 'abbreviation',
          ],
          'add' => '1.1',
        ],

--- a/CRM/Core/PseudoConstant.php
+++ b/CRM/Core/PseudoConstant.php
@@ -1513,8 +1513,8 @@ WHERE  id = %1
    }

    // Use abbrColum if context is abbreviate
-    if ($context === 'abbreviate' && (in_array('abbreviation', $availableFields) || !empty($pseudoconstant['abbrColumn']))) {
-      $params['labelColumn'] = $pseudoconstant['abbrColumn'] ?? 'abbreviation';
+    if ($context === 'abbreviate' && !empty($pseudoconstant['abbrColumn'])) {
+      $params['labelColumn'] = $pseudoconstant['abbrColumn'];
    }

    // Condition param can be passed as an sql clause string or an array of clauses

--- a/xml/schema/Core/Address.xml
+++ b/xml/schema/Core/Address.xml
@@ -265,6 +265,7 @@
      <table>civicrm_county</table>
      <keyColumn>id</keyColumn>
      <labelColumn>name</labelColumn>
+      <abbrColumn>abbreviation</abbrColumn>
    </pseudoconstant>
    <html>
      <type>ChainSelect</type>
@@ -292,6 +293,7 @@
      <table>civicrm_state_province</table>
      <keyColumn>id</keyColumn>
      <labelColumn>name</labelColumn>
+      <abbrColumn>abbreviation</abbrColumn>
    </pseudoconstant>
    <localize_context>province</localize_context>
    <html>

--- a/xml/schema/Core/County.xml
+++ b/xml/schema/Core/County.xml
@@ -54,6 +54,7 @@
      <table>civicrm_state_province</table>
      <keyColumn>id</keyColumn>
      <labelColumn>name</labelColumn>
+      <abbrColumn>abbreviation</abbrColumn>
    </pseudoconstant>
  </field>
  <foreignKey>