Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CRM-20039 Add Supplemental Address lines to Advanced Search #9850

Merged
merged 1 commit into from
Mar 8, 2017
Merged

CRM-20039 Add Supplemental Address lines to Advanced Search #9850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CRM/Contact/Form/Search/Criteria.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,8 @@ public static function location(&$form) {

$elements = array(
'street_address' => array(ts('Street Address'), $attributes['street_address'], NULL, NULL),
'supplemental_address_1' => array(ts('Supplemental Address 1'), $attributes['supplemental_address_1'], NULL, NULL),
'supplemental_address_2' => array(ts('Supplemental Address 2'), $attributes['supplemental_address_2'], NULL, NULL),
'city' => array(ts('City'), $attributes['city'], NULL, NULL),
'postal_code' => array(ts('Postal Code'), $attributes['postal_code'], NULL, NULL),
'country' => array(ts('Country'), $attributes['country_id'], 'country', FALSE),
Expand Down
10 changes: 8 additions & 2 deletions templates/CRM/Contact/Form/Search/Criteria/Location.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,14 @@
</table>
</div>
{/if}
<div class="crm-field-wrapper">
{$form.supplemental_address_1.label}<br />
{$form.supplemental_address_1.html}
</div>
<div class="crm-field-wrapper">
{$form.supplemental_address_2.label}<br />
{$form.supplemental_address_2.html}
</div>
<div class="crm-field-wrapper">
{$form.city.label}<br />
{$form.city.html}
Expand Down Expand Up @@ -158,5 +166,3 @@
</script>
{/literal}
{/if}