kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-25 06:51:08 +00:00
Code Issues Projects Releases Wiki Activity

Make sure null value is turned into an empty string [skip ci]

Browse Source
This commit is contained in:
James Cole
2018-08-02 07:17:18 +02:00
parent f07d8e958f
commit ae85876965
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Support/ExpandedForm.php
View File

@@ -756,6 +756,7 @@ class ExpandedForm
*/ */
public function textarea(string $name, $value = null, array $options = null): string public function textarea(string $name, $value = null, array $options = null): string
{ {
$value = $value ?? '';
$label = $this->label($name, $options); $label = $this->label($name, $options);
$options = $this->expandOptionArray($name, $label, $options); $options = $this->expandOptionArray($name, $label, $options);
$classes = $this->getHolderClasses($name); $classes = $this->getHolderClasses($name);
@@ -791,7 +792,7 @@ class ExpandedForm
$options['step'] = 'any'; $options['step'] = 'any';
$defaultCurrency = $options['currency'] ?? Amt::getDefaultCurrency(); $defaultCurrency = $options['currency'] ?? Amt::getDefaultCurrency();
/** @var Collection $currencies */ /** @var Collection $currencies */
$currencies = app('amount')->getAllCurrencies(); $currencies = app('amount')->getAllCurrencies();
unset($options['currency'], $options['placeholder']); unset($options['currency'], $options['placeholder']);
// perhaps the currency has been sent to us in the field $amount_currency_id_$name (amount_currency_id_amount) // perhaps the currency has been sent to us in the field $amount_currency_id_$name (amount_currency_id_amount)