Fix: fisharebest#3455 - no names for new records, select2 not re-init…

…ialised correctly
alanbenazzi · Aug 5, 2020 · edbd59d · edbd59d
1 parent 42f3c8e
commit edbd59d
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 10 deletions.
diff --git a/app/Http/RequestHandlers/CreateMediaObjectAction.php b/app/Http/RequestHandlers/CreateMediaObjectAction.php
@@ -2,7 +2,7 @@
 
 /**
  * webtrees: online genealogy
- * Copyright (C) 2019 webtrees development team
+ * Copyright (C) 2020 webtrees development team
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -20,6 +20,7 @@
 namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
 use Fig\Http\Message\StatusCodeInterface;
+use Fisharebest\Webtrees\Factory;
 use Fisharebest\Webtrees\I18N;
 use Fisharebest\Webtrees\Services\MediaFileService;
 use Fisharebest\Webtrees\Services\PendingChangesService;
@@ -90,6 +91,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         }
 
         $record = $tree->createMediaObject($gedcom);
+        $record = Factory::media()->new($record->xref(), $record->gedcom(), null, $tree);
 
         // Accept the new record to keep the filesystem synchronized with the genealogy.
         $this->pending_changes_service->acceptRecord($record);

diff --git a/app/Http/RequestHandlers/CreateNoteAction.php b/app/Http/RequestHandlers/CreateNoteAction.php
@@ -2,7 +2,7 @@
 
 /**
  * webtrees: online genealogy
- * Copyright (C) 2019 webtrees development team
+ * Copyright (C) 2020 webtrees development team
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -19,6 +19,7 @@
 
 namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
+use Fisharebest\Webtrees\Factory;
 use Fisharebest\Webtrees\I18N;
 use Fisharebest\Webtrees\Tree;
 use Psr\Http\Message\ResponseInterface;
@@ -61,6 +62,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         }
 
         $record = $tree->createRecord($gedcom);
+        $record = Factory::note()->new($record->xref(), $record->gedcom(), null, $tree);
 
         // id and text are for select2 / autocomplete
         // html is for interactive modals

diff --git a/app/Http/RequestHandlers/CreateRepositoryAction.php b/app/Http/RequestHandlers/CreateRepositoryAction.php
@@ -2,7 +2,7 @@
 
 /**
  * webtrees: online genealogy
- * Copyright (C) 2019 webtrees development team
+ * Copyright (C) 2020 webtrees development team
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -19,6 +19,7 @@
 
 namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
+use Fisharebest\Webtrees\Factory;
 use Fisharebest\Webtrees\I18N;
 use Fisharebest\Webtrees\Tree;
 use Psr\Http\Message\ResponseInterface;
@@ -66,6 +67,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         }
 
         $record = $tree->createRecord($gedcom);
+        $record = Factory::repository()->new($record->xref(), $record->gedcom(), null, $tree);
 
         // id and text are for select2 / autocomplete
         // html is for interactive modals

diff --git a/app/Http/RequestHandlers/CreateSourceAction.php b/app/Http/RequestHandlers/CreateSourceAction.php
@@ -2,7 +2,7 @@
 
 /**
  * webtrees: online genealogy
- * Copyright (C) 2019 webtrees development team
+ * Copyright (C) 2020 webtrees development team
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -19,6 +19,7 @@
 
 namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
+use Fisharebest\Webtrees\Factory;
 use Fisharebest\Webtrees\I18N;
 use Fisharebest\Webtrees\Tree;
 use Psr\Http\Message\ResponseInterface;
@@ -99,6 +100,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         }
 
         $record = $tree->createRecord($gedcom);
+        $record = Factory::source()->new($record->xref(), $record->gedcom(), null, $tree);
 
         // id and text are for select2 / autocomplete
         // html is for interactive modals

diff --git a/app/Http/RequestHandlers/CreateSubmitterAction.php b/app/Http/RequestHandlers/CreateSubmitterAction.php
@@ -2,7 +2,7 @@
 
 /**
  * webtrees: online genealogy
- * Copyright (C) 2019 webtrees development team
+ * Copyright (C) 2020 webtrees development team
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -19,6 +19,7 @@
 
 namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
+use Fisharebest\Webtrees\Factory;
 use Fisharebest\Webtrees\I18N;
 use Fisharebest\Webtrees\Tree;
 use Psr\Http\Message\ResponseInterface;
@@ -66,6 +67,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         }
 
         $record = $tree->createRecord($gedcom);
+        $record = Factory::submitter()->new($record->xref(), $record->gedcom(), null, $tree);
 
         return response([
             'id'   => $record->xref(),

diff --git a/resources/views/modals/create-media-object.phtml b/resources/views/modals/create-media-object.phtml
@@ -2,6 +2,14 @@
 
 use Fisharebest\Webtrees\Http\RequestHandlers\CreateMediaObjectAction;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Tree;
+
+/**
+ * @var string        $max_upload_size
+ * @var array<string> $media_types
+ * @var Tree          $tree
+ * @var array<string> $unused_files
+ */
 
 ?>
 
@@ -41,7 +49,7 @@ use Fisharebest\Webtrees\I18N;
                     option.innerHTML = option.innerText;
 
                     $(select)
-                        .select2()
+                        .select2({ escapeMarkup: (x) => x })
                         .empty()
                         .append(option)
                         .trigger("change");

diff --git a/resources/views/modals/create-note-object.phtml b/resources/views/modals/create-note-object.phtml
@@ -2,6 +2,11 @@
 
 use Fisharebest\Webtrees\Http\RequestHandlers\CreateNoteAction;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Tree;
+
+/**
+ * @var Tree $tree
+ */
 
 ?>
 
@@ -42,7 +47,7 @@ use Fisharebest\Webtrees\I18N;
                     option.innerHTML = data.text;
 
                     $(select)
-                        .select2()
+                        .select2({ escapeMarkup: (x) => x })
                         .empty()
                         .append(option)
                         .trigger("change");

diff --git a/resources/views/modals/create-repository.phtml b/resources/views/modals/create-repository.phtml
@@ -2,6 +2,11 @@
 
 use Fisharebest\Webtrees\Http\RequestHandlers\CreateRepositoryAction;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Tree;
+
+/**
+ * @var Tree $tree
+ */
 
 ?>
 
@@ -41,7 +46,7 @@ use Fisharebest\Webtrees\I18N;
                     option.innerHTML = option.innerText;
 
                     $(select)
-                        .select2()
+                        .select2({ escapeMarkup: (x) => x })
                         .empty()
                         .append(option)
                         .trigger("change");

diff --git a/resources/views/modals/create-source.phtml b/resources/views/modals/create-source.phtml
@@ -2,6 +2,11 @@
 
 use Fisharebest\Webtrees\Http\RequestHandlers\CreateSourceAction;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Tree;
+
+/**
+ * @var Tree $tree
+ */
 
 ?>
 
@@ -41,7 +46,7 @@ use Fisharebest\Webtrees\I18N;
                     option.innerHTML = option.innerText;
 
                     $(select)
-                        .select2()
+                        .select2({ escapeMarkup: (x) => x })
                         .empty()
                         .append(option)
                         .trigger("change");

diff --git a/resources/views/modals/create-submitter.phtml b/resources/views/modals/create-submitter.phtml
@@ -2,6 +2,11 @@
 
 use Fisharebest\Webtrees\Http\RequestHandlers\CreateSubmitterAction;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Tree;
+
+/**
+ * @var Tree $tree
+ */
 
 ?>
 
@@ -41,7 +46,7 @@ use Fisharebest\Webtrees\I18N;
                     option.innerHTML = option.innerText;
 
                     $(select)
-                        .select2()
+                        .select2({ escapeMarkup: (x) => x })
                         .empty()
                         .append(option)
                         .trigger("change");