Merge branch '5.0/bulk-update-html-cfs' into 5.0-trunk

bestpractical · Mar 25, 2024 · fa19258 · fa19258
2 parents f1fdeb6 + 8d490b8
commit fa19258
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 1 deletion.
diff --git a/lib/RT/Interface/Web.pm b/lib/RT/Interface/Web.pm
@@ -4169,7 +4169,8 @@ sub ProcessRecordBulkCustomFields {
     foreach my $key ( keys %$ARGSRef ) {
         next unless $key =~ /^Bulk-(Add|Delete)-CustomField-(\d+)-(.*)$/;
         my ($op, $cfid, $rest) = ($1, $2, $3);
-        next if $rest =~ /-Category$/;
+        # ValuesType is for HTML cfs
+        next if $rest =~ /(?:-Category|ValuesType)$/;
 
         my $res = $data{$cfid} ||= {};
         unless (keys %$res) {

diff --git a/t/web/search_bulk_update.t b/t/web/search_bulk_update.t
@@ -163,4 +163,50 @@ $m->submit_form(
 $m->text_like( qr{Ticket \d+: Status changed from 'new' to 'open'}, 'Bulk update messages' );
 $m->text_unlike( qr{Ticket \d+: Ticket \d+:'}, 'Bulk update messages do not have duplicated prefix' );
 
+
+diag "Test HTML custom fields";
+{
+    my $cf = RT::Test->load_or_create_custom_field(
+        Name        => 'HTML',
+        Type        => 'HTML',
+        Description => 'HTML field',
+        MaxValues   => 1,
+        Queue       => 0,
+    );
+    my $cf_id = $cf->Id;
+
+    my $ticket = RT::Test->create_ticket(
+        Subject => "HTML ticket $_",
+        Queue   => 'General',
+    );
+    my $ticket_id = $ticket->Id;
+
+    $m->get_ok( $url . "/Search/Bulk.html?Query=id=$ticket_id&Rows=10" );
+    $m->text_contains( 'HTML:', 'Has HTML field' );
+
+    $m->submit_form_ok( { form_name => 'BulkUpdate' }, 'Submit with no changes' );
+    $m->text_lacks( 'HTML text/html added', 'No changes of HTML CF fields', );
+
+    $m->submit_form_ok(
+        {
+            form_name => 'BulkUpdate',
+            fields    => {
+                "Bulk-Add-CustomField-$cf_id-Values" => '<p>HTML text</p>'
+            }
+        },
+        'Submit with HTML CF changes'
+    );
+    $m->text_contains( 'HTML <p>HTML text</p> added', 'Added HTML fields', );
+    $m->submit_form_ok(
+        {
+            form_name => 'BulkUpdate',
+            fields    => {
+                "Bulk-Delete-CustomField-$cf_id-AllValues" => 1,
+            }
+        },
+        'Submit with HTML CF deletion'
+    );
+    $m->text_contains( '<p>HTML text</p> is no longer a value for custom field HTML', 'Cleared HTML fields', );
+}
+
 done_testing;