Fix for CRM-15850

diff --git a/CRM/Core/BAO/Address.php b/CRM/Core/BAO/Address.php
index e5842af152590c3f689269bb315129c280f8d871..cd9cc5375c4a2287ffb6b0918d27c1d5b69e2392 100644 (file)
--- a/CRM/Core/BAO/Address.php
+++ b/CRM/Core/BAO/Address.php
@@ -498,6 +498,7 @@ class CRM_Core_BAO_Address extends CRM_Core_DAO_Address {
 
     $address->find();
 
+    $locationTypes = CRM_Core_PseudoConstant::get('CRM_Core_DAO_Address', 'location_type_id');
     $count = 1;
     while ($address->fetch()) {
       // deprecate reference.
@@ -518,6 +519,9 @@ class CRM_Core_BAO_Address extends CRM_Core_DAO_Address {
       CRM_Core_DAO::storeValues($address, $values);
 
       // add state and country information: CRM-369
+      if (!empty($address->location_type_id)) {
+        $values['location_type'] = CRM_Utils_Array::value($address->location_type_id, $locationTypes);
+      }
       if (!empty($address->state_province_id)) {
         $address->state = CRM_Core_PseudoConstant::stateProvinceAbbreviation($address->state_province_id, FALSE);
         $address->state_name = CRM_Core_PseudoConstant::stateProvince($address->state_province_id, FALSE);

diff --git a/templates/CRM/Contact/Form/ShareAddress.tpl b/templates/CRM/Contact/Form/ShareAddress.tpl
index 9ffa5a69620ba660bd946d6d9c492b5b73eb8bb1..d4f924d880de9e571423476bd241d8175b38d4d8 100644 (file)
--- a/templates/CRM/Contact/Form/ShareAddress.tpl
+++ b/templates/CRM/Contact/Form/ShareAddress.tpl
@@ -36,7 +36,7 @@
             {assign var="sa_name" value="selected_shared_address-`$blockId`"}
             {assign var="sa_id" value="`$sa_name`-`$sa.id`"}
             <input type="radio" name="{$sa_name}" id="{$sa_id}" value="{$sa.id}" {if $sa.id eq $sharedAddresses.$blockId.shared_address_display.master_id}checked="checked"{/if}>
-            <label for="{$sa_id}">{$sa.display_text}</label><br/>
+            <label for="{$sa_id}">{$sa.display_text}</label>{if $sa.location_type}({$sa.location_type}){/if}<br/>
           {/foreach}
         {/if}
       </div>
@@ -99,7 +99,7 @@
               }
               var name = 'selected_shared_address-'+ blockNo,
                 id = name + '-' + val.id;
-              addressHTML += '<input type="radio" name="' + name + '" id="' + id + '" value="' + val.id + '"' + selected +'><label for="' + id + '">' + val.display_text + '</label><br/>';
+              addressHTML += '<input type="radio" name="' + name + '" id="' + id + '" value="' + val.id + '"' + selected +'><label for="' + id + '">' + val.display_text + '</label>('+val.location_type+')<br/>';
             });
 
             if (!addressHTML) {