Skip to content

Commit 1dc4683

Browse files
committed
Add ability to disable manual fields
1 parent 84cfd59 commit 1dc4683

File tree

2 files changed

+54
-19
lines changed

2 files changed

+54
-19
lines changed

src/AddressFinderField.php

Lines changed: 40 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,29 +22,39 @@
2222

2323
class AddressFinderField extends TextField
2424
{
25+
/**
26+
* @config
27+
*/
28+
private static $api_key = false;
29+
30+
/**
31+
* @config
32+
*/
33+
private static $include_address_finder_js = true;
2534

2635
/**
2736
* @var FieldList
2837
*/
29-
private $manualFields;
38+
protected $manualFields;
3039

3140
/**
3241
* @var TextField
3342
*/
34-
private $addressField;
43+
protected $addressField;
3544

3645
/**
3746
* @var HiddenField
3847
*/
39-
private $manualToggle;
48+
protected $manualToggle;
4049

41-
private static $api_key = false;
42-
43-
private static $include_address_finder_js = true;
50+
/**
51+
* @var boolean
52+
*/
53+
protected $showManualFields;
4454

45-
private $showLatLngManual = false;
55+
protected $showLatLngManual = false;
4656

47-
private $requireLatLngManual = false;
57+
protected $requireLatLngManual = false;
4858

4959
/**
5060
* @param string $name
@@ -238,9 +248,9 @@ public function FieldHolder($properties = array())
238248
}
239249

240250
$properties = array(
241-
'ManualAddressFields' => $this->getManualFields(),
251+
'ManualAddressFields' => ($this->showManualFields) ? $fields : null,
242252
'AddressField' => $this->addressField->Field(),
243-
'ManualToggleField' => $this->manualToggle,
253+
'ManualToggleField' => ($this->showManualFields) ? $this->manualToggle : null,
244254
);
245255

246256
return parent::FieldHolder($properties);
@@ -262,6 +272,26 @@ public function getManualFields()
262272
return $this->manualFields;
263273
}
264274

275+
/**
276+
* @param boolean
277+
*
278+
* @return $this
279+
*/
280+
public function setShowManualFields($manual = true)
281+
{
282+
$this->showManualFields = $manual;
283+
284+
return $this;
285+
}
286+
287+
/**
288+
* @return boolean
289+
*/
290+
public function getShowManualFields()
291+
{
292+
return $this->showManualFields;
293+
}
294+
265295
/**
266296
* @return TextField
267297
*/

templates/Includes/AddressFinderField_holder.ss

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,24 @@
1414
<p><a href='http://addressfinder.co.nz'>AddressFinder</a> provided by <a href='http://www.abletech.co.nz/'>Able Technology</a></p>
1515
</div>
1616

17-
<div class="toggle_manual_address" style="display: none">
18-
<p><a href="#"><% _t('AddressFinderField.ENTERMANUAL', 'Enter your address manually') %></a></p>
19-
</div>
17+
<% if ShowManualFields %>
18+
<div class="toggle_manual_address" style="display: none">
19+
<p><a href="#"><% _t('AddressFinderField.ENTERMANUAL', 'Enter your address manually') %></a></p>
20+
</div>
21+
<% end_if %>
2022
</div>
2123

2224
<% if $RightTitle %><p class="form__field-extra-label" id="extra-label-$ID">$RightTitle</p><% end_if %>
2325
</div>
2426

25-
<div class="manual_address">
26-
$ManualToggleField
27+
<% if ShowManualFields %>
2728

28-
<% loop ManualAddressFields %>
29-
$FieldHolder
30-
<% end_loop %>
31-
</div>
29+
<div class="manual_address">
30+
$ManualToggleField
31+
32+
<% loop ManualAddressFields %>
33+
$FieldHolder
34+
<% end_loop %>
35+
</div>
36+
<% end_if %>
3237
</div>

0 commit comments

Comments
 (0)