tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Do not default to locale if hasEmptyDefault is true

Browse Source 
Currently there is no per-instance way to say "don't default to the current locale".
If you've explicitly said "This field right here, it has an empty default value" then we should probably respect that.
This commit is contained in:
Matthew Hailwood 2017-03-09 12:35:37 +13:00 committed by GitHub
parent 8aaa3e3a86
commit 445aba2a56
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
forms/CountryDropdownField.php
View File

@ -58,16 +58,18 @@ class CountryDropdownField extends DropdownField {
public function Field($properties = array()) {
$source = $this->getSource();
if (!$this->value || !isset($source[$this->value])) {
if ($this->config()->default_to_locale && $this->locale()) {
$locale = new Zend_Locale();
$locale->setLocale($this->locale());
$this->value = $locale->getRegion();
if(!$this->getHasEmptyDefault()){
if (!$this->value || !isset($source[$this->value])) {
if ($this->config()->default_to_locale && $this->locale()) {
$locale = new Zend_Locale();
$locale->setLocale($this->locale());
$this->value = $locale->getRegion();
}
}
}
if (!$this->value || !isset($source[$this->value])) {
$this->value = $this->config()->default_country;
if (!$this->value || !isset($source[$this->value])) {
$this->value = $this->config()->default_country;
}
}
return parent::Field();