projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #15415 from ixiam/dev_issue#1297
[civicrm-core.git]
/
CRM
/
Core
/
DAO
/
Address.php
diff --git
a/CRM/Core/DAO/Address.php
b/CRM/Core/DAO/Address.php
index b1e00a83dc990f2f2ca9999fc90fa379bd93f214..8e97d3e336d29b88a92ad6ad9a0d72742872d0e8 100644
(file)
--- 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
*
* Generated from xml/schema/CRM/Core/Address.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:
e9acc7bc70fb2860407a7d4afe12c725
)
+ * (GenCodeChecksum:
4e3b66ed828527539c525b2ffc71e606
)
*/
/**
*/
/**
@@
-669,6
+669,7
@@
class CRM_Core_DAO_Address extends CRM_Core_DAO {
'keyColumn' => 'id',
'labelColumn' => 'name',
'nameColumn' => 'iso_code',
'keyColumn' => 'id',
'labelColumn' => 'name',
'nameColumn' => 'iso_code',
+ 'abbrColumn' => 'iso_code',
],
],
'geo_code_1' => [
],
],
'geo_code_1' => [
@@
-708,9
+709,10
@@
class CRM_Core_DAO_Address extends CRM_Core_DAO {
'manual_geo_code' => [
'name' => 'manual_geo_code',
'type' => CRM_Utils_Type::T_BOOLEAN,
'manual_geo_code' => [
'name' => 'manual_geo_code',
'type' => CRM_Utils_Type::T_BOOLEAN,
- 'title' => ts('Is
manually g
eocoded'),
+ 'title' => ts('Is
Manually G
eocoded'),
'description' => ts('Is this a manually entered geo code'),
'where' => 'civicrm_address.manual_geo_code',
'description' => ts('Is this a manually entered geo code'),
'where' => 'civicrm_address.manual_geo_code',
+ 'export' => TRUE,
'default' => '0',
'table_name' => 'civicrm_address',
'entity' => 'Address',
'default' => '0',
'table_name' => 'civicrm_address',
'entity' => 'Address',
@@
-887,6
+889,15
@@
class CRM_Core_DAO_Address extends CRM_Core_DAO {
'localizable' => FALSE,
'sig' => 'civicrm_address::0::city',
],
'localizable' => FALSE,
'sig' => 'civicrm_address::0::city',
],
+ 'index_geo_code_1_geo_code_2' => [
+ 'name' => 'index_geo_code_1_geo_code_2',
+ 'field' => [
+ 0 => 'geo_code_1',
+ 1 => 'geo_code_2',
+ ],
+ 'localizable' => FALSE,
+ 'sig' => 'civicrm_address::0::geo_code_1::geo_code_2',
+ ],
];
return ($localize && !empty($indices)) ? CRM_Core_DAO_AllCoreTables::multilingualize(__CLASS__, $indices) : $indices;
}
];
return ($localize && !empty($indices)) ? CRM_Core_DAO_AllCoreTables::multilingualize(__CLASS__, $indices) : $indices;
}