Fix deleted drop-down items being cleared

ctrlo · Sep 19, 2023 · 5f0191c · 5f0191c
1 parent db503cf
commit 5f0191c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/lib/GADS/Column/Enum.pm b/lib/GADS/Column/Enum.pm
@@ -47,7 +47,8 @@ has enumvals => (
         });
         $enumrs->result_class('DBIx::Class::ResultClass::HashRefInflator');
         # Make enumvals match Curval value types, as both use the same
-        # front-end code
+        # front-end code.
+        # Note, any changes must be replicated in GADS::Datum::Enum::_build_deleted_values
         my @enumvals = map {
             +{
                 value       => $_->{value},

diff --git a/lib/GADS/Datum/Enum.pm b/lib/GADS/Datum/Enum.pm
@@ -18,6 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package GADS::Datum::Enum;
 
+use HTML::Entities qw/encode_entities/;
 use Log::Report 'linkspace';
 use Moo;
 use MooX::Types::MooseLike::Base qw/:all/;
@@ -191,8 +192,11 @@ sub _build_deleted_values
         my $text = shift @text;
         next unless shift @deleted;
         push @return, {
-            id    => $id,
-            value => $text,
+            id          => $id,
+            value       => $text,
+            html        => encode_entities($text), # Needed for edit form render
+            selector_id => $id,
+            value_id    => $id,
         };
     }
     return \@return;

diff --git a/lib/GADS/Role/Presentation/Datum/Enum.pm b/lib/GADS/Role/Presentation/Datum/Enum.pm
@@ -8,6 +8,7 @@ sub presentation {
     my $base = $self->presentation_base;
 
     $base->{id_hash} = $self->id_hash;
+    $base->{deleted_values} = $self->deleted_values;
 
     return $base;
 }