diff options
Diffstat (limited to 'app/Http')
| -rw-r--r-- | app/Http/Controllers/AutocompleteController.php | 14 | ||||
| -rw-r--r-- | app/Http/Controllers/CalendarController.php | 1 | ||||
| -rw-r--r-- | app/Http/Controllers/ReportEngineController.php | 31 |
3 files changed, 22 insertions, 24 deletions
diff --git a/app/Http/Controllers/AutocompleteController.php b/app/Http/Controllers/AutocompleteController.php index 31a7ec8cec..0cdd614c82 100644 --- a/app/Http/Controllers/AutocompleteController.php +++ b/app/Http/Controllers/AutocompleteController.php @@ -25,7 +25,6 @@ use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Media; use Fisharebest\Webtrees\Note; use Fisharebest\Webtrees\Repository; -use Fisharebest\Webtrees\Select2; use Fisharebest\Webtrees\Services\SearchService; use Fisharebest\Webtrees\Source; use Fisharebest\Webtrees\Tree; @@ -247,19 +246,6 @@ class AutocompleteController extends AbstractBaseController /** * @param Request $request - * - * @return JsonResponse - */ - public function select2Flag(Request $request): JsonResponse - { - $page = (int) $request->get('page'); - $query = $request->get('q', ''); - - return new JsonResponse(Select2::flagSearch($page, $query)); - } - - /** - * @param Request $request * @param Tree $tree * * @return JsonResponse diff --git a/app/Http/Controllers/CalendarController.php b/app/Http/Controllers/CalendarController.php index a992994876..11f8c19985 100644 --- a/app/Http/Controllers/CalendarController.php +++ b/app/Http/Controllers/CalendarController.php @@ -17,7 +17,6 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\Controllers; -use DomainException; use Fisharebest\Webtrees\Carbon; use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Date\FrenchDate; diff --git a/app/Http/Controllers/ReportEngineController.php b/app/Http/Controllers/ReportEngineController.php index 1f6f12ab33..1fd3773051 100644 --- a/app/Http/Controllers/ReportEngineController.php +++ b/app/Http/Controllers/ReportEngineController.php @@ -18,10 +18,8 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\Controllers; use Fisharebest\Webtrees\Auth; -use Fisharebest\Webtrees\Bootstrap4; use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\Family; -use Fisharebest\Webtrees\Functions\FunctionsEdit; use Fisharebest\Webtrees\Html; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Individual; @@ -120,18 +118,33 @@ class ReportEngineController extends AbstractBaseController switch ($input['lookup']) { case 'INDI': - $individual = Individual::getInstance($pid, $tree); - $input['control'] = FunctionsEdit::formControlIndividual($tree, $individual, $attributes + ['required' => true]); + $input['control'] = view('components/select-individual', [ + 'id' => 'input-' . $n, + 'name' => 'vars[' . $input['name'] . ']', + 'individual' => Individual::getInstance($pid, $tree), + 'tree' => $tree, + 'required' => true, + ]); break; case 'FAM': - $family = Family::getInstance($pid, $tree); - $input['control'] = FunctionsEdit::formControlFamily($tree, $family, $attributes + ['required' => true]); + $input['control'] = view('components/select-family', [ + 'id' => 'input-' . $n, + 'name' => 'vars[' . $input['name'] . ']', + 'family' => Family::getInstance($pid, $tree), + 'tree' => $tree, + 'required' => true, + ]); break; case 'SOUR': - $source = Source::getInstance($pid, $tree); - $input['control'] = FunctionsEdit::formControlSource($tree, $source, $attributes + ['required' => 'true']); + $input['control'] = view('components/select-source', [ + 'id' => 'input-' . $n, + 'name' => 'vars[' . $input['name'] . ']', + 'family' => Source::getInstance($pid, $tree), + 'tree' => $tree, + 'required' => true, + ]); break; case 'DATE': @@ -177,7 +190,7 @@ class ReportEngineController extends AbstractBaseController $options[$key] = I18N::translateContext($match[1], $match[2]); } } - $input['control'] = Bootstrap4::select($options, $input['default'], $attributes); + $input['control'] = view('components/select', ['name' => 'vars[' . $input['name'] . ']', 'id' => 'input-' . $n, 'selected' => $input['default'], 'values' => $options]); break; } } |