kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-15 16:57:09 +00:00
Code Issues Projects Releases Wiki Activity

Remove references to ExpandedForm.

Browse Source
This commit is contained in:
James Cole
2018-04-29 09:48:53 +02:00
parent 88348f59c2
commit 71b63bd33b
5 changed files with 44 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/Support/ExpandedForm.php
View File

@@ -32,6 +32,7 @@ use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
use Form;
use Illuminate\Support\Collection;
use Illuminate\Support\MessageBag;
use RuntimeException;
@@ -49,6 +50,7 @@ class ExpandedForm
*
* @return string
* @throws \FireflyIII\Exceptions\FireflyException
* @throws \Throwable
*/
public function amount(string $name, $value = null, array $options = []): string
{
@@ -128,7 +130,7 @@ class ExpandedForm
}
unset($options['class']);
$html = view('form.assetAccountCheckList', compact('classes','selected', 'name', 'label', 'options', 'grouped'))->render();
$html = view('form.assetAccountCheckList', compact('classes', 'selected', 'name', 'label', 'options', 'grouped'))->render();
return $html;
}
@@ -545,9 +547,37 @@ class ExpandedForm
foreach ($list as $group) {
$array[$group->id] = $group->title;
}
$res = $this->select($name, $array, $value, $options);
return $res;
return $this->select($name, $array, $value, $options);
}
/**
* @param string $name
* @param null $value
* @param null $options
*
* @return \Illuminate\Support\HtmlString
*/
public function ruleGroupListWithEmpty(string $name, $value = null, $options = null)
{
$options = $options ?? [];
$options['class'] = 'form-control';
/** @var RuleGroupRepositoryInterface $groupRepos */
$groupRepos = app(RuleGroupRepositoryInterface::class);
// get all currencies:
$list = $groupRepos->get();
$array = [
0 => trans('firefly.none_in_select_list'),
];
/** @var RuleGroup $group */
foreach ($list as $group) {
if (isset($options['hidden']) && (int)$options['hidden'] !== $group->id) {
$array[$group->id] = $group->title;
}
}
return Form::select($name, $array, $value, $options);
}
/**